]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoglobal: disable THP for Ceph daemons 31582/head
Patrick Donnelly [Tue, 12 Nov 2019 22:50:52 +0000 (14:50 -0800)]
global: disable THP for Ceph daemons

Ceph is known to suffer from memory fragmentation due to transparent
huge pages (THP). This is indicated by RSS usage above configured memory
targets and is only observable when the distribution default for THP is
"always", which is the default in the upstream kernel if
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is unset.

For now, enabling THP is currently discouraged until selective use of
THP by Ceph is implemented via madvise. We will need to consider both
defaults for THP so madvise calls to both enable and disable THP will
need implemented.

All credit to Mark Nelson for doing the legwork identifying this issue
and potential solutions.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Mark Nelson <mnelson@redhat.com>
5 years agoMerge PR #31577 into master
Sage Weil [Tue, 12 Nov 2019 20:16:06 +0000 (14:16 -0600)]
Merge PR #31577 into master

* refs/pull/31577/head:
pybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31542 from neha-ojha/wip-42756
Neha Ojha [Tue, 12 Nov 2019 18:24:29 +0000 (10:24 -0800)]
Merge pull request #31542 from neha-ojha/wip-42756

osd/OSDMap.cc: don't output over/underfull messages to lderr

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
5 years agopybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install 31577/head
Sage Weil [Tue, 12 Nov 2019 18:06:04 +0000 (12:06 -0600)]
pybind/mgr/CMakeLists: exclude tox.ini, requirements.txt from install

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31157 into master
Patrick Donnelly [Tue, 12 Nov 2019 17:25:26 +0000 (09:25 -0800)]
Merge PR #31157 into master

* refs/pull/31157/head:
doc: update inf/infinite option for subvolume resize
qa/tasks: fs subvolume resize inf command
mgr/volumes: fs subvolume resize inf/infinite command

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31503 into master
Sage Weil [Tue, 12 Nov 2019 16:56:08 +0000 (10:56 -0600)]
Merge PR #31503 into master

* refs/pull/31503/head:
Revert "os/bluestore: add kv_drain_preceding_waiters indicate drain_preceding."

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31537 into master
Sage Weil [Tue, 12 Nov 2019 16:23:06 +0000 (10:23 -0600)]
Merge PR #31537 into master

* refs/pull/31537/head:
mgr/orchestrator: move split_host into shared helpers
mgr/ssh: allow names to be specified for stateless services
mgr/ssh: optionally specify names for mon daemons
mgr/ssh: optionally specify names for mgr daemons

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31280 from zy751713126/snap_get_name_and_id
Jason Dillaman [Tue, 12 Nov 2019 15:57:20 +0000 (10:57 -0500)]
Merge pull request #31280 from zy751713126/snap_get_name_and_id

librbd: add snap_get_name and snap_get_id method API

5 years agoMerge pull request #31491 from zy751713126/rbd_bench
Jason Dillaman [Tue, 12 Nov 2019 15:54:44 +0000 (10:54 -0500)]
Merge pull request #31491 from zy751713126/rbd_bench

rbd/bench: outputs bytes/s format dynamically

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31497 from trociny/wip-mock-warnings
Jason Dillaman [Tue, 12 Nov 2019 15:54:07 +0000 (10:54 -0500)]
Merge pull request #31497 from trociny/wip-mock-warnings

test/librbd: fix mock warnings in TestMockIoImageRequest

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #31487 into master
Sage Weil [Tue, 12 Nov 2019 15:42:03 +0000 (09:42 -0600)]
Merge PR #31487 into master

* refs/pull/31487/head:
ceph-daemon: add `--base-dir` arg to `adopt` command

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: move split_host into shared helpers 31537/head
Sage Weil [Tue, 12 Nov 2019 14:24:31 +0000 (08:24 -0600)]
mgr/orchestrator: move split_host into shared helpers

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: allow names to be specified for stateless services
Sage Weil [Mon, 11 Nov 2019 23:27:57 +0000 (17:27 -0600)]
mgr/ssh: allow names to be specified for stateless services

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: optionally specify names for mon daemons
Sage Weil [Mon, 11 Nov 2019 16:52:34 +0000 (10:52 -0600)]
mgr/ssh: optionally specify names for mon daemons

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: optionally specify names for mgr daemons
Sage Weil [Mon, 11 Nov 2019 16:26:13 +0000 (10:26 -0600)]
mgr/ssh: optionally specify names for mgr daemons

