Commit Graph

103878 Commits

Author SHA1 Message Date
Patrick Donnelly
76493421d2
Merge PR #31330 into master
* refs/pull/31330/head:
	messages: protect CephFS messages get/put methods
	messages: protect MClientCapRelease cons
	messages: simplify MMDSCacheRejoin default cons
	mds: simplify type declarations

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-04 22:21:33 -08:00
Casey Bodley
5a15148b7b
Merge pull request #31374 from cbodley/wip-qa-rgw-multisite-sse
qa/rgw: use 'testing' kms backend for multisite tests

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2019-11-04 13:45:24 -05:00
Nathan Cutler
b33f788790 ceph-backport.sh: increment the version number
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-04 19:33:44 +01:00
Nathan Cutler
22b27c8c93 ceph-backport.sh: delete deprecated config file after setup complete
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-04 19:33:44 +01:00
Nathan Cutler
c250cf2589 ceph-backport.sh: implement interactive setup routine and new options
This commit implements several new features:

* a --cherry-pick-only option
* a --force option
* an --existing-pr option
* an interactive setup routine

The --cherry-pick-only option can be used to test whether a backport
cherry-picks cleanly, for example. This is the same as the --prepare
functionality that was provided by an earlier version of the script, and
--prepare is re-introduced as a synonym for --cherry-pick-only.

The --force option can be used to make the script less careful (less
"cowardly"). For example, if the script refuses to do a backport because the
backport tracker issue is assigned to someone else, the script will "cowardly"
refuse to continue. Use --force to override. Be aware that --force will also
blow away an existing wip branch - the script asks for user confirmation in this
case.

The new --existing-pr option can be used to specify the number (ID) of an
existing backport PR that addresses the backport tracker issue given via the
positional argument.

The new "interactive setup routine" should make the setup process much simpler
for the user. If there is a setup issue, the script produces a report and starts
the interactive setup routine, which prompts the user for the needed
information.

Also, the script no longer requires the user to explicitly provide values for
github_user and redmine_user_id. Instead, it divines the correct values from the
GitHub token and the Redmine key, respectively.

Finally, the existing ~/bin/backport_common.sh file is deprecated in favor of
two files:

    ~/.github_token
    ~/.redmine_key

