]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoMerge pull request #37341 from smithfarm/wip-47466-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:25:03 +0000 (11:25 -0700)]
Merge pull request #37341 from smithfarm/wip-47466-octopus

octopus: common/admin_socket: always validate the parameters

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #37302 from bk201/wip-47192-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:23:40 +0000 (11:23 -0700)]
Merge pull request #37302 from bk201/wip-47192-octopus

octopus: mgr/telemetry: fix device id splitting when anonymizing serial

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
5 years agoMerge pull request #37264 from ifed01/wip-ifed-finer-mempool-granularity-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:21:57 +0000 (11:21 -0700)]
Merge pull request #37264 from ifed01/wip-ifed-finer-mempool-granularity-octopus

octopus: bluestore: mempool's finer granularity + adding missed structs

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #37257 from smithfarm/wip-47545-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:20:58 +0000 (11:20 -0700)]
Merge pull request #37257 from smithfarm/wip-47545-octopus

octopus: ceph.spec, debian: add smartmontools, nvme-cli dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37253 from bstillwell/wip-47424-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:20:16 +0000 (11:20 -0700)]
Merge pull request #37253 from bstillwell/wip-47424-octopus

octopus: compressor: Add a config option to specify Zstd compression level

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37412 from jan--f/wip-47649-octopus
Jan Fajerski [Fri, 2 Oct 2020 07:18:58 +0000 (09:18 +0200)]
Merge pull request #37412 from jan--f/wip-47649-octopus

octopus: [ceph-volume]: remove unneeded call to get_devices()

5 years agoMerge pull request #37344 from jan--f/wip-47284-octopus
Jan Fajerski [Fri, 2 Oct 2020 07:18:20 +0000 (09:18 +0200)]
Merge pull request #37344 from jan--f/wip-47284-octopus

octopus: ceph-volume: fix journal size argument not work

5 years agoMerge pull request #36921 from tspmelo/wip-npm-octopus
Lenz Grimmer [Wed, 30 Sep 2020 15:09:13 +0000 (17:09 +0200)]
Merge pull request #36921 from tspmelo/wip-npm-octopus

octopus: mgr/dashboard: Fix npm package's vulnerabilities

Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #37390 from tspmelo/wip-46999-octopus
Lenz Grimmer [Wed, 30 Sep 2020 12:00:33 +0000 (14:00 +0200)]
Merge pull request #37390 from tspmelo/wip-46999-octopus

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #37277 from tspmelo/wip-47559-octopus
Lenz Grimmer [Wed, 30 Sep 2020 09:50:58 +0000 (11:50 +0200)]
Merge pull request #37277 from tspmelo/wip-47559-octopus

octopus: mgr/dashboard: Allow editing iSCSI targets with initiators logged-in

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #37270 from badone/wip-octopus-enable-mgr-client-debug
Yuri Weinstein [Tue, 29 Sep 2020 21:52:15 +0000 (14:52 -0700)]
Merge pull request #37270 from badone/wip-octopus-enable-mgr-client-debug

octopus: qa: Enable debug_client for mgr tests

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #37422 from tchaikov/octopus-37388
Yuri Weinstein [Tue, 29 Sep 2020 21:51:13 +0000 (14:51 -0700)]
Merge pull request #37422 from tchaikov/octopus-37388

octopus: debian: Add missing Python dependency for ceph-mgr

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #37373 from smithfarm/wip-46350-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:50:31 +0000 (14:50 -0700)]
Merge pull request #37373 from smithfarm/wip-46350-octopus

octopus: bluestore: remove preextended WAL support.

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #37347 from smithfarm/wip-47091-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:49:45 +0000 (14:49 -0700)]
Merge pull request #37347 from smithfarm/wip-47091-octopus

octopus: mon: mark pgtemp messages as no_reply more consistenly in preprocess_…

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37032 from smithfarm/wip-47351-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:48:40 +0000 (14:48 -0700)]
Merge pull request #37032 from smithfarm/wip-47351-octopus

octopus: core: include/encoding: Fix encode/decode of float types on big-endian systems

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36945 from vumrao/wip-vumrao-47258
Yuri Weinstein [Tue, 29 Sep 2020 21:46:54 +0000 (14:46 -0700)]
Merge pull request #36945 from vumrao/wip-vumrao-47258

octopus: mon/PGMap: add pg count for pools in the ceph df command

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36047 from smithfarm/wip-46479-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:45:49 +0000 (14:45 -0700)]
Merge pull request #36047 from smithfarm/wip-46479-octopus

octopus: mds: send scrub status to ceph-mgr only when scrub is running

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #37346 from smithfarm/wip-47460-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:15:44 +0000 (09:15 -0700)]
Merge pull request #37346 from smithfarm/wip-47460-octopus

octopus: qa/workunits/mon: fixed excessively large pool PG count

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #37343 from smithfarm/wip-47416-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:14:52 +0000 (09:14 -0700)]
Merge pull request #37343 from smithfarm/wip-47416-octopus

octopus: rbd: include RADOS namespace in krbd symlinks

5 years agoMerge pull request #37342 from smithfarm/wip-47082-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:14:31 +0000 (09:14 -0700)]
Merge pull request #37342 from smithfarm/wip-47082-octopus

