Commit Graph

104583 Commits

Author SHA1 Message Date
Sage Weil
73511c489a mgr/ssh: add TemporaryDirectory impl for py2 compat
This didn't get copied over in 4bfcb5db6b

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-24 12:15:49 -06:00
Alfredo Deza
681b1962ce
Merge pull request #31816 from jan--f/c-v-no-unittest-mock
ceph-volume: import mock.mock instead of unittest.mock (py2)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-11-23 08:53:26 -05:00
Kefu Chai
d4d31687c3
Merge pull request #30863 from matthewoliver/improve_do_cmake
do_cmake.sh: Add CEPH_GIT_DIR

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-23 09:13:13 +08:00
Sage Weil
a7542dcf6b Merge PR #31502 into master
* refs/pull/31502/head:
	qa/tasks/ceph2: get ceph-daemon from same place as ceph
	qa/tasks/ceph2: use safe_while
	qa/tasks/ceph2: pull image using sha1
	qa/tasks/ceph2: docker needs quay.io/ prefix for image name
	qa/workunits/rados/test_python: make sure rbd pool exists
	qa/suites/rados/ssh: new tests!
	qa/tasks/ceph2: pull ceph-ci/ceph:$branch
	qa/tasks/ceph2: register_daemons after pods start
	qa/tasks/ceph2: fix conf
	qa/tasks/ceph2: add restart
	qa/tasks/ceph2: pass ceph-daemon path to DaemonState
	qa/tasks/ceph2: tolerate no mdss or 1 mgr
	qa/tasks/ceph: replace wait_for_osds_up with manager.wait_for_all_osds_up
	qa/tasks/ceph: wait-until-healthy
	qa/tasks/ceph2: set up managers
	qa/tasks/ceph2: use seed ceph.conf
	qa/tasks/ceph: healthy: use manager helpers (instead of teuthology/misc ones)
	qa/tasks/ceph2: name mds daemons
	qa/tasks/ceph2: fix osd ordering
	qa/tasks/ceph2: start up mdss
	qa/tasks/ceph2: set up daemon handles and use them to stop
	qa/tasks/ceph2: make it multicluster-aware
	qa/tasks/ceph2: can bring up mon, mgr, osds!
	qa/tasks/ceph2: basic task to bring up cluster with ceph-daemon and ssh

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-11-22 15:28:17 -06:00
Neha Ojha
941807d88e
Merge pull request #31657 from liewegas/fix-merge-vs-backoff
osd: release backoffs during merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2019-11-22 11:47:49 -08:00
Sage Weil
69e62a0e40 qa/tasks/ceph2: get ceph-daemon from same place as ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-22 19:44:45 +00:00
Sage Weil
378fed3aa0 Merge PR #31698 into master
* refs/pull/31698/head:
	rpm,deb: add cephdaemon user and sudoers file
	ceph-daemon: use mgr/ssh command to create the ssh key
	mgr/ssh: add 'ssh generate-key' and 'ssh clear-key' commands
	mgr/ssh: add mode option
	mgr/ssh: add 'ssh get-pub-key' and 'ssh get-user' commands
	mgr/ssh: convert to command decorations
	mgr/orchestrator: move command annotation helpers to orchestrator.py

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-22 11:24:27 -06:00
Sage Weil
47514d5154 Merge PR #31790 into master
* refs/pull/31790/head:
	Revert "Merge pull request #16715 from adamemerson/wip-I-Object!"

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-11-22 11:22:27 -06:00
Jan Fajerski
c1bd09f259 ceph-volume: import mock.mock instead of unittest.mock (py2)
Fixes: bb4de1a3fc
Fixes: https://tracker.ceph.com/issues/42970

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-22 17:27:08 +01:00
Jan Fajerski
5ae7bcab31
Merge pull request #31814 from jan--f/c-v-check-selinux-py2
ceph-volume: check if we run in an selinux environment, now also in py2
2019-11-22 17:26:45 +01:00
Sage Weil
5bb652cc2d Merge PR #31788 into master
* refs/pull/31788/head:
	ceph-daemon: append newline before public key string

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-22 09:33:36 -06:00
Sage Weil
54ddf2c897 Revert "Merge pull request #16715 from adamemerson/wip-I-Object!"
This reverts commit 669453138d, reversing
changes made to 36f5fcbb97.

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

- conflicts due to code rearrangement in 14b0db908f
2019-11-22 09:24:25 -06:00
Jan Fajerski
12c5f89ddb ceph-volume: python2 raises OSError on Popen with missing binary.
For compatibility alias FileNotFoundError to OSError.

Fixes: 72b79f71fa
Fixes: https://tracker.ceph.com/issues/42967

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-22 15:51:00 +01:00
Sage Weil
2c7aa779be Merge PR #31798 into master
* refs/pull/31798/head:
	ceph-daemon: ceph-volume works without an fsid
	ceph-daemon: several commands that can infer fsids still require them
	ceph-daemon: fix fsid inference

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-22 08:50:52 -06:00
Jan Fajerski
114aa57df2 ceph-volume: py2 compatibility for selinux test
Fixes: af30c7f956

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-22 15:49:41 +01:00
Alfredo Deza
842b10180d
Merge pull request #31809 from jan--f/c-v-check-selinux
ceph-volume: check if we run in an selinux environment

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-11-22 09:28:21 -05:00
Sage Weil
d3f51251e5 ceph-daemon: ceph-volume works without an fsid
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-22 07:44:56 -06:00
Sage Weil
80ab64b2ae ceph-daemon: several commands that can infer fsids still require them
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-22 07:44:56 -06:00
Sage Weil
82cbfbe919 ceph-daemon: fix fsid inference
All return paths should return func.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-22 07:44:56 -06:00
Ilya Dryomov
6c7a23b343
Merge pull request #31771 from idryomov/wip-krbd-read-only-test
qa: update krbd_blkroset.t and add krbd_get_features.t

Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2019-11-22 12:43:13 +01:00
Jan Fajerski
72b79f71fa ceph-volume: don't assume SELinux
Expect selinux related binaries to not be present.