Use '=' as a separator.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/dashboard: Manage PG autoscaling (#31417)
Lenz Grimmer [Tue, 12 Nov 2019 13:16:52 +0000 (13:16 +0000)]
mgr/dashboard: Manage PG autoscaling (#31417)

Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge PR #31559 into master
Sage Weil [Tue, 12 Nov 2019 13:11:48 +0000 (07:11 -0600)]
Merge PR #31559 into master

* refs/pull/31559/head:
mgr: Python cleanup and type check

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31539 into master
Sage Weil [Tue, 12 Nov 2019 13:09:50 +0000 (07:09 -0600)]
Merge PR #31539 into master

* refs/pull/31539/head:
mgr/orchestrator_cli: sort by service name
mgr/orchestrator_cli: collapse TYPE and ID columns

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31394 into master
Sage Weil [Tue, 12 Nov 2019 13:08:57 +0000 (07:08 -0600)]
Merge PR #31394 into master

* refs/pull/31394/head:
mgr/crash: Calculate and add stack_sig to metadata

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr: Python cleanup and type check 31559/head
Volker Theile [Tue, 12 Nov 2019 10:28:25 +0000 (11:28 +0100)]
mgr: Python cleanup and type check

- Add/remove missing/obsolete empty lines
- Add type check doc
- Rename inner function args to make pylint happy

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Support RBD namespaces (#30935)
Lenz Grimmer [Tue, 12 Nov 2019 09:50:50 +0000 (09:50 +0000)]
mgr/dashboard: Support RBD namespaces (#30935)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #31357 from votdev/improve_timediff_unittest
Lenz Grimmer [Tue, 12 Nov 2019 09:49:23 +0000 (09:49 +0000)]
Merge pull request #31357 from votdev/improve_timediff_unittest

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #30534 from jiahuizeng/osd_dev_node
Jan Fajerski [Tue, 12 Nov 2019 09:23:07 +0000 (10:23 +0100)]
Merge pull request #30534 from jiahuizeng/osd_dev_node

mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore

5 years agoMerge pull request #31431 from jschmid1/fix_cherrypy_imports
Kefu Chai [Tue, 12 Nov 2019 08:55:47 +0000 (16:55 +0800)]
Merge pull request #31431 from jschmid1/fix_cherrypy_imports

mgr/dashboard: cheroot moved into a separate project

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr: Run python unit tests with tox in the mgr (#30364)
Lenz Grimmer [Tue, 12 Nov 2019 08:34:02 +0000 (08:34 +0000)]
mgr: Run python unit tests with tox in the mgr (#30364)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: Remove compression mode unset in pool from (#31376)
Lenz Grimmer [Tue, 12 Nov 2019 08:29:26 +0000 (08:29 +0000)]
mgr/dashboard: Remove compression mode unset in pool from (#31376)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #29944 from xxhdx1985126/wip-fix-blustore-fadvice_flags-leak
Kefu Chai [Tue, 12 Nov 2019 08:17:15 +0000 (16:17 +0800)]
Merge pull request #29944 from xxhdx1985126/wip-fix-blustore-fadvice_flags-leak

osd: copy ObjectOperation::BufferUpdate::Write::fadvise_flag to ceph::os::Transaction

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31333 from adamemerson/wip-who-warns-the-warnings
Kefu Chai [Tue, 12 Nov 2019 08:14:43 +0000 (16:14 +0800)]
Merge pull request #31333 from adamemerson/wip-who-warns-the-warnings

src: use un-deprecated version of aio_create_completion

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31416 from sseshasa/wip-41666-replicaSizeWarn
Sridhar Seshasayee [Tue, 12 Nov 2019 06:36:46 +0000 (12:06 +0530)]
Merge pull request #31416 from sseshasa/wip-41666-replicaSizeWarn

osd/OSDMap: Show health warning if a pool is configured with size 1

Reviewed-by: Sage Weil <sweil@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31475 from zdover23/wip-doc-community-calendar
Brad Hubbard [Tue, 12 Nov 2019 04:46:15 +0000 (14:46 +1000)]
Merge pull request #31475 from zdover23/wip-doc-community-calendar

doc: Added a link to Ceph Community Calendar.

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agodoc: Added a link to Ceph Community Calendar. 31475/head
Zac Dover [Thu, 7 Nov 2019 22:40:35 +0000 (08:40 +1000)]
doc: Added a link to Ceph Community Calendar.

Co-Authored by: Neha Ojha <nojha@redhat.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
5 years agoMerge PR #31501 into master
Sage Weil [Tue, 12 Nov 2019 00:09:29 +0000 (18:09 -0600)]
Merge PR #31501 into master

* refs/pull/31501/head:
ceph-mon: bind to public_addrv if set (before public_addr or public_network)
common/options: add public_addrv
common/options: fix ADDRVEC parsing
ceph-daemon: support --mon-addrv for deploy subcommand

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agomgr/crash: Calculate and add stack_sig to metadata 31394/head
Dan Mick [Tue, 5 Nov 2019 03:33:02 +0000 (19:33 -0800)]
mgr/crash: Calculate and add stack_sig to metadata

Signed-off-by: Dan Mick <dan.mick@redhat.com>
5 years agoMerge PR #30914 into master
Patrick Donnelly [Mon, 11 Nov 2019 23:21:30 +0000 (15:21 -0800)]
Merge PR #30914 into master

* refs/pull/30914/head:
ceph: Add doc for deploying cephfs-nfs cluster using rook

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #31540 into master
Sage Weil [Mon, 11 Nov 2019 21:50:55 +0000 (15:50 -0600)]
Merge PR #31540 into master

* refs/pull/31540/head:
ceph-daemon: make ps1 a raw string

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoosd/OSDMap.cc: don't output over/underfull messages to lderr 31542/head
Neha Ojha [Mon, 11 Nov 2019 21:32:15 +0000 (13:32 -0800)]
osd/OSDMap.cc: don't output over/underfull messages to lderr

There can be cases where overfull and underfull(see example in
https://tracker.ceph.com/issues/42756) will be empty, which is not
necessarily an error. These error messages can end up spamming
the ceph-mgr log.

Fixes: https://tracker.ceph.com/issues/42756
Signed-off-by: Neha Ojha <nojha@redhat.com>
5 years agoceph-daemon: make ps1 a raw string 31540/head
Michael Fritch [Mon, 11 Nov 2019 21:07:49 +0000 (14:07 -0700)]
ceph-daemon: make ps1 a raw string

python3 interprets '\u' as a unicode escape

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31024 into master
Patrick Donnelly [Mon, 11 Nov 2019 20:21:34 +0000 (12:21 -0800)]
Merge PR #31024 into master

* refs/pull/31024/head:
doc: improve in mount.ceph man page
doc: describe mds_namespace option in mount.ceph man page

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30911 into master
Patrick Donnelly [Mon, 11 Nov 2019 20:03:21 +0000 (12:03 -0800)]
Merge PR #30911 into master

* refs/pull/30911/head:
doc/ceph-fuse: describe -n option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #30657 into master
Patrick Donnelly [Mon, 11 Nov 2019 18:45:10 +0000 (10:45 -0800)]
Merge PR #30657 into master

* refs/pull/30657/head:
test_cephfs_shell: pass arg to "help" in test_help
cephfs-shell: set exit_code when an error occurs
cephfs-shell: print traceback only when debug switch is on
cephfs-shell: catch libcephfs.Error only in onecmd()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31452 into master
Patrick Donnelly [Mon, 11 Nov 2019 18:41:24 +0000 (10:41 -0800)]
Merge PR #31452 into master

* refs/pull/31452/head:
Add chown ceph:ceph for /tmp/ceph.mon.keyring

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/orchestrator_cli: sort by service name 31539/head
Sage Weil [Mon, 11 Nov 2019 18:33:03 +0000 (12:33 -0600)]
mgr/orchestrator_cli: sort by service name

This is more consistent when applied across hosts.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: collapse TYPE and ID columns
Sage Weil [Mon, 11 Nov 2019 18:32:42 +0000 (12:32 -0600)]
mgr/orchestrator_cli: collapse TYPE and ID columns

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31538 into master
Sage Weil [Mon, 11 Nov 2019 18:14:35 +0000 (12:14 -0600)]
Merge PR #31538 into master

* refs/pull/31538/head:
ceph-daemon: do not fetch daemon detail when removing a cluster
ceph-daemon: ls: add --no-detail

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: do not fetch daemon detail when removing a cluster 31538/head
Sage Weil [Mon, 11 Nov 2019 17:05:00 +0000 (11:05 -0600)]
ceph-daemon: do not fetch daemon detail when removing a cluster

It's slow and not needed.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: ls: add --no-detail
Sage Weil [Mon, 11 Nov 2019 17:04:22 +0000 (11:04 -0600)]
ceph-daemon: ls: add --no-detail

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: add `--base-dir` arg to `adopt` command 31487/head
Michael Fritch [Fri, 8 Nov 2019 22:59:30 +0000 (15:59 -0700)]
ceph-daemon: add `--base-dir` arg to `adopt` command

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31387 into master
Sage Weil [Mon, 11 Nov 2019 16:15:45 +0000 (10:15 -0600)]
Merge PR #31387 into master

* refs/pull/31387/head:
src/CMakeLists: remove leading 'v' from 'git describe' version

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31524 into master
Sage Weil [Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)]
Merge PR #31524 into master

* refs/pull/31524/head:
mgr/ssh: Fix various Python issues.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agomgr/dashboard: Improve position of MDS chart tooltip (#31368)
Lenz Grimmer [Mon, 11 Nov 2019 15:29:11 +0000 (15:29 +0000)]
mgr/dashboard: Improve position of MDS chart tooltip (#31368)

mgr/dashboard: Improve position of MDS chart tooltip

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31512 into master
Sage Weil [Mon, 11 Nov 2019 15:28:01 +0000 (09:28 -0600)]
Merge PR #31512 into master

* refs/pull/31512/head:
mgr/ssh: allow passing LV to 'orchestrator osd create'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: Support RBD namespaces 30935/head
Ricardo Marques [Wed, 31 Jul 2019 09:34:57 +0000 (10:34 +0100)]
mgr/dashboard: Support RBD namespaces

Fixes: https://tracker.ceph.com/issues/25125
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agomgr/dashboard: Fix data point alignment in MDS counters chart (#31288)
Lenz Grimmer [Mon, 11 Nov 2019 13:19:54 +0000 (13:19 +0000)]
mgr/dashboard: Fix data point alignment in MDS counters chart (#31288)

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31519 from votdev/fix_ssh_vagrant
Sebastian Wagner [Mon, 11 Nov 2019 13:00:24 +0000 (14:00 +0100)]
Merge pull request #31519 from votdev/fix_ssh_vagrant

mgr/ssh: Install SSH public key in Vagrantfile box fails

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/ssh: Fix various Python issues. 31524/head
Volker Theile [Mon, 11 Nov 2019 10:52:35 +0000 (11:52 +0100)]
mgr/ssh: Fix various Python issues.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: RBD tests must use pools with power-of-two pg_n… (#31490)
Lenz Grimmer [Mon, 11 Nov 2019 09:58:39 +0000 (09:58 +0000)]
mgr/dashboard: RBD tests must use pools with power-of-two pg_n… (#31490)

mgr/dashboard: RBD tests must use pools with power-of-two pg_num

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/ssh: Install SSH public key in Vagrantfile box fails 31519/head
Volker Theile [Mon, 11 Nov 2019 09:15:18 +0000 (10:15 +0100)]
mgr/ssh: Install SSH public key in Vagrantfile box fails

The current implementation to copy the host users SSH public key into the Vagrant box does not work with Vagrant 2.2.6.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31419 from smithfarm/wip-cbs-5
Nathan Cutler [Mon, 11 Nov 2019 08:31:24 +0000 (09:31 +0100)]
Merge pull request #31419 from smithfarm/wip-cbs-5

ceph-backport.sh: guess component with --existing-pr

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoosd/OSDMap: Show health warning if a pool is configured with size 1 31416/head
Sridhar Seshasayee [Tue, 5 Nov 2019 10:40:14 +0000 (16:10 +0530)]
osd/OSDMap: Show health warning if a pool is configured with size 1

Introduce a config option called 'mon_warn_on_pool_no_redundancy' that is
used to show a health warning if any pool in the ceph cluster is
configured with a size of 1. The user can mute/unmute the warning using
'ceph health mute/unmute POOL_NO_REDUNDANCY'.

Add standalone test to verify warning on setting pool size=1. Set the
associated warning to 'false' in ceph.conf.template under qa/tasks so
that existing tests do not break.

Fixes: https://tracker.ceph.com/issues/41666
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
5 years agoAdd chown ceph:ceph for /tmp/ceph.mon.keyring 31452/head
oneoneonepig [Thu, 7 Nov 2019 05:01:53 +0000 (13:01 +0800)]
Add chown ceph:ceph for /tmp/ceph.mon.keyring

The keyring will be 600 by default with the owner of the current user who issues the command, which will make command "sudo -u ceph ceph-mon --mkfs" fail since the user "ceph" don't have access to the keyring file.
Because of that, the mon data directory won't have keyring and when "sudo systemctl start ceph-mon" it will show error "unable to read magic from mon data"

Signed-off-by: Jeffrey Chu <peihuachu1112@gmail.com>
5 years agoMerge pull request #31271 from ivancich/wip-fix-cancel-bucket-reshard
J. Eric Ivancich [Sun, 10 Nov 2019 18:16:49 +0000 (13:16 -0500)]
Merge pull request #31271 from ivancich/wip-fix-cancel-bucket-reshard

rgw: allow reshard log entries for non-existent buckets to be cancelled

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #31492 from jan--f/c-v-add-part-size
Jan Fajerski [Sun, 10 Nov 2019 16:25:26 +0000 (17:25 +0100)]
Merge pull request #31492 from jan--f/c-v-add-part-size

ceph-volume: add proper size attribute to partitions

5 years agomgr/ssh: allow passing LV to 'orchestrator osd create' 31512/head
Sage Weil [Sun, 10 Nov 2019 15:08:56 +0000 (09:08 -0600)]
mgr/ssh: allow passing LV to 'orchestrator osd create'

In this case,

 ceph orchestrator osd create smithi009:/dev/vg_nvme/lv_1

produced

    "0": [
        {
            "devices": [
                "/dev/nvme0n1"
            ],
            "lv_name": "lv_1",
            "lv_path": "/dev/vg_nvme/lv_1",
            "lv_size": "89.40g",
            "lv_tags": "ceph.block_device=/dev/vg_nvme/lv_1,ceph.block_uuid=a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=5d6d2c1c-0362-11ea-825a-001a4aab830c,ceph.cluster_name=ceph,ceph.crush_device_class=None,ceph.encrypted=0,ceph.osd_fsid=04175a6e-55e7-4244-b683-79da76f723af,ceph.osd_id=0,ceph.type=block,ceph.vdo=0",
            "lv_uuid": "a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l",
            "name": "lv_1",
            "path": "/dev/vg_nvme/lv_1",
            "tags": {
                "ceph.block_device": "/dev/vg_nvme/lv_1",
                "ceph.block_uuid": "a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l",
                "ceph.cephx_lockbox_secret": "",
                "ceph.cluster_fsid": "5d6d2c1c-0362-11ea-825a-001a4aab830c",
                "ceph.cluster_name": "ceph",
                "ceph.crush_device_class": "None",
                "ceph.encrypted": "0",
                "ceph.osd_fsid": "04175a6e-55e7-4244-b683-79da76f723af",
                "ceph.osd_id": "0",
                "ceph.type": "block",
                "ceph.vdo": "0"
            },
            "type": "block",
            "vg_name": "vg_nvme"
        }
    ],

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorbd/bench: outputs bytes/s format dynamically 31491/head
zhengyin [Fri, 8 Nov 2019 16:51:27 +0000 (00:51 +0800)]
rbd/bench: outputs bytes/s format dynamically

Fixes: https://tracker.ceph.com/issues/40256
Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
5 years agoMerge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing
J. Eric Ivancich [Sun, 10 Nov 2019 05:07:15 +0000 (00:07 -0500)]
Merge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing

rgw: reduce per-shard entry count during ordered bucket listing

5 years agoMerge pull request #31323 from ivancich/wip-autoclean-reshard-long-entries
J. Eric Ivancich [Sun, 10 Nov 2019 05:06:21 +0000 (00:06 -0500)]
Merge pull request #31323 from ivancich/wip-autoclean-reshard-long-entries

rgw: auto-clean reshard queue entries for non-existent buckets

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge PR #31505 into master
Sage Weil [Sun, 10 Nov 2019 02:38:49 +0000 (20:38 -0600)]
Merge PR #31505 into master

* refs/pull/31505/head:
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31507 into master
Sage Weil [Sun, 10 Nov 2019 02:38:35 +0000 (20:38 -0600)]
Merge PR #31507 into master

* refs/pull/31507/head:
ceph-daemon: ceph/daemon-base:latest-master-devel

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-mon: bind to public_addrv if set (before public_addr or public_network) 31501/head
Sage Weil [Fri, 8 Nov 2019 22:35:28 +0000 (16:35 -0600)]
ceph-mon: bind to public_addrv if set (before public_addr or public_network)

This lets you specify a precise addrvec for the monitor to bind to,
instead of inferring a v1 or v2 address from the port number, or assuming
both with default ports, or v2 only with an unrecognized port.

I unfortunately don't quite remember why I didn't make public_addr a
ADDRVEC option way back in nautilus--I only remmeber that it was going to
cause problems.  Adding a separate addrv option here is safe.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon/options: add public_addrv
Sage Weil [Fri, 8 Nov 2019 22:29:50 +0000 (16:29 -0600)]
common/options: add public_addrv

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31474 into master
Sage Weil [Sat, 9 Nov 2019 21:39:19 +0000 (15:39 -0600)]
Merge PR #31474 into master

* refs/pull/31474/head:
mgr/devicehealth: ensure we don't store empty objects

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoceph-daemon: ceph/daemon-base:latest-master-devel 31507/head
Sage Weil [Sat, 9 Nov 2019 14:01:37 +0000 (08:01 -0600)]
ceph-daemon: ceph/daemon-base:latest-master-devel

The -devel one rebuilds daily, while latest-master rebuilds when
ceph-container.git changes.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorgw: reduce per-shard entry count during ordered bucket listing 30853/head
J. Eric Ivancich [Mon, 14 Oct 2019 20:21:35 +0000 (16:21 -0400)]
rgw: reduce per-shard entry count during ordered bucket listing

Currently, if a client requests the 1000 next entries from a bucket,
each bucket index shard will receive a request for the 1000 next
entries. When there are hundreds, thousands, or tens of thousands of
bucket index shards, this results in a huge amplification of the
request, even though only 1000 entries will be returned.

These changes reduce the per-bucket index shard requests. These also
allow re-requests in edge cases where all of one shard's returned
entries are consumed. Finally these changes improve the determination
of whether the resulting list is truncated.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge PR #31498 into master
Sage Weil [Sat, 9 Nov 2019 04:40:38 +0000 (22:40 -0600)]
Merge PR #31498 into master

* refs/pull/31498/head:
ceph-daemon: customize the bash prompt for shell + enter

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/ssh: take IP, CIDR, or addrvec for new mon(s) 31505/head
Sage Weil [Sat, 9 Nov 2019 04:39:10 +0000 (22:39 -0600)]
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31499 into master
Sage Weil [Sat, 9 Nov 2019 04:37:39 +0000 (22:37 -0600)]
Merge PR #31499 into master

* refs/pull/31499/head:
ceph-daemon: the 'ceph' command may not be installed

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agolibrbd: add snap_get_name and snap_get_id method API 31280/head
zhengyin [Thu, 31 Oct 2019 10:32:43 +0000 (18:32 +0800)]
librbd: add snap_get_name and snap_get_id method API

Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
5 years agoceph-daemon: the 'ceph' command may not be installed 31499/head
Sage Weil [Fri, 8 Nov 2019 21:36:49 +0000 (15:36 -0600)]
ceph-daemon: the 'ceph' command may not be installed

...even though there are legacy data dirs in /var/lib/ceph.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31500 into master
Sage Weil [Sat, 9 Nov 2019 03:12:13 +0000 (21:12 -0600)]
Merge PR #31500 into master

* refs/pull/31500/head:
ceph-daemon: set ssh public identity

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31472 into master
Sage Weil [Fri, 8 Nov 2019 23:33:40 +0000 (17:33 -0600)]
Merge PR #31472 into master

* refs/pull/31472/head:
mon/MonMap: encode (more) valid compat monmap when we have v2-only addrs

Reviewed-by: Xiaoxi Chen <superdebuger@gmail.com>
5 years agoRevert "os/bluestore: add kv_drain_preceding_waiters indicate drain_preceding." 31503/head
Sage Weil [Fri, 8 Nov 2019 23:29:03 +0000 (17:29 -0600)]
Revert "os/bluestore: add kv_drain_preceding_waiters indicate drain_preceding."

This reverts commit ff71ad472e94e14f392c618b6eb5e8608afec94f.

This change has two problems:

1- First, we want to be aggressive about deferred IO so that we don't have
to wait very long for things to flush.

2- Because we aren't aggressive, when the deferred io does finish, the kv
thread isn't woken back up, which means we hang.

More generally, I don't think we care about making aggressive mode avoid
wakeups, because it is exceedingly rare--it only happens when we are
splitting PGs.

Fixes: https://tracker.ceph.com/issues/42712
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31471 into master
Sage Weil [Fri, 8 Nov 2019 22:46:02 +0000 (16:46 -0600)]
Merge PR #31471 into master

* refs/pull/31471/head:
mgr/DaemonServer: warn when we reject reports

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agocommon/options: fix ADDRVEC parsing
Sage Weil [Fri, 8 Nov 2019 22:29:35 +0000 (16:29 -0600)]
common/options: fix ADDRVEC parsing

We never actually had any of these yet.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: support --mon-addrv for deploy subcommand
Sage Weil [Fri, 8 Nov 2019 22:11:19 +0000 (16:11 -0600)]
ceph-daemon: support --mon-addrv for deploy subcommand

This maps directly to the public_addrv option.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: set ssh public identity 31500/head
Sage Weil [Fri, 8 Nov 2019 21:50:02 +0000 (15:50 -0600)]
ceph-daemon: set ssh public identity

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31421 from alfredodeza/wip-bz1768523
Alfredo Deza [Fri, 8 Nov 2019 21:36:36 +0000 (16:36 -0500)]
Merge pull request #31421 from alfredodeza/wip-bz1768523

ceph-volume: allow to skip restorecon calls

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastien Han <shan@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
5 years agoceph-daemon: customize the bash prompt for shell + enter 31498/head
Sage Weil [Fri, 8 Nov 2019 20:17:17 +0000 (14:17 -0600)]
ceph-daemon: customize the bash prompt for shell + enter

[ceph: root@gnit /]#

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agotest/librbd: fix mock warnings in TestMockIoImageRequest 31497/head
Mykola Golub [Fri, 8 Nov 2019 19:49:51 +0000 (21:49 +0200)]
test/librbd: fix mock warnings in TestMockIoImageRequest

(introduced in 081d28ae)

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #31493 into master
Sage Weil [Fri, 8 Nov 2019 19:28:45 +0000 (13:28 -0600)]
Merge PR #31493 into master

* refs/pull/31493/head:
ceph-daemon: 'profile ...' not 'allow profile ...'
mgr/ssh: 'profile ...' not 'allow profile ...'
mgr/orchestrator_cli: rearrange things a bit
doc/mgr/orchestrator_cli: remove irrelevant line
mgr/ssh: learn to deploy rbd-mirror daemons
mgr/orchestrator: add rbd-mirror commands and hooks
ceph-daemon: learn to deploy rbd-mirror daemon
mgr/ssh: handle lack of node hints more gracefully
mgr/ssh: factor out update_{rgw,mds} into common helper
mgr/ssh: fix update_rgw, update_mgr

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #30890 into master
Patrick Donnelly [Fri, 8 Nov 2019 18:43:46 +0000 (10:43 -0800)]
Merge PR #30890 into master

* refs/pull/30890/head:
mgr: invoke plugin shutdown on SIG{TERM,INT} signals.
mgr/volumes: guard volume delete by waiting for pending ops
mgr/volumes: cleanup libcephfs handles when stopping
Revert "qa/suites/rados/mgr/tasks/module_selftest: whitelist mgr client getting backlisted"

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31115 into master
Patrick Donnelly [Fri, 8 Nov 2019 18:41:47 +0000 (10:41 -0800)]
Merge PR #31115 into master

* refs/pull/31115/head:
mds: Reorganize class members in MDSTableClient header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31400 into master
Patrick Donnelly [Fri, 8 Nov 2019 18:06:08 +0000 (10:06 -0800)]
Merge PR #31400 into master

* refs/pull/31400/head:
mds: establish session with mgr only after added to FSMap
mds: do not register as a service daemon
mds: do not try to diagnose cause of MDSMap removal
mds: fix handling of initial MDS states
mds: remove unnecessary const qualifier
mds: cleanup type decl and map iteration
mds: define stream operator for mds_info_t

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomds: establish session with mgr only after added to FSMap 31400/head
Patrick Donnelly [Wed, 6 Nov 2019 03:51:17 +0000 (19:51 -0800)]
mds: establish session with mgr only after added to FSMap

Note that we now sub to the mgrmap after init because the MgrClient
connection to the mgr is driven by receipt of the MgrMap.

This is important so that the MDS does not have metadata with the mgr
when the mons are ignoring the MDS otherwise due to CompatSet
incompatibilities.

Fixes: https://tracker.ceph.com/issues/41538
Fixes: https://tracker.ceph.com/issues/42635
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: do not register as a service daemon
Patrick Donnelly [Thu, 7 Nov 2019 07:07:20 +0000 (23:07 -0800)]
mds: do not register as a service daemon

This commit undoes the service daemon registration for the MDS. It doesn't look
absolutely necessary and it causes the MDS to be listed twice in the `ceph
versions` output:

    $ ceph versions
        ...
        "mds": {
            "ceph version v15.0.0-6915-g0143b904676 (0143b9046763ea1801efa8358a0c033ec862cea9) octopus (dev)": 3
        },
        "mds": {
            "unknown": 3
        },
        "overall": {
            "ceph version v15.0.0-6915-g0143b904676 (0143b9046763ea1801efa8358a0c033ec862cea9) octopus (dev)": 10,
            "unknown": 3
        }

Fixing that requires looking for duplicates or ignoring MDSs in the
service daemons when the mon processes `ceph versions`. I have a feeling
that it wasn't actually designed to be used by the MDS this way however.
Additionally, the reason for "unknown" version is because the metadata
sent to the mgr does not include "ceph_version".

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: do not try to diagnose cause of MDSMap removal
Patrick Donnelly [Wed, 6 Nov 2019 08:26:51 +0000 (00:26 -0800)]
mds: do not try to diagnose cause of MDSMap removal

The Monitors send an empty MDSMap to an MDS it is removing. The MDS
can't diagnose the cause. Instead suggest looking at the cluster/monitor
logs.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: fix handling of initial MDS states
Patrick Donnelly [Wed, 6 Nov 2019 03:39:59 +0000 (19:39 -0800)]
mds: fix handling of initial MDS states

Few things here:

- Make explicit the check for getting removed from the MDSMap. This was
  only done before by checking if MDS held a rank which does not check the
  case where a standby is removed from the FSMap.

- Use mds_info_t::dump to simplify various debug output.

- Add a few sanity asserts for invalid state transitions.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: remove unnecessary const qualifier
Patrick Donnelly [Wed, 6 Nov 2019 04:42:01 +0000 (20:42 -0800)]
mds: remove unnecessary const qualifier

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: cleanup type decl and map iteration
Patrick Donnelly [Wed, 6 Nov 2019 03:37:19 +0000 (19:37 -0800)]
mds: cleanup type decl and map iteration

This is a trivial refactor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: define stream operator for mds_info_t
Patrick Donnelly [Wed, 6 Nov 2019 03:34:41 +0000 (19:34 -0800)]
mds: define stream operator for mds_info_t

This also cleans up the output to be more readable/useful in debug
output.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #29437 into master
Sage Weil [Fri, 8 Nov 2019 17:49:00 +0000 (11:49 -0600)]
Merge PR #29437 into master

* refs/pull/29437/head:
mgr/diskprediction_local: Reverted dependencies, added HGST models
mgr/diskprediction_local: Updated dependencies in ceph.spec.in, debian/control to match requirements.txt
mgr/diskprediction_local: Updated Red Hat developed prediction model. Updated module options to choose between Red Hat and ProphetStor models.
mgr/diskprediction_local: Updated prediction models to use only supported python packages.
mgr/diskprediction_local: Replaced old models and updated predictor.

Reviewed-by: Sage Weil <sage@redhat.com>