octopus: rbd-mirror: peer setup can still race and fail creation of peer

5 years agoMerge pull request #37340 from smithfarm/wip-47412-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:13:48 +0000 (09:13 -0700)]
Merge pull request #37340 from smithfarm/wip-47412-octopus

octopus: rgw: urlencode bucket name when forwarding request

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #37339 from smithfarm/wip-47348-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:12:57 +0000 (09:12 -0700)]
Merge pull request #37339 from smithfarm/wip-47348-octopus

octopus: rgw: Swift API anonymous access should 401

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #37338 from smithfarm/wip-47321-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:12:13 +0000 (09:12 -0700)]
Merge pull request #37338 from smithfarm/wip-47321-octopus

octopus: rgw: replace '+' with "%20" in canonical query string for s3 v4 auth.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37336 from smithfarm/wip-47314-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:11:40 +0000 (09:11 -0700)]
Merge pull request #37336 from smithfarm/wip-47314-octopus

octopus: rgw: radosgw-admin: period pull command is not always a raw_storage_op

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37335 from smithfarm/wip-47245-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:10:57 +0000 (09:10 -0700)]
Merge pull request #37335 from smithfarm/wip-47245-octopus

octopus: rgw: Add bucket name to bucket stats error logging

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37208 from smithfarm/wip-46982-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:10:16 +0000 (09:10 -0700)]
Merge pull request #37208 from smithfarm/wip-46982-octopus

octopus: test/rbd-mirror: pool watcher registration error might result in race

5 years agoMerge pull request #37180 from callithea/wip-47410-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:09:43 +0000 (09:09 -0700)]
Merge pull request #37180 from callithea/wip-47410-octopus

octopus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #37116 from dillaman/wip-47371-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:05:15 +0000 (09:05 -0700)]
Merge pull request #37116 from dillaman/wip-47371-octopus

octopus: librbd: ensure that thread pool lock is held when processing throttled IOs

5 years agoMerge pull request #36860 from dillaman/wip-46791-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:03:35 +0000 (09:03 -0700)]
Merge pull request #36860 from dillaman/wip-46791-octopus

octopus: librbd: handle DNE from immutable-object-cache

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #36691 from smithfarm/wip-46998-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:02:58 +0000 (09:02 -0700)]
Merge pull request #36691 from smithfarm/wip-46998-octopus

octopus: rgw: s3: mark bucket encryption as not implemented

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37405 from rhcs-dashboard/wip-47619-octopus
Lenz Grimmer [Tue, 29 Sep 2020 11:53:39 +0000 (13:53 +0200)]
Merge pull request #37405 from rhcs-dashboard/wip-47619-octopus

octopus: mgr/dashboard: fix perf. issue when listing large amounts of buckets

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #37299 from p-se/wip-47547-octopus
Laura Paduano [Mon, 28 Sep 2020 13:26:56 +0000 (15:26 +0200)]
Merge pull request #37299 from p-se/wip-47547-octopus

octopus: mgr/dashboard: Fix many-to-many issue in host-details Grafana dashboard

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoos/bluestore: bind attrs to bluestore_cache_meta mempool. 37264/head
Igor Fedotov [Sun, 20 Sep 2020 10:45:28 +0000 (13:45 +0300)]
os/bluestore: bind attrs to bluestore_cache_meta mempool.

This seems to be a better choice over bluestore_cache_data

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f4e09fc103454fa8a41b5ffb822639368a89522d)

 Conflicts:
src/os/bluestore/bluestore_types.h
 Caused by the lack of explicit std:: reference in headers - master has
 got this as a part of crimson effort.

5 years agoos/bluestore: add missing structs to bluestore_cache_other mempool
Igor Fedotov [Sun, 20 Sep 2020 09:22:05 +0000 (12:22 +0300)]
os/bluestore: add missing structs to bluestore_cache_other mempool

Fixes: https://tracker.ceph.com/issues/47551
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4592c5df554190065fa9a994f7b6dc3fed7ea214)

5 years agoMerge pull request #36991 from s0nea/wip-46407-octopus
Laura Paduano [Mon, 28 Sep 2020 09:01:17 +0000 (11:01 +0200)]
Merge pull request #36991 from s0nea/wip-46407-octopus

octopus: mgr/dashboard: Fix bugs in a unit test and i18n translation

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36875 from tspmelo/wip-46342-octopus
Laura Paduano [Mon, 28 Sep 2020 08:59:36 +0000 (10:59 +0200)]
Merge pull request #36875 from tspmelo/wip-46342-octopus

octopus: mgr/dashboard: Remove useless tab in monitoring/alerts datatable details

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36705 from ShyamsundarR/wip-47014-octopus
Yuri Weinstein [Sun, 27 Sep 2020 22:59:43 +0000 (15:59 -0700)]
Merge pull request #36705 from ShyamsundarR/wip-47014-octopus

octopus: mon: store mon updates in ceph context for future MonMap instantiation

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #36985 from k0ste/wip-47282-octopus
Yuri Weinstein [Sun, 27 Sep 2020 15:46:54 +0000 (08:46 -0700)]
Merge pull request #36985 from k0ste/wip-47282-octopus