Fixes: 33c8a64a54
Fixes: https://tracker.ceph.com/issues/42957

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-22 11:37:36 +01:00
Kefu Chai
39b3743261
Merge pull request #30621 from wjwithagen/wjw-fix-freebsd-linking
cmake: use GNU linker on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-22 18:27:02 +08:00
Jan Fajerski
af30c7f956 ceph-volume: fix test test_selinuxenabled_doesnt_exist
Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-22 11:11:47 +01:00
Nathan Cutler
77226cd201
Merge pull request #31777 from smithfarm/wip-mimic-v13.2.7-release-notes
doc/releases: add release notes for mimic v13.2.7

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-11-22 09:13:20 +01:00
Kefu Chai
4c3127d282
Merge pull request #30387 from rzarzynski/wip-crimson-errorator
crimson: bring ceph::errorator with its first appliances

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-22 13:30:27 +08:00
Patrick Donnelly
2106883abb
Merge PR #31793 into master
* refs/pull/31793/head:
	mds: release free heap pages after trim

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-21 20:01:53 -08:00
Yuri Weinstein
824873c4e8
Merge pull request #31799 from yuriw/wip-yuriw-crontab-master
qa/tests: trying to fix syntax error that prevented mimic-x to be add…
2019-11-21 17:44:28 -08:00
Yuri Weinstein
9d57de1e78 qa/tests: trying to fix syntax error that prevented mimic-x to be added to the schedule
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-11-21 16:43:54 -08:00
Sage Weil
a15af0a053 Merge PR #31465 into master
* refs/pull/31465/head:
	doc/install/containers: add summary of containers and branches

Reviewed-by: Dan Mick <dmick@redhat.com>
2019-11-21 16:26:04 -06:00
Sage Weil
7948f5c3ef Merge PR #31702 into master
* refs/pull/31702/head:
	ceph-daemon: infer fsid for shell, enter, ceph-volume, unit, logs

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-21 15:41:56 -06:00
Sage Weil
96e9b8bc29 qa/tasks/ceph2: use safe_while
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 15:35:36 -06:00
Sage Weil
660233935e rpm,deb: add cephdaemon user and sudoers file
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 15:34:07 -06:00
Nathan Cutler
96bea8a174 doc/releases: add release notes for mimic v13.2.7
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-21 22:07:02 +01:00
Casey Bodley
8aa638b0fa
Merge pull request #30960 from yuvalif/wip-yuval-add-kafka-notif-endpoint
rgw/pubsub: add kafka notification endpoint

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2019-11-21 14:42:23 -05:00
Sage Weil
4bfcb5db6b ceph-daemon: use mgr/ssh command to create the ssh key
The mgr/ssh module has a command now to do this; use that instead of
generating the key ourselves and manually injecting it.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 12:57:13 -06:00
Sage Weil
4c9c01098b mgr/ssh: add 'ssh generate-key' and 'ssh clear-key' commands
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 12:57:13 -06:00
Patrick Donnelly
af4cac5ec7
mds: release free heap pages after trim
MDS free heap space can grow to large for some workloads (like smallfile
and recursive deletes). This can cause the MDS mapped memory to grow
well beyond memory targets.

When we finally use the PriorityCache in the MDS, this will not be
necessary anymore as the PriorityCache already does this.

Fixes: https://tracker.ceph.com/issues/42938
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-21 10:54:34 -08:00
Sage Weil
822f8ed2f5 mgr/ssh: add mode option
Set the mgr/ssh/mode option to ceph-daemon-package to switch to a mode
where we assume ceph-daemon is installed on the remote host and we can
ssh as user cephdaemon.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 12:41:02 -06:00
Sage Weil
9ba5225f6f mgr/ssh: add 'ssh get-pub-key' and 'ssh get-user' commands
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 12:40:53 -06:00
Sage Weil
cc1f04aa0c mgr/ssh: convert to command decorations
Also fix up set-ssh-config error checking a bit.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 12:39:46 -06:00
Sage Weil
eb1d6615d1 mgr/orchestrator: move command annotation helpers to orchestrator.py
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 12:35:42 -06:00
Sage Weil
71bc236588 Merge PR #31747 into master
* refs/pull/31747/head:
	qa/suites/rados/singleton-nomsgr/all/balancer: whitelist PG_AVAILABILITY

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-11-21 11:49:35 -06:00
Nathan Cutler
84218d0083
Merge pull request #31734 from smithfarm/wip-cbs-fork-option
ceph-backport.sh: allow user to specify --fork explicitly

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-11-21 18:43:22 +01:00
Sage Weil
ad6bd514c8 qa/tasks/ceph2: pull image using sha1
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00
Sage Weil
9ea41b8abe qa/tasks/ceph2: docker needs quay.io/ prefix for image name
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00
Sage Weil
5b809cd330 qa/workunits/rados/test_python: make sure rbd pool exists
The ceph2 task doesn't create it for you.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00
Sage Weil
3d9686405c qa/suites/rados/ssh: new tests!
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00
Sage Weil
3edb0f8fa1 qa/tasks/ceph2: pull ceph-ci/ceph:$branch
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00
Sage Weil
f38ed110ca qa/tasks/ceph2: register_daemons after pods start
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00
Sage Weil
4ae777679f qa/tasks/ceph2: fix conf
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-21 10:46:54 -06:00