(The latter is already used by Sage's build-integration-branch tool and it
didn't make sense to have two different configuration files for a single
purpose.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-04 19:33:40 +01:00
Casey Bodley
ad4ff5f948 qa/rgw: use 'testing' kms backend for multisite tests
a missing piece from https://github.com/ceph/ceph/pull/30940

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-11-04 12:49:07 -05:00
Sebastian Wagner
be6b09feb2
Merge pull request #31192 from sebastian-philipp/run_mypy-0.740
script/run_mypy: Support mypy 0.740

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-11-04 17:37:40 +01:00
Sage Weil
8afa48835e Merge PR #31341 into master
* refs/pull/31341/head:
	ceph-daemon: only set up /var/run/ceph/$fsid if it exists

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-04 10:34:57 -06:00
Sage Weil
abbe73c77b Merge PR #31331 into master
* refs/pull/31331/head:
	ceph-daemon: Use `shutil` to move/copy files

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-04 10:34:43 -06:00
Sage Weil
3507d74336 Merge PR #31353 into master
* refs/pull/31353/head:
	doc/orchestrator: Fix various issues in Orchestrator CLI documentation

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-04 10:33:04 -06:00
Sage Weil
ce729f4023 Merge PR #31329 into master
* refs/pull/31329/head:
	ceph-daemon: Fix `ls` cmd for legacy confs

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-04 10:27:04 -06:00
Michael Fritch
ddaa81e93e
ceph-daemon: Fix ls cmd for legacy confs
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-04 09:22:01 -07:00
Sage Weil
3a0edae654 Merge PR #31328 into master
* refs/pull/31328/head:
	ceph-daemon: raise RuntimeError when CephContainer.run() fails
2019-11-04 10:17:05 -06:00
Michael Fritch
62f781d3c5
ceph-daemon: Use shutil to move/copy files
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-04 09:07:20 -07:00
Michael Fritch
f956c45851
ceph-daemon: raise RuntimeError when CephContainer.run() fails
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-04 08:54:09 -07:00
Sage Weil
79041e03f3 ceph-daemon: make rm-daemon reset-failed
We did this with rm-cluster and forgot to update rm-daemon too.  Also,
switch to call instead of call_throws.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 09:41:14 -06:00
Sage Weil
3a1ac3ff6a ceph-daemon: make rm-cluster handle failed unit cleanup
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 09:36:02 -06:00
Casey Bodley
d08342b8cb qa/rgw: remove whitelist for SLOW_OPS against ec pools
now that https://tracker.ceph.com/issues/41834 is resolved, we can
enforce the SLOW_OPS failures again in ec pool testing

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-11-04 10:12:23 -05:00
Lenz Grimmer
7e4ef7f8ec
mgr/dashboard: Automatically use correct chromedriver version (#31352)
mgr/dashboard: Automatically use correct chromedriver version

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-11-04 14:31:37 +00:00
Sage Weil
9a01f1dcbb Merge PR #31292 into master
* refs/pull/31292/head:
	mgr/ssh: fix remove_mds exception
	doc/mgr/orchestrator_cli: remove extra characters after checkmarks
	doc/mgr/orchestrator_cli: no {stop,start,restart} for all the random svcs
	mgr/ssh: add 'redeploy' operation
	ceph-daemon: stop + reset-failed existing unit on daemon deploy
	ceph-daemon: make second call arg optional
	ceph-daemon: make 'deploy' on mon only to mkfs step is mon doesn't yet exist
	mgr/ssh,orchestrator_cli: add 'restart' service action
	mgr/ssh: service[-instance] [start|stop]
	mgr/ssh: simplify get_services call for 'mds update'
	mgr/ssh: make _get_services take service *id* or service *name*
	mgr/ssh: fix 'service ls' on stopped services
	mgr/ssh: move some code around
	doc/mgr/orchestrator_cli: 'service ls' works for ssh
	doc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-04 08:17:16 -06:00
Sage Weil
e019f5fe58 mgr/ssh: fix remove_mds exception
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
a78ece253d doc/mgr/orchestrator_cli: remove extra characters after checkmarks
Not sure what those were.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
3f2f38cee9 doc/mgr/orchestrator_cli: no {stop,start,restart} for all the random svcs
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
Sage Weil
f37a05a46d mgr/ssh: add 'redeploy' operation
This will stop, reprovision container, and restart. For most daemons, that
means we can

 - change the container image
 - refresh the config
 - refresh the keyring

For OSDs, it means we also re-run ceph-volume activate.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-04 08:03:48 -06:00
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
Lenz Grimmer
a777e88b03
Merge pull request #31266 from rhcs-dashboard/wip-42565-master
mgr/dashboard: fix LazyUUID4 not serializable

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-11-04 14:00:04 +00:00
Lenz Grimmer
65efec1d73
mgr/dashboard: CephFS directory component (#30047)
mgr/dashboard: CephFS directory component

Reviewed-by: Volker Theile <vtheile@suse.com>
2019-11-04 13:24:51 +00:00
Stephan Müller
31ea959464 mgr/dashboard: Searchable objects for table
The table can now search through objects, by default it won't search
through them, but it won't fail like before.

The RBD list page is now capable of searching through objects, which
only exist on an RBD that was cloned from a snapshot.

Fixes: https://tracker.ceph.com/issues/42480
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-11-04 14:06:33 +01:00
Volker Theile
c3c2f600fe doc/orchestrator: Fix various issues in Orchestrator CLI documentation
Signed-off-by: Volker Theile <vtheile@suse.com>
2019-11-04 13:00:12 +01:00
Tiago Melo
242e76e884 mgr/dashboard: Automatically use correct chromedriver version
Every Chrome version requires a corresponding chromedriver version for the e2e
test to work.
Since we were using a fixed chromedriver version, each time chrome was updated
the e2e scripts stopped working.
With this new script we will check which version of Chrome is installed and
update chromedriver to the correct version.

Fixes: https://tracker.ceph.com/issues/42607

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
Signed-off-by: Tiago Melo <tmelo@suse.com>
2019-11-04 10:47:43 -01:00
Sebastian Wagner
057d5ee7fa script/run_mypy: Support mypy 0.740
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Co-Authored-By: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
2019-11-04 10:36:07 +01:00
Sebastian Wagner
8ece36241e
Merge pull request #31191 from sebastian-philipp/ceph-volume-pr-template
github: Add ceph-volume to list of jenkins commands

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
2019-11-04 09:41:28 +01:00
Patrick Donnelly
3bc7a8732f
messages: protect CephFS messages get/put methods
Use SafeMessage inheritance so that only intrusive pointers can modify
the reference count. This is just a defensive programming refactor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-03 21:46:20 -08:00
Patrick Donnelly
4fc68320f8
messages: protect MClientCapRelease cons
This should only be constructed via make_message.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-03 21:34:13 -08:00
Patrick Donnelly
1f21fca786
messages: simplify MMDSCacheRejoin default cons
Trivial initializations can be moved out.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-03 21:34:13 -08:00
Patrick Donnelly
16c4c8bb18
mds: simplify type declarations
This is a trivial refactor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-03 21:19:00 -08:00
Kefu Chai
324f8781ca
Merge pull request #31326 from cbodley/wip-cmake-mgr-cap
cmake: define mgr_cap_obj library when WITH_MGR=OFF

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-03 12:55:21 -08:00
Sage Weil
851a8e7c92 Merge PR #31015 into master
* refs/pull/31015/head:
	mgr/orchestrator: Fix raise_if_exception for Python 3

Reviewed-by: Tim Serong <tserong@suse.com>
2019-11-03 13:42:48 -06:00
Sage Weil
f5c7a8c986 qa/standalone/test_ceph_daemon: fix multi-version python test
We have to rewrite the shebang line, since it is no longer just
'#/usr/bin/env python' (as of e12ad1b016).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-03 10:09:06 -06:00
Sage Weil
294cd54449 ceph-daemon: only set up /var/run/ceph/$fsid if it exists
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-03 09:52:59 -06:00
Sage Weil
b481d829fd Merge PR #31337 into master
* refs/pull/31337/head:
	Fixing typo in ceph-daemon script for the output_pub_ssh_key argument

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-03 09:44:44 -06:00
John McGowan
a3ee73d4c9 Fixing typo in ceph-daemon script for the output_pub_ssh_key argument
Signed-off-by: John McGowan <john@steakfest.com>
2019-11-03 07:33:53 -07:00
Kefu Chai
6fe35ef3c5
Merge pull request #31335 from wjwithagen/wjw-fix-objecstore-bluestore
test: move bluestore dependent code under WITH_BLUESTORE

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-03 04:56:17 -08:00
Kefu Chai
3b0dd6430a
Merge pull request #31312 from changchengx/qa
qa: correct zap disk with ceph-deploy tool

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-03 04:50:51 -08:00
Kefu Chai
20a29355cd
Merge pull request #30791 from kshtsk/wip-python3-no-iteritems-ceph-deploy
tasks/ceph_deploy: get rid of iteritems for python3

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-03 04:49:08 -08:00
Kefu Chai
e4247e183c
Merge pull request #31209 from wjwithagen/wjw-fix-snprintf
common: fix missing <stdio.h> include

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-03 04:44:52 -08:00