octopus: prometheus: Properly split the port off IPv6 addresses

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agodebian: Add missing Python dependency for ceph-mgr 37422/head
Johannes M. Scheuermann [Thu, 24 Sep 2020 10:10:13 +0000 (12:10 +0200)]
debian: Add missing Python dependency for ceph-mgr

The file mgr/volumes/fs/operations/pin_util.py imports distutils.util for using
strtobool and thus the python package is required.

Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
(cherry picked from commit 868e708c9e6538684f9b053d44497bba543ea5eb)

5 years agoMerge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus
Ilya Dryomov [Fri, 25 Sep 2020 15:37:57 +0000 (17:37 +0200)]
Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus

octopus: rbd: make common options override krbd-specific options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-volume: remove unneeded call to get_devices() 37412/head
Marc Gariepy [Tue, 22 Sep 2020 13:01:33 +0000 (09:01 -0400)]
ceph-volume: remove unneeded call to get_devices()

there is no need to probe the device to generate the argparse help
message.

also removing the test on the function as it's not there anymore.

Signed-off-by: Marc Gariepy <gariepy.marc@gmail.com>
Fixes: https://tracker.ceph.com/issues/47502
(cherry picked from commit 5c6f66166a7afad87627032cafdc5c4f11f94eac)

5 years agorbd: make common options override krbd-specific options 37408/head
Ilya Dryomov [Fri, 25 Sep 2020 07:56:29 +0000 (09:56 +0200)]
rbd: make common options override krbd-specific options

ceph-csi has added support for passing custom map and unmap options via
mapOptions and unmapOptions storage class parameters.  However, it also
uses --read-only for implementing ROX (ReadOnlyMany) PVs.  If the user
supplies "mapOptions: rw", they will get around the intended read-only
restriction (at least on the block device).

ceph-csi could be patched to use "-o ro", but it actually makes sense
for common options to win over device type-specific equivalents.

Fixes: https://tracker.ceph.com/issues/47625
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit a107c47360ecdb8c09768ca9eab2341100245711)

Conflicts:
src/tools/rbd/action/Kernel.cc [ snapshot quiesce support and
  commit 34f539d8af33 ("rbd: delay parsing of default kernel map
  options") not in octopus ]

5 years agomgr/dashboard: fix performance issue when listing large amounts of buckets 37405/head
Alfonso Martínez [Fri, 18 Sep 2020 15:16:34 +0000 (17:16 +0200)]
mgr/dashboard: fix performance issue when listing large amounts of buckets

Fixes: https://tracker.ceph.com/issues/47543
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 924368e1d0aebcb0d8f9747589d9048414d33080)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts
  - Adapted changes in these files to octopus code.

5 years agoMerge pull request #36931 from yuriw/wip-yuriw-46529-octopus
Yuri Weinstein [Thu, 24 Sep 2020 23:57:40 +0000 (16:57 -0700)]
Merge pull request #36931 from yuriw/wip-yuriw-46529-octopus

octopus: qa/tests: use bionic only for old clients in rados/thrash-old-clients

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: Landing Page improvements 37390/head
Alfonso Martínez [Thu, 13 Aug 2020 12:29:38 +0000 (14:29 +0200)]
mgr/dashboard: Landing Page improvements

Fixes: https://tracker.ceph.com/issues/42072
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit d66e684b9ec83cca8a58b0a7b8661c568eb0cf6d)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
src/pybind/mgr/dashboard/frontend/src/styles/defaults/_bootstrap-defaults.scss
  this file doesn't exist in octopus, so I moved the code into:
src/pybind/mgr/dashboard/frontend/src/stykes/defaults.scss

5 years agomgr/dashboard: Clean custom header styles
Tiago Melo [Wed, 8 Jul 2020 09:40:30 +0000 (09:40 +0000)]
mgr/dashboard: Clean custom header styles

Fixes: https://tracker.ceph.com/issues/46417
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit cf55a768b26e1eded9cd2235c2966b2529a3cafc)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss
src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss
src/pybind/mgr/dashboard/frontend/src/styles.scss

5 years agoos/bluestore: remove preextended WAL support. 37373/head
Igor Fedotov [Tue, 9 Jun 2020 08:44:31 +0000 (11:44 +0300)]
os/bluestore: remove preextended WAL support.

Fixes: https://tracker.ceph.com/issues/45613
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 7fdbf61860b9d9deaf8734cdd57cf5c8d5f93f81)

Conflicts:
src/common/options.cc
- option "bluefs_preextend_wal_files" has a different default value
  ("false") in octopus (but the whole option is being deleted, so it
  doesn't matter)

5 years agomgr/dashboard: Fix npm package's vulnerabilities 36921/head
Tiago Melo [Fri, 28 Aug 2020 13:59:47 +0000 (13:59 +0000)]
mgr/dashboard: Fix npm package's vulnerabilities

Manual update of some npm packages to fix package's vulnerabilities.
This could not have been done by backport since master has a different list
of packages installed.

Fixes: https://tracker.ceph.com/issues/47191
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp 37347/head
Greg Farnum [Wed, 12 Aug 2020 23:44:11 +0000 (23:44 +0000)]
mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp

If a message is forwarded, it's conceivable the leader's and peon's evaluation
will disagree about whether the message is useful or not, which could result
in the leader ignoring it and the peon having a dangling forwarded message.
Fix this by marking the op as no_reply whenever ignoring it.

Fixes: https://tracker.ceph.com/issues/46914
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 73a014fc2ca928eb72def31c9e4177063cda421a)

