Commit Graph

105521 Commits

Author SHA1 Message Date
Patrick Donnelly
333e938327
Merge PR #31595 into master
* refs/pull/31595/head:
	mds: optimize function, fragset_t::simplify, to improve the efficiency of  merging fragment

Reviewed-by: Zheng Yan <zyan@redhat.com>
2019-12-16 16:01:19 -08:00
Patrick Donnelly
a80fd8bc39
Merge PR #32020 into master
* refs/pull/32020/head:
	mds: fix assert(omap_num_objs <= MAX_OBJECTS) of OpenFileTable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-16 16:00:08 -08:00
Patrick Donnelly
71df46d5a7
Merge PR #32042 into master
* refs/pull/32042/head:
	mds: update default MDS cache size memory limit
	common/options: note runtime effect for some MDS configs

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
2019-12-16 15:57:38 -08:00
Sage Weil
0172dab437 Merge PR #32275 into master
* refs/pull/32275/head:
	qa/suites/upgrade: all upgrades to octopus on ubuntu only

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-16 13:57:08 -06:00
Jason Dillaman
7a1756373d
Merge pull request #32274 from dillaman/wip-rbd-mirror-test
rbd-mirror: ensure deterministic ordering of method calls

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2019-12-16 14:44:28 -05:00
Sage Weil
eedb3ab2b5 Merge PR #32212 into master
* refs/pull/32212/head:
	rpm/cephadm: start description and summary with capital letter
	rpm/cephadm: move HOMEDIR to /var/lib and make scriptlets idempotent on SUSE

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
2019-12-16 13:26:14 -06:00
Sage Weil
62f05f9962 Merge PR #32277 into master
* refs/pull/32277/head:
	lvm/deactivate: add unit tests, remove --all

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-16 13:26:00 -06:00
Sage Weil
462ee827cf qa/suites/upgrade: all upgrades to octopus on ubuntu only
We cannot do a traditional upgrade (install old package, start cluster,
install new package, ...) because nautilus is el7-only and octopus is
el8-only.

So, do these tests on ubuntu.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-16 12:41:34 -06:00
Jason Dillaman
48e14037b3
Merge pull request #32217 from trociny/wip-41557-2
librbd: explicitly specify mode on mirror image enable

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-16 13:14:28 -05:00
Jan Fajerski
c13901f963 lvm/deactivate: add unit tests, remove --all
Remove the --all flag until its actually implemented.

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

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-12-16 17:15:30 +01:00
Sage Weil
ff11518817 Merge PR #32198 into master
* refs/pull/32198/head:
	cephadm: Fix Python2.7 isssue
	cephadm: fix how uid/gid is determined
	cephadm: add sample configuration for prometheus
	cephadm: support deployment of prometheus

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-16 10:04:13 -06:00
Nathan Cutler
88ad653874 rpm/cephadm: start description and summary with capital letter
This commit fixes RPMLINT issue:

cephadm.x86_64: E: summary-not-capitalized (Badness: 20) C cephadm utility to bootstrap Ceph clusters
Summary doesn't begin with a capital letter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-12-16 17:03:07 +01:00
Nathan Cutler
f05a769e0d rpm/cephadm: move HOMEDIR to /var/lib and make scriptlets idempotent on SUSE
Also introduce a cephadm group. Since the cephadm package does not
require ceph-common, the ceph group is not available to be used.

Drop the -r option to useradd, because cephadm does not qualify as a system
user.

Finally, fix the SUSE RPM build. SUSE RPM builds using "osc" implement a check
that compares the cephadm package's "before" and "after" file lists, to enforce
idempotency of the scriptlets. The "userdel cephadm" in the %postun breaks this
check, so omit it from the SUSE RPM builds.

Fixes: https://tracker.ceph.com/issues/43285
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-12-16 17:03:01 +01:00
Jason Dillaman
29772bf2c0 rbd-mirror: ensure deterministic ordering of method calls
The mock tests will require method calls in a known order. Previously
different environments could evaluate the parameters in different
orders resulting in out-of-order method calls.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-16 09:46:15 -05:00
Laura Paduano
c28876f008
Merge pull request #32211 from rhcs-dashboard/43284-fix-frontend-e2e-script
mgr/dashboard: run-frontend-e2e-tests.sh: allow user defined BASE_URL…

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
2019-12-16 15:28:33 +01:00
Laura Paduano
f052fbb5d6
Merge pull request #31819 from ricardoasmarques/wip-42687
mgr/dashboard: iSCSI targets not available if any gateway is down

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
2019-12-16 15:27:46 +01:00
Sage Weil
0f68bec975 Merge PR #32246 into master
* refs/pull/32246/head:
	mgr/cephadm: remove redundant /dev when blinking device light

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-16 07:15:28 -06:00
Mykola Golub
cd1dadd3e9
Merge pull request #32257 from dillaman/wip-41556
rbd-mirror: extract journal replaying logic from image replayer 

