]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agolibrbd: always initialize local variables 31311/head
Kefu Chai [Fri, 1 Nov 2019 05:32:24 +0000 (13:32 +0800)]
librbd: always initialize local variables

silence warnings like:

src/librbd/io/ImageRequestWQ.cc:576:7: warning: 'length' may be used uninitialized in this function [-Wmaybe-uninitialized]
       if (block_overlapping_io(&m_in_flight_extents, offset, length)) {
       ^~
...
src/librbd/io/ImageRequestWQ.cc:935:12: note: 'length' was declared here
   uint64_t length;
            ^~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31046 into master
Patrick Donnelly [Thu, 31 Oct 2019 23:42:18 +0000 (16:42 -0700)]
Merge PR #31046 into master

* refs/pull/31046/head:
doc: hide page contents for Ceph Internals

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
5 years agoMerge PR #31206 into master
Patrick Donnelly [Thu, 31 Oct 2019 20:08:34 +0000 (13:08 -0700)]
Merge PR #31206 into master

* refs/pull/31206/head:
qa: test fs:upgrade when running upgrade suite

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #31270 into master
Sage Weil [Thu, 31 Oct 2019 15:40:59 +0000 (10:40 -0500)]
Merge PR #31270 into master

* refs/pull/31270/head:
ceph-daemon: no extra newline needed in authorized_keys file
ceph-daemon: use client.admin keyring during bootstrap

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #31265 from idryomov/wip-krbd-unmap-msgr1
Ilya Dryomov [Thu, 31 Oct 2019 14:45:19 +0000 (15:45 +0100)]
Merge pull request #31265 from idryomov/wip-krbd-unmap-msgr1

qa/suites/krbd: run unmap subsuite with msgr1 only

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/dashboard: Remove convertion to seconds (#31262)
Volker Theile [Thu, 31 Oct 2019 11:07:31 +0000 (12:07 +0100)]
mgr/dashboard: Remove convertion to seconds (#31262)

mgr/dashboard: Remove convertion to seconds

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ni-Feng Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: edit/clone/copy rbd image after its data is rec… (#31245)
Volker Theile [Thu, 31 Oct 2019 11:05:06 +0000 (12:05 +0100)]
mgr/dashboard: edit/clone/copy rbd image after its data is rec… (#31245)

mgr/dashboard: edit/clone/copy rbd image after its data is received

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31247 from smithfarm/wip-bri-regression
Nathan Cutler [Thu, 31 Oct 2019 11:02:58 +0000 (12:02 +0100)]
Merge pull request #31247 from smithfarm/wip-bri-regression

backport-resolve-issue: "recognize that Target version is populated" and "prune duplicate URLs"

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge PR #31231 into master
Patrick Donnelly [Wed, 30 Oct 2019 19:22:48 +0000 (12:22 -0700)]
Merge PR #31231 into master

* refs/pull/31231/head:
qa: add tests for CephFS admin commands
mds/MDSRank: report state to mgr as mds id, not rank

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-daemon: no extra newline needed in authorized_keys file 31270/head
Sage Weil [Wed, 30 Oct 2019 19:09:36 +0000 (14:09 -0500)]
ceph-daemon: no extra newline needed in authorized_keys file

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: use client.admin keyring during bootstrap
Sage Weil [Wed, 30 Oct 2019 15:05:24 +0000 (10:05 -0500)]
ceph-daemon: use client.admin keyring during bootstrap

It's usually okay to use the mon. key for CLI commands, except we had a
mgr but that prevented you from issuing mgr commands correctly.  We have
the new client.admin key available, so use that instead.

Update tests to not --skip-ssh (now that it doesn't hang).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31264 into master
Sage Weil [Wed, 30 Oct 2019 19:04:07 +0000 (14:04 -0500)]
Merge PR #31264 into master

* refs/pull/31264/head:
ceph-daemon: deal with lack of TemporaryDirectory on py2
ceph-daemon: make StringIO usage py2 compatible
ceph-daemon: make ConfigParser py2 compatible

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoqa/suites/krbd: run unmap subsuite with msgr1 only 31265/head
Ilya Dryomov [Tue, 29 Oct 2019 15:19:14 +0000 (16:19 +0100)]
qa/suites/krbd: run unmap subsuite with msgr1 only

pre-single-major.yaml kernel doesn't have any of the monitor client
fixes that came in 4.6.  If the connection is closed, it closes the
session and retries only after 10 seconds.  On top of that, there is
nothing to prevent it from picking the same monitor when reconnecting.
This means that when given both v1 and v2 ports (which look like two
different monitors), it is susceptible to mount_timeout (60 seconds):

  $ sudo rbd map img
  rbd: sysfs write failed
  In some cases useful info is found in syslog - try "dmesg | tail".
  rbd: map failed: (5) Input/output error

  [  822.242313] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  832.265494] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  842.296175] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  852.326924] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  862.357611] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  872.388373] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  882.676136] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)