5 years agoqa/workunits/mon: fixed excessively large pool PG count 37346/head
Jason Dillaman [Mon, 14 Sep 2020 12:58:52 +0000 (08:58 -0400)]
qa/workunits/mon: fixed excessively large pool PG count

Fixes: https://tracker.ceph.com/issues/47405
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2fa9442dcc7a0448ab7e3588f82f93ca2e55d686)

5 years agoceph-volume: fix journal size argument not work 37344/head
wanghongxu [Thu, 27 Aug 2020 07:11:28 +0000 (15:11 +0800)]
ceph-volume: fix journal size argument not work

Journal size argument not work in batch prepare
filestore with SSD journal device.

Fixes: https://tracker.ceph.com/issues/41374
Signed-off-by: wanghongxu <wanghongxu@t2cloud.net>
(cherry picked from commit a7077dc661478a762a86b88452c98b30717c0b3c)

5 years agoqa: add test for krbd symlinks created by udev 37343/head
Ilya Dryomov [Mon, 7 Sep 2020 14:51:22 +0000 (16:51 +0200)]
qa: add test for krbd symlinks created by udev

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 7ccd2c0dcee175e4c5a03985f43e9259a7e4dbd4)

5 years agorbd: include RADOS namespace in krbd symlinks
Ilya Dryomov [Mon, 7 Sep 2020 16:39:22 +0000 (18:39 +0200)]
rbd: include RADOS namespace in krbd symlinks

Fixes: https://tracker.ceph.com/issues/40247
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 0b5c11ff30dbb79690e47d5285f197f677e11bf7)

5 years agoqa/workunits/rbd: retrieve peer uuid when attempting to delete duplicate 37342/head
Jason Dillaman [Tue, 18 Aug 2020 21:18:25 +0000 (17:18 -0400)]
qa/workunits/rbd: retrieve peer uuid when attempting to delete duplicate

Previously, the peer uuid variable was empty which resulted in the failure
to remove the duplicate peer.

Fixes: https://tracker.ceph.com/issues/47007
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit dec8292a17f4d7543a4e22c293886363c97068b5)

5 years agorbd: re-use helper method for adding mirror peer site-name optional
Jason Dillaman [Tue, 18 Aug 2020 20:29:20 +0000 (16:29 -0400)]
rbd: re-use helper method for adding mirror peer site-name optional

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit af3d4cb3c4bb430e47add07b45e670737e6e77f5)

5 years agoMerge pull request #37194 from guits/wip-47503-octopus
Jan Fajerski [Wed, 23 Sep 2020 11:36:59 +0000 (13:36 +0200)]
Merge pull request #37194 from guits/wip-47503-octopus

octopus: ceph-volume: fix simple activate when legacy osd

5 years agocommon/admin_socket: always validate the parameters 37341/head
Kefu Chai [Fri, 11 Sep 2020 08:42:24 +0000 (16:42 +0800)]
common/admin_socket: always validate the parameters

this change addresses the regression introduced by
65267d55cd3714c436b188aaa8b2049ad2b21225.

before this change, we reply the client with a failure only if
both the prefix and the arguments do not match.

after this change, both the prefix and argument are checked.

Fixes: https://tracker.ceph.com/issues/47179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0039eb2ce612fff21be71254a33883df80a934b7)

5 years agociommon/admin_socket: extract find_matched_hook() out
Kefu Chai [Fri, 11 Sep 2020 08:35:29 +0000 (16:35 +0800)]
ciommon/admin_socket: extract find_matched_hook() out

this function is complicated and isolated enough to be a separated
method.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0fc4ed1d9109abc489a65340b92908107337fafd)

Conflicts:
src/common/admin_socket.cc
- octopus has a "while" block (instead of "if") under the comment
  // make sure one of the registered commands with this prefix validates
  but this is being removed

5 years agorgw : add URL encode toward bucket name in forward request 37340/head
caolei [Wed, 20 May 2020 09:28:15 +0000 (17:28 +0800)]
rgw : add URL encode toward bucket name in forward request

Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit 1e4ec14dd0df4e9053ef630c831c93d392508417)

5 years agorgw: Swift API anonymous access should 401 37339/head
Matthew Oliver [Thu, 9 Jul 2020 06:13:05 +0000 (06:13 +0000)]
rgw: Swift API anonymous access should 401

There was a previous patch to fix this but turns out that only fixed it
for the Swift V1 auth. And it actaully broke keystone because it didn't
take into account the idiosyncrasies of multi tenancy. Which resulted in
the incorect behaviour for keystone. Worse, because it didn't take
tenants properly into account keystone ACLs where broken.

This patch reworks, and simplifies the original patch to work for both
auths. It even extends the ThirdPartyAccountApplier to check for an ANON
user and properly scope it to a tenant.

Fixes: https://tracker.ceph.com/issues/46295
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 67081098dc2dddd80d52d5acd166e68954cae618)