Reviewed-by: Mykola Golub <mgolub@suse.com>
2019-12-16 13:53:34 +02:00
Sebastian Wagner
d4ce0ccacb cephadm: Fix Python2.7 isssue
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-16 12:19:03 +01:00
Lenz Grimmer
1143de2ff8
mgr/dashboard: CephFS quota management (#31811)
mgr/dashboard: CephFS quota management

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-12-16 09:55:36 +00:00
Lenz Grimmer
efdcbcc6e1
mgr/dashboard: add password expiration date (#30939)
mgr/dashboard: add password expiration date

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-12-16 09:49:16 +00:00
Lenz Grimmer
523bec20d3
mgr/dashboard: Display OSD device class in OSD list (#32092)
mgr/dashboard: Display OSD device class in OSD list

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-12-16 09:42:56 +00:00
Kefu Chai
0a83d9003e
Merge pull request #31815 from tchaikov/wip-mgr-dashboard-gevent
mgr/dashboard: install teuthology using pip

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
2019-12-16 17:30:08 +08:00
Mykola Golub
1fb9a74091 rbd: show mirror mode in image info
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-12-16 08:24:30 +00:00
Mykola Golub
7171049f67 rbd: improve mirror snapshot list formatting for status command
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-12-16 08:24:30 +00:00
Mykola Golub
144c885d75 rbd: allow to specify mode on mirror image enable
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-12-16 08:24:30 +00:00
Mykola Golub
678b53735b librbd: explicitly specify mode on mirror image enable
- don't use journaling feature to chose the mode;
- provide new API function mirror_image_enable2;
- return back the old behavior to automatically enable/disable
  journaling feature on enabling/disabling image mirroring.

Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-12-16 08:24:30 +00:00
Jason Dillaman
0d36eb58f8 rbd-mirror: switch image replayer to new standalone journal replayer
Remove all the original journal replaying code embedded in the image
replayer and instead rely on the new journal replayer class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 20:15:26 -05:00
Jason Dillaman
2df70c2e23 rbd-mirror: extract journal replay logic to its own class
This will help to greatly reduce the journal-specific code in the
current image replayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 20:08:10 -05:00
Jason Dillaman
8a9a1bf6eb rbd-mirror: moved image asok/perf counter name helper to utils
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 20:08:10 -05:00
Jason Dillaman
975c9047d0 rbd-mirror: moved event pre-processor to sub-namespace
The current implementation is tied to journal-based replaying so
move it down into the journal sub-namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 20:03:36 -05:00
Jason Dillaman
799dfc2daf rbd-mirror: moved replay status formatter to sub-namespace
The current implementation is tied to journal-based replaying so
move it down into a new journal sub-namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 20:03:36 -05:00
Jason Dillaman
f7f6b5d125 rbd-mirror: drop 'using namespace' in image replayer state machine
This is going to cause conflicts w/ the '::journal' namespace and
future 'rbd:🪞:image_replayer::journal' namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 20:03:36 -05:00
Jason Dillaman
25a3c76f1a
Merge pull request #32142 from changchengx/doc_libvirt
doc/rbd: simplify libvirt usage

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 18:46:40 -05:00
Jason Dillaman
e7c21f6019
Merge pull request #32243 from trociny/wip-43289
rbd-mirror: fix race on namespace replayer initialization failure

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 18:29:17 -05:00
Jason Dillaman
d9ad719192
Merge pull request #32184 from trociny/wip-43004
rbd-mirror: rename per-image replication perf counters

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 18:28:52 -05:00
Jason Dillaman
7f96c28e55
Merge pull request #32113 from lixiaoy1/master
librbd: finish write request early

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-15 18:27:23 -05:00
Sage Weil
73f0c629c0 Merge PR #32251 into master
* refs/pull/32251/head:
	mds/MDSDaemon: fix asok 'exit' and 'respawn' commands

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-15 16:40:45 -06:00
Sage Weil
65e54703a1 Merge PR #32260 into master
* refs/pull/32260/head:
	.organizationmap: Wido 42on -> 42on

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-15 13:08:35 -06:00
Paul Cuzner
462525582d cephadm: fix how uid/gid is determined
The uid/gid is determined by looking at file ownership. It
was looking at /etc/ceph, but on current builds this is owned by root so switched to using /var/lib/ceph which
is the homedir of the ceph account.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2019-12-15 13:00:27 -06:00
Paul Cuzner
0c50249ae5 cephadm: add sample configuration for prometheus
Provides an example definition that sets up an
initial prometheus server with a scrape of itself.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2019-12-15 13:00:27 -06:00
Paul Cuzner
bcf520a07e cephadm: support deployment of prometheus
Initial support to enable cephadm to deploy
monitoring containers like prometheus. This
patch adds support for prometheus. It is the callers
responsibility to provide a valid prometheus.yml
file passed within the --config-json parameter.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2019-12-15 13:00:27 -06:00
Sage Weil
3023581812 .organizationmap: Wido 42on -> 42on
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-15 10:21:07 -06:00
Sage Weil
cd780f109c Merge PR #32158 into master
* refs/pull/32158/head:
	cephadm: fix exception when no time sync is running
	cephadm: properly extract osd fsid during adoption
	cephadm: do ceph-volume activate+deactivate as part of systemd unit
	ceph-daemon: behave with no /etc/ceph/ceph.conf

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-14 19:43:08 -06:00
Sage Weil
3cbca1dce8 cephadm: fix exception when no time sync is running
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 18:12:49 -06:00
Sage Weil
3e4222cec0 cephadm: properly extract osd fsid during adoption
This needs to be passed to the deploy_daemon_units method so that we can
set up the pre and post c-v calls properly.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 18:12:49 -06:00
Sage Weil
b800c9a921 cephadm: do ceph-volume activate+deactivate as part of systemd unit
1- Do the activate as part of the unit on start, since it may include
setup that disappears on a reboot, like starting up the dmcrypted volume.

2- Do the matching deactivate step when the container stops, like shutting
down the dmcrypt volume.

Right now the OSD is the only thing that needs this special behavior.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 09:22:12 -06:00
Sage Weil
bf0e51a5b7 ceph-daemon: behave with no /etc/ceph/ceph.conf
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-14 09:22:12 -06:00
Sage Weil
2d915c8d0e Merge PR #32244 into master
* refs/pull/32244/head:
	qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-13 22:03:45 -06:00
Sage Weil
e69bbada0b mds/MDSDaemon: fix asok 'exit' and 'respawn' commands
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 20:16:52 -06:00