Commit Graph

103643 Commits

Author SHA1 Message Date
Sage Weil
d3f870ebb8 ceph-daemon: stop + reset-failed existing unit on daemon deploy
Normally it won't exist, but it will on a re-deploy.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
bb79365548 ceph-daemon: make second call arg optional
If not specified, pull it from command[0].

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
bb4318d706 ceph-daemon: make 'deploy' on mon only to mkfs step is mon doesn't yet exist
This allows us to (re)deploy a mon container like the other daemon types,
which means rewriting the config, keyring, and systemd unit(s).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
dd27ba50f5 mgr/ssh,orchestrator_cli: add 'restart' service action
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
72b4b72824 mgr/ssh: service[-instance] [start|stop]
Note that 'reload' is meaningless for ssh orch...

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
d214f5e4ca mgr/ssh: simplify get_services call for 'mds update'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:26:49 -05:00
Sage Weil
3acb8d9e9d mgr/ssh: make _get_services take service *id* or service *name*
Name is the group, id is the instance.  A bit confusing, but this is what
orchestrator.py uses.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:26:01 -05:00
Sage Weil
298a0b3f17 mgr/ssh: fix 'service ls' on stopped services
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
1a3d0e872e mgr/ssh: move some code around
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
332daeac35 doc/mgr/orchestrator_cli: 'service ls' works for ssh
See 7fc78b63425abd192a82f812958349f2bf079dea merge commit.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
f92b0061dd doc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh
See f5bc2bd74a05bb486fbbca2de4dbe9a1cacd605c merge.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
46867fd67b 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>
2019-10-31 10:40:59 -05:00
Ilya Dryomov
f41de0bec1
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>
2019-10-31 15:45:19 +01:00
Volker Theile
b315f2eeea
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>
2019-10-31 12:07:31 +01:00
Volker Theile
0562fc9a4b
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>
2019-10-31 12:05:06 +01:00
Nathan Cutler
14cdd8e95f
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>
2019-10-31 12:02:58 +01:00
Patrick Donnelly
35b0b52153
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>
2019-10-30 12:22:48 -07:00
Sage Weil
57c6e51755 ceph-daemon: no extra newline needed in authorized_keys file
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 14:09:36 -05:00
Sage Weil
df40a49eb8 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>
2019-10-30 14:07:52 -05:00
Sage Weil
d2c66f3879 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>
2019-10-30 14:04:07 -05:00
Ilya Dryomov
5011cc926c 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>
2019-10-30 19:51:55 +01:00
Patrick Donnelly
9dc07d8096
qa: add tests for CephFS admin commands
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-10-30 11:44:26 -07:00
Sage Weil
9c9bb19d43 ceph-daemon: deal with lack of TemporaryDirectory on py2
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 13:29:49 -05:00
Sage Weil
749a0bdb61 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>
2019-10-30 13:29:49 -05:00
Sage Weil
93570a501b ceph-daemon: make ConfigParser py2 compatible
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 13:29:49 -05:00
Tiago Melo
a7daa902a6 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>
2019-10-30 15:15:18 -01:00
Patrick Donnelly
25f4a0357c
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>
2019-10-30 09:09:06 -07:00
Jason Dillaman
f4d99f796a
Merge pull request #31161 from trociny/wip-42488
rbd-mirror: mirrored clone should be same format 

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-30 12:07:30 -04:00
Jason Dillaman
5f823f8575
Merge pull request #31149 from wonderpow/master1
cls/rbd: add snapshot_add raise -ESTALE test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-30 12:07:12 -04:00
Jason Dillaman
922385c6c2
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>
2019-10-30 12:06:41 -04:00
Jason Dillaman
b50e6f5894
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>
2019-10-30 12:06:08 -04:00
Lenz Grimmer
5df7223985
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>
2019-10-30 15:32:15 +00:00
Volker Theile
4385ce4805 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>
2019-10-30 15:52:28 +01:00
Nathan Cutler
49ab75109f 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>
2019-10-30 14:30:08 +01:00
Lenz Grimmer
f61d002825
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>
2019-10-30 12:32:37 +00:00
Lenz Grimmer
fb29d02330
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>
2019-10-30 11:58:15 +00:00
Alfonso Martínez
da72765d8e 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>
2019-10-30 12:31:13 +01:00
Nathan Cutler
2566d95e31
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>
2019-10-30 11:54:18 +01:00
Nathan Cutler
942e7385b6 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: af43b3cc3b
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-10-30 11:46:24 +01:00
Nathan Cutler
f28fbe6c54
Merge pull request #30988 from smithfarm/wip-bri-multi
backport-resolve-issue: resolve multiple backport issues
2019-10-30 11:31:21 +01:00
Sebastian Wagner
e463177d24 mgr/dashboard: remove space in tox.ini deps
Fixes: https://tracker.ceph.com/issues/42469
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-10-30 11:27:27 +01:00
Nathan Cutler
96cb16d5a6
Merge pull request #31163 from callithea/wip-issue-42489
doc: Small update of SubmittingPatches-backports

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2019-10-30 11:02:30 +01:00
Nathan Cutler
147f386002
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>
2019-10-30 10:30:01 +01:00
Kefu Chai
2210425a68
Merge pull request #29930 from IlsooByun/rocksdb_ver
cmake: require RocksDB 5.14 or higher

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-30 10:11:01 +08:00
Sage Weil
a1a220d137 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>
2019-10-29 17:34:34 -05:00
Patrick Donnelly
b4f772d4f0
Merge PR #30369 into master
* refs/pull/30369/head:
	doc/cephfs: add doc for cephfs io path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-10-29 15:32:18 -07:00
Patrick Donnelly
80e6cb7001
Merge PR #31201 into master
* refs/pull/31201/head:
	doc: document rank option for journal reset

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2019-10-29 12:39:06 -07:00
Sage Weil
3c0df4489c 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>
2019-10-29 13:39:40 -05:00
Alfredo Deza
cfc1f71801
Merge pull request #31159 from alfredodeza/wip-rm42484
ceph-volume tests remove xenial from functional testing

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
2019-10-29 12:05:11 -04:00
Gangbiao Liu
22974178ad test/pybind: add create_snap rasie ImageExists test case
Signed-off-by: Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
2019-10-29 23:25:33 +08:00