5 years agorgw: replace '+' with "%20" in canonical query string for s3 37338/head
yuliyang_yewu [Wed, 22 Jul 2020 02:05:17 +0000 (10:05 +0800)]
rgw: replace '+' with "%20" in canonical query string for s3
 v4 auth.

fix https://tracker.ceph.com/issues/45983

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit 9002be34aa8524816708db4f3429bfe8634b776a)

5 years agoradosgw-admin: period pull command is not always a raw_storage_op 37336/head
Casey Bodley [Mon, 31 Aug 2020 15:19:34 +0000 (11:19 -0400)]
radosgw-admin: period pull command is not always a raw_storage_op

if a --url is given, 'period pull' does not depend on any zone/period
configuration and can be a raw_storage_op. if we get a --remote instead,
we do need to initialize the zone/period configuration to find the
correct endpoint/access keys

Fixes: https://tracker.ceph.com/issues/47217
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2b44a9d060d33dca9768c758e1908365488aac2a)

5 years agorgw: Add bucket name to bucket stats error logging 37335/head
Seena Fallah [Mon, 20 Apr 2020 22:05:08 +0000 (02:35 +0430)]
rgw: Add bucket name to bucket stats error logging

Signed-off-by: Seena Fallah <seeenafallah@gmail.com>
(cherry picked from commit 1d58bc52774de80689b1f04d46f8f587a09df206)

5 years agoMerge pull request #37182 from callithea/wip-47414-octopus
Lenz Grimmer [Wed, 23 Sep 2020 08:55:51 +0000 (10:55 +0200)]
Merge pull request #37182 from callithea/wip-47414-octopus

octopus: mgr/dashboard: increase Grafana iframe height to avoid scroll bar

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #36899 from callithea/wip-47199-octopus
Lenz Grimmer [Wed, 23 Sep 2020 08:49:47 +0000 (10:49 +0200)]
Merge pull request #36899 from callithea/wip-47199-octopus

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #37092 from neha-ojha/wip-47195-octopus
Yuri Weinstein [Tue, 22 Sep 2020 13:21:05 +0000 (06:21 -0700)]
Merge pull request #37092 from neha-ojha/wip-47195-octopus

octopus: os/bluestore: enable more flexible bluefs space management by default.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #36901 from callithea/wip-47197-octopus
Lenz Grimmer [Tue, 22 Sep 2020 11:52:53 +0000 (13:52 +0200)]
Merge pull request #36901 from callithea/wip-47197-octopus

octopus: mgr/dashboard: Disable autocomplete on user form

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36874 from callithea/wip-46345-octopus
Lenz Grimmer [Tue, 22 Sep 2020 11:51:09 +0000 (13:51 +0200)]
Merge pull request #36874 from callithea/wip-46345-octopus

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #36872 from callithea/wip-46972-octopus
Lenz Grimmer [Tue, 22 Sep 2020 11:48:50 +0000 (13:48 +0200)]
Merge pull request #36872 from callithea/wip-46972-octopus

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #36870 from callithea/wip-46970-octopus
Lenz Grimmer [Tue, 22 Sep 2020 10:02:01 +0000 (12:02 +0200)]
Merge pull request #36870 from callithea/wip-46970-octopus

octopus: mgr/dashboard: Proper format iSCSI target portals

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Fix many-to-many issue in host-details dashboard 37299/head
Patrick Seidensal [Mon, 7 Sep 2020 10:29:36 +0000 (12:29 +0200)]
mgr/dashboard: Fix many-to-many issue in host-details dashboard

The labels on one side do not match the labels of the other side, where
a label_replace is used. The fix uses the same label_replace on the
missing side.

Fixes: https://tracker.ceph.com/issues/47334
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit fe64b9d1763ec9dbe78fe73c403929524ab4e253)

5 years agoMerge pull request #37285 from idryomov/wip-krbd-noudev-octopus
Ilya Dryomov [Tue, 22 Sep 2020 07:51:11 +0000 (09:51 +0200)]
Merge pull request #37285 from idryomov/wip-krbd-noudev-octopus

octopus: krbd: optionally skip waiting for udev events

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/telemetry: fix device id splitting when anonymizing serial 37302/head
Yaarit Hatuka [Thu, 27 Aug 2020 03:04:34 +0000 (23:04 -0400)]
mgr/telemetry: fix device id splitting when anonymizing serial

Anonymizing the serial number in the device id string fails in rare
cases where 'vendor' and 'model' are missing from the device id
string. Ideally, device id is generated (in blkdev.cc) as
'vendor_model_serial', in case all fields were successfully retrieved
from the device. In cases where they were not, device id can also be
generated as 'model_serial' or 'serial'. Splitting by '_' fails in the
latter case (since 'serial' is the only element in the string).

In order to anonymize serial numbers in smartctl reports we now rely
on the serial number value as retrieved from the raw smartctl report
itself (as opposed to the one in device id). That's in order to avoid
possible inconsistencies between the serial retrieved from device id and
the one in the report.

Fixes: https://tracker.ceph.com/issues/46977
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit e5099a7b58bcf39d80beb908c192c3bf639db1a4)