Unlike newer kernels that return ETIMEDOUT, it returns EIO.

Newer kernels are much more aggressive about retries and will pick
a different monitor when reconnecting, hence they are always able to
establish the session in time.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoqa: add tests for CephFS admin commands 31231/head
Patrick Donnelly [Wed, 30 Oct 2019 17:21:22 +0000 (10:21 -0700)]
qa: add tests for CephFS admin commands

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-daemon: deal with lack of TemporaryDirectory on py2 31264/head
Sage Weil [Wed, 30 Oct 2019 18:22:43 +0000 (13:22 -0500)]
ceph-daemon: deal with lack of TemporaryDirectory on py2

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make StringIO usage py2 compatible
Sage Weil [Wed, 30 Oct 2019 15:33:52 +0000 (10:33 -0500)]
ceph-daemon: make StringIO usage py2 compatible

Otherwise,

Traceback (most recent call last):
  File "../src/ceph-daemon", line 1698, in <module>
    r = args.func()
  File "../src/ceph-daemon", line 767, in command_bootstrap
    with StringIO() as f:
AttributeError: StringIO instance has no attribute '__exit__'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make ConfigParser py2 compatible
Sage Weil [Wed, 30 Oct 2019 15:32:00 +0000 (10:32 -0500)]
ceph-daemon: make ConfigParser py2 compatible

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/dashboard: Remove convertion to seconds 31262/head
Tiago Melo [Wed, 30 Oct 2019 16:13:01 +0000 (15:13 -0100)]
mgr/dashboard: Remove convertion to seconds

This is no longer need since the values are already in seconds.

Fixes: https://tracker.ceph.com/issues/42567
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge PR #31195 into master
Patrick Donnelly [Wed, 30 Oct 2019 16:09:06 +0000 (09:09 -0700)]
Merge PR #31195 into master

* refs/pull/31195/head:
vstart: Fix /dev/tty No such device or address

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #31161 from trociny/wip-42488
Jason Dillaman [Wed, 30 Oct 2019 16:07:30 +0000 (12:07 -0400)]
Merge pull request #31161 from trociny/wip-42488

rbd-mirror: mirrored clone should be same format

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31149 from wonderpow/master1
Jason Dillaman [Wed, 30 Oct 2019 16:07:12 +0000 (12:07 -0400)]
Merge pull request #31149 from wonderpow/master1

cls/rbd: add snapshot_add raise -ESTALE test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31140 from Gangbiao/add-pybind-test-case
Jason Dillaman [Wed, 30 Oct 2019 16:06:41 +0000 (12:06 -0400)]
Merge pull request #31140 from Gangbiao/add-pybind-test-case

test/pybind: add create_snap rasie ImageExists test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30994 from JackSlateur/rbd_merged_du
Jason Dillaman [Wed, 30 Oct 2019 16:06:08 +0000 (12:06 -0400)]
Merge pull request #30994 from JackSlateur/rbd_merged_du