5 years agoMerge pull request #37164 from dillaman/wip-47099-octopus
Yuri Weinstein [Mon, 21 Sep 2020 16:28:07 +0000 (09:28 -0700)]
Merge pull request #37164 from dillaman/wip-47099-octopus

octopus: librbd: using migration abort can result in the loss of data

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoqa: add test for mapping and unmapping from a network namespace 37285/head
Ilya Dryomov [Wed, 16 Sep 2020 14:38:10 +0000 (16:38 +0200)]
qa: add test for mapping and unmapping from a network namespace

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d2884adb1542de7a43f82eb899056aa74de95052)

5 years agoMerge pull request #36871 from callithea/wip-46933-octopus
Lenz Grimmer [Mon, 21 Sep 2020 12:35:40 +0000 (14:35 +0200)]
Merge pull request #36871 from callithea/wip-46933-octopus

octopus: mgr/dashboard: Fix for CrushMap viewer items getting compressed vertically

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
5 years agoceph-volume: fix wrong type passed in terminal.warning() 37194/head
Guillaume Abrioux [Fri, 18 Sep 2020 11:51:51 +0000 (13:51 +0200)]
ceph-volume: fix wrong type passed in terminal.warning()

`terminal.warning()` excepts a `str`.
Passing `e` means we pass a type `exceptions.RuntimeError`

Changing to `terminal.warning(e.message)` fixes the issue.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1877672
Resolves: rhbz#1877672

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a1f42c8d7b3fe08da82c528038d8db9ccdd5c98a)

5 years agoceph-volume: fix simple activate when legacy osd
Guillaume Abrioux [Thu, 10 Sep 2020 23:13:06 +0000 (01:13 +0200)]
ceph-volume: fix simple activate when legacy osd

`ceph-volume simple activate --all` relies on the presence of json files
in `/etc/ceph/osd` that was created with `ceph-volume simple scan`
command.

In a cluster lifecycle, it is very likely an OSD which was deployed with
ceph-disk at some point gets removed or replaced. It means the corresponding
json file in `/etc/ceph/osd` becomes unrelevant. It makes `ceph-volume
simple activate --all` fails because it tries to mount non existing
partitions.
The idea here is to simply warn the user that the osd described in the
json file doesn't exist anymore and exit properly instead of throwing an
error.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1877672
Closes: https://tracker.ceph.com/issues/47493
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a3e9e215bda110b3224e165bee6565943b3f3c14)

5 years agomgr/dashboard: Allow editing iSCSI targets with initiators logged-in 37277/head
Tiago Melo [Mon, 7 Sep 2020 09:47:19 +0000 (09:47 +0000)]
mgr/dashboard: Allow editing iSCSI targets with initiators logged-in

Fixes: https://tracker.ceph.com/issues/47393
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 6de09f131074294b71e47ab0e168036a1fcc35fe)

5 years agoqa: Enable debug_client for mgr tests 37270/head
Brad Hubbard [Wed, 16 Sep 2020 02:16:23 +0000 (12:16 +1000)]
qa: Enable debug_client for mgr tests

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 926e06caf5c1262ab1268126d1d775897ff87471)

5 years agomon: allow overriding the initial mon_host 36705/head
Patrick Donnelly [Wed, 16 Sep 2020 19:28:55 +0000 (12:28 -0700)]
mon: allow overriding the initial mon_host

This overrides what the CephContext believes to be the current quorum of
monitors (retrieved from other instances of the MonClient), introduced
by [1]. Tests need to be able to target a specific monitor for
exercising forwarding and other things.

[1] 731e2db9fb4611f767446a3c8e778a097ce70d35
Fixes: https://tracker.ceph.com/issues/47180
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit ed3782e60afa0da2f523fc6df7b593fe7a57646a)

Conflicts:
PendingReleaseNotes
Retained nautilus release notes with the required addition as above

5 years agomon: store mon updates in ceph context for future MonMap instantiation
Shyamsundar Ranganathan [Mon, 10 Aug 2020 00:47:43 +0000 (20:47 -0400)]
mon: store mon updates in ceph context for future MonMap instantiation

MonMap builds initial mon list using provided sources, like
mon-host or monmap.

For future instantiations of MonClient, if mon addresses are
updated, stale information from the provided sources are used.

This commit retains mon updates that are processed by the
MonClient in CephContext, for use in MonMap instantiations
and hence uses updated information as required.

This is helpful in cases where librados or libcephfs
instantiate MonClient in the ceph-mgr deamon as required.

Fixes: https://tracker.ceph.com/issues/46645
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
(cherry picked from commit 7a1f02acfe6b5d8a760efd16bb594a0656b39eac)

5 years agoos/Bluefs: fix file reader/writer buffer mempool
Deepika Upadhyay [Wed, 17 Jun 2020 14:42:32 +0000 (10:42 -0400)]
os/Bluefs: fix file reader/writer buffer mempool

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 6a50c85067c03884473922318267769a9e77ef2e)

 Conflicts:
src/os/bluestore/bluestore_types.h
 Lacked explicit std:: ref in the target header

5 years agobluestore: _get_used_bytes should reflect new mempool fields
Deepika Upadhyay [Wed, 20 May 2020 20:32:02 +0000 (02:02 +0530)]
bluestore: _get_used_bytes should reflect new mempool fields

with bluestore_cache_other split further, the _get_used_bytes should
take into account the new mempool splits as well.

see also: 0ce8ee4b123eacfc2bfb14f554487e928512415a
  68ee931fd4b6bf748f95b14dae31d11738fbaf1e

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit d9f84b41eff99357585f27c89449e379a28a9212)

5 years agocommon/mempool: More detailed bluestore stats
Adam Kupczyk [Thu, 14 May 2020 11:24:15 +0000 (07:24 -0400)]
common/mempool: More detailed bluestore stats

Splits bluestore bluestore_cache_other, exposes accounting of some internals.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit bb488df5e4ffa1ec2b5d25d9af0ce7f5093d7470)

5 years agoIntroduce separate mempool for FileReaderBuffer and FileWriter
Deepika Upadhyay [Wed, 15 Apr 2020 12:10:15 +0000 (17:40 +0530)]
Introduce separate mempool for FileReaderBuffer and FileWriter

FileReaderBuffer and FileWriter uses Bufferlists which needs to be
tracked by mempool to get the proper memory usage.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 9bb741c12cf1ffe3e9fec8e0d2fbaae107947215)

 Conflicts:
src/os/bluestore/BlueFS.cc
 trivial

5 years agosplit mempool allocation for bluestore_cache_other
Deepika Upadhyay [Wed, 15 Apr 2020 12:01:46 +0000 (17:31 +0530)]
split mempool allocation for bluestore_cache_other

While doing root cause analysis it bluestore_cache_other gives a bit of
a crude estimate, something more helpful would be to have it split into
the following fields:

- bluestore_cache_onode
- bluestore_cache_meta
- bluestore_onode_attrs

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit 1c6bc3893bf4cadae344ef19290f5c7e55dd5a62)

 Conflicts:
src/os/bluestore/bluestore_types.h
  Lacked explicit std:: namespace reference in headers which pacific has

5 years agoceph.spec.in, debian/control: add smartmontools and nvme-cli dependencies 37257/head
Yaarit Hatuka [Fri, 18 Sep 2020 03:25:56 +0000 (03:25 +0000)]
ceph.spec.in, debian/control: add smartmontools and nvme-cli dependencies

These packages are needed in order to scrape device health metrics from
devices used by OSD and MON daemons.

smartmontools' smartctl is what we use in order to scrape devices' SMART
attributes and general health metrics.
In addition, we use nvme-cli tool on NVMe devices, which fetches
vendor specific NVMe related health metrics.

Ceph rely on these tools for proper functioning of the underlying layers
of devicehealth mgr module, and other mgr modules which use devicehealth
functionality (such as diskprediction_local, telemetry, dashboard).

Essentially, most of devicehealth commands rely on proper functioning of
smartctl, otherwise they lack the device health metrics.

For example, in case smartctl is missing, the commands:
    ceph device scrape-daemon-health-metrics <who>
    ceph device scrape-health-metrics [<devid>]
will not be able to scrape health metrics, and the command:
    ceph device predict-life-expectancy <devid>
will not provide any meaningful output (since there are no metrics).

In short, when we scrape a device by its daemon (be it an OSD or a MON):
  ceph device scrape-daemon-health-metrics <who>
The devicehealth module command eventually invokes a
block_device_get_metrics() call in either osd/OSD.cc or mon/Monitor.cc,
which wraps calls to both
    block_device_run_smartctl()       (spawns smartctl)
    block_device_run_vendor_nvme()    (spawns nvme)
in common/blkdev.cc.

Minimum version requirements:
'smartmontools' is the package name, which contains two utility
programs: 'smartd' and 'smartctl'. Ceph uses the latter.

Version 6.7 of smartctl first introduced the --json option (beta), which
allows to output the metrics in a JSON format. Since then a few
adjustments were made and the feature officially launched in smartctl
version 7.0.
Since we rely on the JSON format to process the metrics, we must have
smartmontools' smartctl version >= 7.

That said, we choose not to specify smartmontools version here on
purpose, since there might be a scenario where:
We specified smartmontools version to be >= 7.
smartmontools 7 is not available yet in rhel 8 / centos 8.
A user installs via rpm ceph-osd, for example.
smartmontools will not be installed (since version >= 7 is not available
in this repo yet).
Then the user upgrades to 8.3 (which should have smartmontools >= 7),
but smartmontools will not get upgraded (since it's not installed).
In the scenario where we do not specify a version, smartmontools 6.6
will be installed, but it will be upgraded to >= 7 when a user upgrades
(and if it's a fresh installation - version >= 7 would be installed
anyway).

nvme-cli does not have a minimum version.

We use 'Recommends' for both rpm and deb packages since we do not want
the installation to fail in case of conflicts. 'Recommends' weakens the
dependency to be installed in case possible, but ignores it in cases of
conflicts with other dependencies.

It's worth mentioning that smartmontools and nvme-cli dependencies exist
in ceph-container builds.
We add them here for the cases of bare metal installations.

In the future we will add a separate package (with smartmontools and
nvme-cli dependencies) that can be installed on any node (running
rbd-mirror, rgw, mds, mgr, etc.), in order to be able to collect the
health metrics of its devices and offer their life expectancy
prediction.

Fixes: https://tracker.ceph.com/issues/47479
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit d5528a7e8e3b8289288d5a0a55d57d9935a3966c)