rbd: add --merge to disk-usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/dashboard: remove space in tox.ini deps (#31246)
Lenz Grimmer [Wed, 30 Oct 2019 15:32:15 +0000 (15:32 +0000)]
mgr/dashboard: remove space in tox.ini deps (#31246)

mgr/dashboard: remove space in tox.ini deps

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agovstart: Fix /dev/tty No such device or address 31195/head
Volker Theile [Tue, 29 Oct 2019 14:24:22 +0000 (15:24 +0100)]
vstart: Fix /dev/tty No such device or address

Running on Jenkins slave or as a daemon there will be no writable console.

Fixes: https://tracker.ceph.com/issues/42487
Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agobackport-resolve-issue: prune duplicate URLs 31247/head
Nathan Cutler [Wed, 30 Oct 2019 13:30:08 +0000 (14:30 +0100)]
backport-resolve-issue: prune duplicate URLs

I have seen PR descriptions with a single backport tracker URL mentioned twice.
When backport-resolve-issue hit one of these, it would say:

Found backport tracker: https://tracker.ceph.com/issues/39272
Found backport tracker: https://tracker.ceph.com/issues/39272
-----------------------------------------------------------------
INFO:root:Tracker https://tracker.ceph.com/issues/39272 links to PR https://github.com/ceph/ceph/pull/29153
INFO:root:Backport Tracker 39272 target version already populated with correct value v12.2.13
INFO:root:Backport Tracker 39272 status is already set to Resolved
-----------------------------------------------------------------
INFO:root:Tracker https://tracker.ceph.com/issues/39272 links to PR https://github.com/ceph/ceph/pull/29153
INFO:root:Backport Tracker 39272 target version already populated with correct value v12.2.13
INFO:root:Backport Tracker 39272 status is already set to Resolved
=================================================================

This commit fixes the issue.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agomgr/dashboard: Allow removal of single notification (#31048)
Lenz Grimmer [Wed, 30 Oct 2019 12:32:37 +0000 (12:32 +0000)]
mgr/dashboard: Allow removal of single notification (#31048)

mgr/dashboard: Allow removal of single notification

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Use checkbox for multi selection (#30495)
Lenz Grimmer [Wed, 30 Oct 2019 11:58:15 +0000 (11:58 +0000)]
mgr/dashboard: Use checkbox for multi selection (#30495)

mgr/dashboard: Use checkbox for multi selection

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: edit/clone/copy rbd image after its data is received 31245/head
Alfonso Martínez [Wed, 30 Oct 2019 11:31:13 +0000 (12:31 +0100)]
mgr/dashboard: edit/clone/copy rbd image after its data is received

Fixes: https://tracker.ceph.com/issues/42561
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
5 years agoMerge pull request #31193 from rhcs-dashboard/wip-42507-master
Nathan Cutler [Wed, 30 Oct 2019 10:54:18 +0000 (11:54 +0100)]
Merge pull request #31193 from rhcs-dashboard/wip-42507-master

mgr/dashboard: update dashboard CODEOWNERShip

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agobackport-resolve-issue: recognize that Target version is populated
Nathan Cutler [Wed, 30 Oct 2019 10:44:56 +0000 (11:44 +0100)]
backport-resolve-issue: recognize that Target version is populated

Due to a regression, the script stopped recognizing that a Backport tracker
issue's "Target version" field is populated.

Fixes: af43b3cc3b05e70ec248ad5c23da6fbd4c2e78a1
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30988 from smithfarm/wip-bri-multi
Nathan Cutler [Wed, 30 Oct 2019 10:31:21 +0000 (11:31 +0100)]
Merge pull request #30988 from smithfarm/wip-bri-multi

backport-resolve-issue: resolve multiple backport issues

5 years agomgr/dashboard: remove space in tox.ini deps 31246/head
Sebastian Wagner [Wed, 30 Oct 2019 10:20:02 +0000 (11:20 +0100)]
mgr/dashboard: remove space in tox.ini deps

Fixes: https://tracker.ceph.com/issues/42469
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31163 from callithea/wip-issue-42489
Nathan Cutler [Wed, 30 Oct 2019 10:02:30 +0000 (11:02 +0100)]
Merge pull request #31163 from callithea/wip-issue-42489

doc: Small update of SubmittingPatches-backports

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30879 from smithfarm/wip-cbs-check-missing-milestone
Nathan Cutler [Wed, 30 Oct 2019 09:30:01 +0000 (10:30 +0100)]
Merge pull request #30879 from smithfarm/wip-cbs-check-missing-milestone

ceph-backport.sh: implement --milestones feature and more-careful vetting

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #29930 from IlsooByun/rocksdb_ver
Kefu Chai [Wed, 30 Oct 2019 02:11:01 +0000 (10:11 +0800)]
Merge pull request #29930 from IlsooByun/rocksdb_ver

cmake: require RocksDB 5.14 or higher

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomds/MDSRank: report state to mgr as mds id, not rank
Sage Weil [Tue, 29 Oct 2019 19:17:47 +0000 (14:17 -0500)]
mds/MDSRank: report state to mgr as mds id, not rank

Introduced by 625dffe65c0f8001b3b6ca6d0b12732a1a103849, which added
periodic scrub stats reporting.

Fixes: https://tracker.ceph.com/issues/42494
Fixes: https://tracker.ceph.com/issues/41525
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #30369 into master
Patrick Donnelly [Tue, 29 Oct 2019 22:32:18 +0000 (15:32 -0700)]
Merge PR #30369 into master

* refs/pull/30369/head:
doc/cephfs: add doc for cephfs io path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31201 into master
Patrick Donnelly [Tue, 29 Oct 2019 19:39:06 +0000 (12:39 -0700)]
Merge PR #31201 into master

* refs/pull/31201/head:
doc: document rank option for journal reset

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge PR #31181 into master
Sage Weil [Tue, 29 Oct 2019 18:39:40 +0000 (13:39 -0500)]
Merge PR #31181 into master

* refs/pull/31181/head:
ceph-daemon: only pass podman -it if need an interactive shell

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #31159 from alfredodeza/wip-rm42484
Alfredo Deza [Tue, 29 Oct 2019 16:05:11 +0000 (12:05 -0400)]
Merge pull request #31159 from alfredodeza/wip-rm42484

ceph-volume tests remove xenial from functional testing

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agotest/pybind: add create_snap rasie ImageExists test case 31140/head
Gangbiao Liu [Wed, 23 Oct 2019 02:26:02 +0000 (10:26 +0800)]
test/pybind: add create_snap rasie ImageExists test case

Signed-off-by: Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
5 years agoMerge pull request #31222 from sebastian-philipp/python-common-avoid-setup_requires
Kefu Chai [Tue, 29 Oct 2019 15:07:39 +0000 (23:07 +0800)]
Merge pull request #31222 from sebastian-philipp/python-common-avoid-setup_requires

python-common: avoid using setup_requires in setup.py

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/dashboard: Allow removal of single notification 31048/head
Tiago Melo [Fri, 4 Oct 2019 12:10:52 +0000 (12:10 +0000)]
mgr/dashboard: Allow removal of single notification

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoceph-daemon: only pass podman -it if need an interactive shell 31181/head
Sage Weil [Sun, 27 Oct 2019 17:29:36 +0000 (12:29 -0500)]
ceph-daemon: only pass podman -it if need an interactive shell

Otherwise, we get errors like

2019-10-26T17:29:42.004 INFO:tasks.workunit.client.0.mira109.stderr:+ sudo /usr/sbin/ceph-daemon shell -- ceph -v
2019-10-26T17:29:42.004 INFO:tasks.workunit.client.0.mira109.stderr:+ grep 'ceph version'
2019-10-26T17:29:42.149 INFO:tasks.workunit.client.0.mira109.stderr:the input device is not a TTY

Fixes: https://tracker.ceph.com/issues/42499
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31059 into master
Sage Weil [Tue, 29 Oct 2019 14:38:57 +0000 (09:38 -0500)]
Merge PR #31059 into master

* refs/pull/31059/head:
mgr/rook: implement update_mds
mgr/ssh: implement 'mds update'
mgr/orchestrator_cli: add 'mds update' command
mgr/ssh: unique names for mds instances
mgr/ssh: name mgrs with random string id; add removal support
mgr/ssh: provide get_unique_name helper
mgr/orchestrator_cli: rename 'mds rm' arg
mgr/orchestrator_cli: rename 'mds add' arg
mgr/ssh: add 'mds rm'
mgr/ssh: (broken) mds rm
mgr/ssh: make mds add work
mgr/orchestrator: add count, hosts args to 'mds add'
mgr/ssh: be consistently verbose
mgr/ActivePyModules: expose 'mds_metadata' to modules

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31197 from jan--f/c-v-fix-lvm-mokeypatch
Jan Fajerski [Tue, 29 Oct 2019 14:27:02 +0000 (15:27 +0100)]
Merge pull request #31197 from jan--f/c-v-fix-lvm-mokeypatch

ceph-volume: mokeypatch calls to lvm related binaries

5 years agopython-common: avoid using setup_requires in setup.py 31222/head
Sebastian Wagner [Tue, 29 Oct 2019 13:05:25 +0000 (14:05 +0100)]
python-common: avoid using setup_requires in setup.py

Fixes: https://tracker.ceph.com/issues/42528
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31023 from idryomov/wip-krbd-udev-enumerate-retry
Ilya Dryomov [Tue, 29 Oct 2019 10:40:45 +0000 (11:40 +0100)]
Merge pull request #31023 from idryomov/wip-krbd-udev-enumerate-retry

krbd: retry on transient errors from udev_enumerate_scan_devices()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
5 years agocmake: require RocksDB 5.14 or higher 29930/head
Ilsoo Byun [Tue, 27 Aug 2019 10:48:52 +0000 (19:48 +0900)]
cmake: require RocksDB 5.14 or higher

error: ‘class rocksdb::Env’ has no member named ‘SetAllowNonOwnerAccess’
       opt.env->SetAllowNonOwnerAccess(false);
                    ^~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
5 years agoMerge pull request #31072 from sebastian-philipp/ceph-volume-inventory-device-id
Jan Fajerski [Tue, 29 Oct 2019 07:16:14 +0000 (08:16 +0100)]
Merge pull request #31072 from sebastian-philipp/ceph-volume-inventory-device-id

ceph-volume: add Ceph's device id to inventory

5 years agoqa: test fs:upgrade when running upgrade suite 31206/head
Patrick Donnelly [Tue, 29 Oct 2019 03:41:29 +0000 (20:41 -0700)]
qa: test fs:upgrade when running upgrade suite

Sometimes this suite breaks because it's not usually tested when upgrade
suites are modified.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31063 into master
Patrick Donnelly [Tue, 29 Oct 2019 03:37:31 +0000 (20:37 -0700)]
Merge PR #31063 into master

* refs/pull/31063/head:
qa: disable too few PG warning during Mimic deploy

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31178 from tchaikov/wip/rpm/pyyaml
Kefu Chai [Mon, 28 Oct 2019 23:57:36 +0000 (07:57 +0800)]
Merge pull request #31178 from tchaikov/wip/rpm/pyyaml

ceph.spec.in: add missing python-yaml dependency for mgr-k8sevents

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
5 years agoMerge PR #31168 into master
Sage Weil [Mon, 28 Oct 2019 19:59:43 +0000 (14:59 -0500)]
Merge PR #31168 into master

* refs/pull/31168/head:
ceph-daemon: try py2 import before py3
qa/suites/rados/singleton-nomsgr/ceph-daemon: make sure python3 is installed
qa/standalone/test_ceph_damon.sh: test with python2 and python3
mgr/ssh: python, not python3
ceph-daemon: python, not python3
ceph-daemon: os.makedirs
ceph-daemon: configparser is ConfigParser on py2
ceph-daemon: avoid py3-isms

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agomgr/rook: implement update_mds 31059/head
Sage Weil [Mon, 28 Oct 2019 19:12:37 +0000 (14:12 -0500)]
mgr/rook: implement update_mds

Note that this still doesn't provide control over active vs standby MDS
counts.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: implement 'mds update'
Sage Weil [Mon, 28 Oct 2019 19:08:27 +0000 (14:08 -0500)]
mgr/ssh: implement 'mds update'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: add 'mds update' command
Sage Weil [Mon, 28 Oct 2019 19:12:07 +0000 (14:12 -0500)]
mgr/orchestrator_cli: add 'mds update' command

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: unique names for mds instances
Sage Weil [Mon, 28 Oct 2019 18:43:47 +0000 (13:43 -0500)]
mgr/ssh: unique names for mds instances

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: name mgrs with random string id; add removal support
Sage Weil [Mon, 28 Oct 2019 18:15:58 +0000 (13:15 -0500)]
mgr/ssh: name mgrs with random string id; add removal support

- stop naming mgrs after the host, since that doesn't scale well
- add mgr removal support.  prefer mgrs that aren't recognized by the
  cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: provide get_unique_name helper
Sage Weil [Mon, 28 Oct 2019 19:15:08 +0000 (14:15 -0500)]
mgr/ssh: provide get_unique_name helper

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc: document rank option for journal reset 31201/head
Patrick Donnelly [Mon, 28 Oct 2019 18:13:04 +0000 (11:13 -0700)]
doc: document rank option for journal reset

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-daemon: try py2 import before py3 31168/head
Sage Weil [Mon, 28 Oct 2019 17:17:07 +0000 (12:17 -0500)]
ceph-daemon: try py2 import before py3

See https://github.com/ceph/ceph-medic/commit/f499a89b15b72a5bb842e1ebbc7cafc4daf58c1c

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/singleton-nomsgr/ceph-daemon: make sure python3 is installed
Sage Weil [Fri, 25 Oct 2019 21:34:15 +0000 (16:34 -0500)]
qa/suites/rados/singleton-nomsgr/ceph-daemon: make sure python3 is installed

Centos7 doesn't have it by default.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/standalone/test_ceph_damon.sh: test with python2 and python3
Sage Weil [Fri, 25 Oct 2019 21:20:46 +0000 (16:20 -0500)]
qa/standalone/test_ceph_damon.sh: test with python2 and python3

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: python, not python3
Sage Weil [Fri, 25 Oct 2019 21:03:24 +0000 (16:03 -0500)]
mgr/ssh: python, not python3

python 2.x is okay too.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: python, not python3
Sage Weil [Fri, 25 Oct 2019 21:02:35 +0000 (16:02 -0500)]
ceph-daemon: python, not python3

python2 is okay too.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: os.makedirs
Sage Weil [Fri, 25 Oct 2019 21:24:40 +0000 (16:24 -0500)]
ceph-daemon: os.makedirs

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: configparser is ConfigParser on py2
Sage Weil [Fri, 25 Oct 2019 21:16:48 +0000 (16:16 -0500)]
ceph-daemon: configparser is ConfigParser on py2

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: avoid py3-isms
Sage Weil [Wed, 23 Oct 2019 12:45:41 +0000 (07:45 -0500)]
ceph-daemon: avoid py3-isms

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: rename 'mds rm' arg
Sage Weil [Mon, 28 Oct 2019 16:55:30 +0000 (11:55 -0500)]
mgr/orchestrator_cli: rename 'mds rm' arg

'name' can be either a group prefix or an instance name, so use a general
variable name.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: rename 'mds add' arg
Sage Weil [Mon, 28 Oct 2019 16:54:02 +0000 (11:54 -0500)]
mgr/orchestrator_cli: rename 'mds add' arg

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add 'mds rm'
Sage Weil [Mon, 28 Oct 2019 16:19:33 +0000 (11:19 -0500)]
mgr/ssh: add 'mds rm'

This can take *either* an mds instance name *or* a group prefix.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: (broken) mds rm
Sage Weil [Wed, 23 Oct 2019 21:15:23 +0000 (16:15 -0500)]
mgr/ssh: (broken) mds rm

This wrong because it takes a daemon name, not a group name, and because
it relies on mds_metadata--connected daemons, not deployed daemons.  Must
fix once we have better inventory.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: make mds add work
Sage Weil [Tue, 22 Oct 2019 20:23:18 +0000 (15:23 -0500)]
mgr/ssh: make mds add work

This is clearly primitive and not where we want to end up, but an initial
step.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: add count, hosts args to 'mds add'
Sage Weil [Wed, 23 Oct 2019 21:13:26 +0000 (16:13 -0500)]
mgr/orchestrator: add count, hosts args to 'mds add'

Rook already uses the count; the hosts hint is not relevant.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: be consistently verbose
Sage Weil [Tue, 22 Oct 2019 20:21:29 +0000 (15:21 -0500)]
mgr/ssh: be consistently verbose

Print args and stdin in _run_ceph_daemon; drop various debug lines for
printing keyrings and configs along the way.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ActivePyModules: expose 'mds_metadata' to modules
Sage Weil [Wed, 23 Oct 2019 17:43:45 +0000 (12:43 -0500)]
mgr/ActivePyModules: expose 'mds_metadata' to modules

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorbd: add --merge-snapshots to disk-usage 30994/head
Alexandre Bruyelles [Fri, 18 Oct 2019 13:38:50 +0000 (15:38 +0200)]
rbd: add --merge-snapshots to disk-usage

Signed-off-by: Alexandre Bruyelles <jack@jack.fr.eu.org>
5 years agoMerge pull request #31180 from liewegas/revert-bluestore-pinned-list
Kefu Chai [Mon, 28 Oct 2019 15:18:02 +0000 (23:18 +0800)]
Merge pull request #31180 from liewegas/revert-bluestore-pinned-list

os/bluestore: revert cache pinned list

Reviewed-by: Mark Nelson <mnelson@redhat.com>
5 years agoceph-volume: add Ceph's device id to inventory 31072/head
Sebastian Wagner [Fri, 18 Oct 2019 11:59:44 +0000 (13:59 +0200)]
ceph-volume: add Ceph's device id to inventory

This will benefit the orchestrator and dashboard to show a unified view of devices with SMART data

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoceph-volume: mokeypatch calls to lvm related binaries 31197/head
Jan Fajerski [Mon, 28 Oct 2019 14:33:24 +0000 (15:33 +0100)]
ceph-volume: mokeypatch calls to lvm related binaries

Otherwise these tests fail occasionally when run on a system that does
not have lvm installed.

Fixes: https://tracker.ceph.com/issues/42045
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31071 from sebastian-philipp/python-common-mypy
Sebastian Wagner [Mon, 28 Oct 2019 14:07:08 +0000 (15:07 +0100)]
Merge pull request #31071 from sebastian-philipp/python-common-mypy

python-common: Add mypy testing

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #30995 from wjwithagen/wjw-wip-volume-zfs-inventory
Jan Fajerski [Mon, 28 Oct 2019 13:57:37 +0000 (14:57 +0100)]
Merge pull request #30995 from wjwithagen/wjw-wip-volume-zfs-inventory

ceph-volume-zfs: add the inventory command

5 years agoMerge pull request #31014 from tchaikov/wip-38378
Kefu Chai [Mon, 28 Oct 2019 12:53:07 +0000 (20:53 +0800)]
Merge pull request #31014 from tchaikov/wip-38378

mgr/dashboard: accept expected exception when SSL handshaking

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31092 from liewegas/wip-revert-42026-test
Kefu Chai [Mon, 28 Oct 2019 12:36:13 +0000 (20:36 +0800)]
Merge pull request #31092 from liewegas/wip-revert-42026-test

Revert "test: librados startup/shutdown racer test"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #31153 from ceph/wip-restful-node-items
Kefu Chai [Mon, 28 Oct 2019 12:29:20 +0000 (20:29 +0800)]
Merge pull request #31153 from ceph/wip-restful-node-items

restful: Query nodes_by_id for items

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31176 from tchaikov/wip/mgr/diskprediction_cloud/cleanup
Kefu Chai [Mon, 28 Oct 2019 12:27:22 +0000 (20:27 +0800)]
Merge pull request #31176 from tchaikov/wip/mgr/diskprediction_cloud/cleanup

mgr/diskprediction_cloud: refactor timeout() decorator

Reviewed-by: Rick Chen <rick.chen@prophetstor.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #31175 from tchaikov/wip/mon/OSDMonitor/cleanup
Kefu Chai [Mon, 28 Oct 2019 12:24:48 +0000 (20:24 +0800)]
Merge pull request #31175 from tchaikov/wip/mon/OSDMonitor/cleanup

mon/OSDMonitor: use initializer_list<> for {si,iec}_options

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/dashboard: update dashboard CODEOWNERShip 31193/head
Ernesto Puerta [Mon, 28 Oct 2019 12:18:28 +0000 (13:18 +0100)]
mgr/dashboard: update dashboard CODEOWNERShip

Fixes: https://tracker.ceph.com/issues/42507
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #30279 from runsisi/wip-fix-strerror_r
Kefu Chai [Mon, 28 Oct 2019 12:11:14 +0000 (20:11 +0800)]
Merge pull request #30279 from runsisi/wip-fix-strerror_r

common: fix compat of strerror_r

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #29836 from majianpeng/fix-async-msgr-perfcounter-bug
Kefu Chai [Mon, 28 Oct 2019 12:09:58 +0000 (20:09 +0800)]
Merge pull request #29836 from majianpeng/fix-async-msgr-perfcounter-bug

msg/async: Don't dec(msgr_active_connections) if conn still in accept…

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
5 years agocls/rbd: add snapshot_add raise -ESTALE test case 31149/head
wonderpow [Fri, 25 Oct 2019 08:19:52 +0000 (16:19 +0800)]
cls/rbd: add snapshot_add raise -ESTALE test case

Signed-off-by: wonderpow <wangbozhao@cmss.chinamobile.com>
5 years agoMerge pull request #31156 from cyx1231st/wip-seastar-msgr-testpeer
Kefu Chai [Mon, 28 Oct 2019 04:27:11 +0000 (12:27 +0800)]
Merge pull request #31156 from cyx1231st/wip-seastar-msgr-testpeer

test/crimson: implement a remote async TestPeer for crimson msgr tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agotest/crimson: add nonstop option in async TestPeer 31156/head
Yingxin Cheng [Fri, 25 Oct 2019 02:51:08 +0000 (10:51 +0800)]
test/crimson: add nonstop option in async TestPeer

If set, TestPeer won't shutdown if all tests are done, and will wait for
another round of tests.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agotest/crimson: add delay to markdown_peer()
Yingxin Cheng [Fri, 25 Oct 2019 02:15:04 +0000 (10:15 +0800)]
test/crimson: add delay to markdown_peer()

Let test sleep awhile for peer markdown propagated.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agotest/crimson: async msgr TestPeer for v2 failover tests
Yingxin Cheng [Wed, 23 Oct 2019 04:42:11 +0000 (12:42 +0800)]
test/crimson: async msgr TestPeer for v2 failover tests

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agotest/crimson: allow v2 failover tests to connect to remote TestPeer
Yingxin Cheng [Wed, 23 Oct 2019 02:48:54 +0000 (10:48 +0800)]
test/crimson: allow v2 failover tests to connect to remote TestPeer

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agotest/crimson: extract msgr test commands to header
Yingxin Cheng [Tue, 22 Oct 2019 02:24:08 +0000 (10:24 +0800)]
test/crimson: extract msgr test commands to header

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agoMerge pull request #30610 from ivancich/wip-no-schedule-reshard-during-reshard
J. Eric Ivancich [Sun, 27 Oct 2019 18:47:39 +0000 (14:47 -0400)]
Merge pull request #30610 from ivancich/wip-no-schedule-reshard-during-reshard

rgw: prevent bucket reshard scheduling if bucket is resharding

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>