5 years agocompressor: Set the Zstd default compression level to 1 37253/head
Bryan Stillwell [Tue, 24 Mar 2020 21:15:41 +0000 (15:15 -0600)]
compressor: Set the Zstd default compression level to 1

The default compression level of 5 for Zstandard is too high for the majority
of use cases since it requires too many CPU cycles.  This patch switches the
default to 1.

Fixes: https://tracker.ceph.com/issues/44724
Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
(cherry picked from commit caf74d533b0c6c9e6fc5b1463ae2c3be1103d7f3)

5 years agocompressor: Add a config option to specify Zstd compression level
Bryan Stillwell [Fri, 6 Mar 2020 17:58:50 +0000 (10:58 -0700)]
compressor: Add a config option to specify Zstd compression level

Add a new configuration item called 'compressor_zstd_level' so that the
Zstandard compression level can be tuned to the workload on a cluster.

Fixes: https://tracker.ceph.com/issues/43377
Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
(cherry picked from commit 82699067b89eab01744f1b7f10490ec0975bb1a6)

5 years agoMerge pull request #36953 from ceph/wip-octopus-bz1872983
Jan Fajerski [Fri, 18 Sep 2020 14:19:40 +0000 (16:19 +0200)]
Merge pull request #36953 from ceph/wip-octopus-bz1872983

octopus: ceph-volume: simple scan should ignore tmpfs

5 years agoMerge pull request #36928 from jan--f/wip-47237-octopus
Jan Fajerski [Fri, 18 Sep 2020 14:18:55 +0000 (16:18 +0200)]
Merge pull request #36928 from jan--f/wip-47237-octopus

octopus: ceph-volume: support for mpath devices

5 years agoMerge pull request #36925 from leseb/bp-36700-octopus
Jan Fajerski [Fri, 18 Sep 2020 14:18:38 +0000 (16:18 +0200)]
Merge pull request #36925 from leseb/bp-36700-octopus

octopus: ceph-volume: retry when acquiring lock fails

5 years agoMerge pull request #36852 from jan--f/wip-47146-octopus
Jan Fajerski [Fri, 18 Sep 2020 14:18:17 +0000 (16:18 +0200)]
Merge pull request #36852 from jan--f/wip-47146-octopus

octopus: ceph-volume: add libstoragemgmt support

5 years agoMerge pull request #36975 from sebastian-philipp/octopus-backport-36765-36738-36757...
Joshua Schmid [Thu, 17 Sep 2020 06:50:37 +0000 (08:50 +0200)]
Merge pull request #36975 from sebastian-philipp/octopus-backport-36765-36738-36757-36793-36509-36794-36571-36315-36817-36330-36752-3679

octopus: cephadm batch backport September (1)

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.com>
5 years agotest/rbd-mirror: pool watcher registration error might result in race 37208/head
Jason Dillaman [Wed, 5 Aug 2020 16:36:26 +0000 (12:36 -0400)]
test/rbd-mirror: pool watcher registration error might result in race

The init finish context should be swapped out before it attempts to
re-register the watcher. This affects the test case which mocks the
timer to fire immediately instead of after 30 seconds.

Fixes: https://tracker.ceph.com/issues/46669
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c89d31ebf6c412d609123979c63ebc600b70e179)

5 years agoMerge pull request #37201 from tchaikov/octopus-doc-rtd
Kefu Chai [Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)]
Merge pull request #37201 from tchaikov/octopus-doc-rtd

octopus: doc: enable Read the Docs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
5 years agodoc: add in-doc search from read the docs 37201/head
Kefu Chai [Thu, 9 Apr 2020 15:14:42 +0000 (23:14 +0800)]
doc: add in-doc search from read the docs

readthedocs-sphinx-search features better user experience than the
builtin search offered by sphinx

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8bd8a8badbf992347a0883a537cce414432c867e)

5 years agodoc: use plantweb as fallback of sphinx-ditaa
Kefu Chai [Thu, 9 Apr 2020 13:25:39 +0000 (21:25 +0800)]
doc: use plantweb as fallback of sphinx-ditaa

RTD does not support installing system packages, the only ways to install
dependencies are setuptools and pip. while ditaa is a tool written in
Java. so we need to find a native python tool allowing us to render ditaa
images. plantweb is able to the web service for rendering the ditaa
diagram. so let's use it as a fallback if "ditaa" is not around.

also start a new line after the directive, otherwise planweb server will
return 500 at seeing the diagram.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0cb56e0f13dc57167271ec7f20f11421416196a2)

5 years agodoc/conf.py: exclude pybindings docs from build for RTD
Kefu Chai [Thu, 9 Apr 2020 08:51:06 +0000 (16:51 +0800)]
doc/conf.py: exclude pybindings docs from build for RTD

because it'd difficult to prepare (dummy) librados,libcephfs and librbd for
their python bindings in the building environment offered by Read the Docs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 847e4ef941401e1b580e93d7058e8413bd131e21)