msg/async: do not force updating rotating keys inline

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

msg/async: fix mark_down vs accept race

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

msg/async: unregister con from accept vs mark_down race

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #25829 from badone/wip-examples-link-order-fix

luminous: examples: fix link order in librados example Makefile

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #25845 from pdvian/wip-37811-luminous

luminous: mon/OSDMonitor: do not populate void pg_temp into nextmap

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #25847 from pdvian/wip-37813-luminous

luminous: mon: shutdown messenger early to avoid accessing deleted logger

Merge pull request #25922 from alfredodeza/luminous-ceph-volume-fix-json

luminous ceph-volume: fix JSON output in `inventory`

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #25677 from joscollin/wip-37700-luminous

luminous: mds: fix bug filelock stuck at LOCK_XSYN leading client can't read data

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25682 from joscollin/wip-37633-luminous

luminous: mds: remove duplicated l_mdc_num_strays perfcounter set

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25684 from joscollin/wip-37631-luminous

luminous: client: do not move f->pos untill success write

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25686 from joscollin/wip-37737-luminous

luminous: MDSMonitor: allow beacons from stopping MDS that was laggy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25695 from joscollin/wip-37625-luminous

luminous: pybind/mgr/status: fix ceph fs status in py3 environments.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25696 from joscollin/wip-36502-luminous

luminous: qa: increase timeout for cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25779 from pdvian/wip-37694-luminous

luminous: mon: mark REMOVE_SNAPS messages as no_reply

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25784 from ukernel/luminous-37739

luminous: extend reconnect period when mds is busy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25805 from ashishkumsingh/wip-36504-luminous

luminous: qa: use timeout for fs asok operations

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25928 from neha-ojha/wip-whitelist-slow-request

luminous: qa/tasks/thrashosds-health.yaml: whitelist 'slow request'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

qa/tasks/thrashosds-health.yaml: whitelist 'slow request'

https://github.com/ceph/ceph/pull/25824 adds slow request to OSD logs.
To deal with it, whitelist 'slow request' instead of 'slow requests'.
This PR is specific to luminous because later versions whitelist it correctly.

Signed-off-by: Neha Ojha <nojha@redhat.com>

ceph-volume: fix JSON output in `inventory`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit a3e6f569b4fa0419dff4690a72e9be6fe0a255c1)

Merge pull request #25889 from pdvian/wip-37820-luminous

luminous: mds: create heartbeat grace config option

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

Merge pull request #25890 from vshankar/wip-purge-single-mds-multifs-test

luminous:  qa: remove single mds yaml for cephfs multifs test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #25431 from batrick/i37540

luminous: mds: obsolete MDSMap option configs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by:  Venky Shankar <vshankar@redhat.com>

Merge pull request #25824 from neha-ojha/wip-1659156-luminous

luminous: osd/OSD.cc: log slow requests in OSD logs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

rgw: sanitize customer encryption keys from log output in v4 auth

Fixes: http://tracker.ceph.com/issues/37847
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit ba55e2a96c9dfcc7aa2311431beaaa23cb05c30d)

rgw: mimic gconf changes

As the largeish change from master g_conf() isn't in mimic yet, use the g_conf
global structure, also make rgw_op use the value from req_info ceph context as
we do for all the requests

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 01d647310ec2d7d423df1196eb2a7aef685d832e)

rgw: fix issues with 'enforce bounds' patch

The patch to enforce bounds on max-keys/max-uploads/max-parts had a few
issues that would prevent us from compiling it. Instead of changing the
code provided by the submitter, we're addressing them in a separate
commit to maintain the DCO.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 29bc434a6a81a2e5c5b8cfc4c8d5c82ca5bf538a)

rgw: enforce bounds on max-keys/max-uploads/max-parts

RGW S3 listing operations provided a way for authenticated users to
cause a denial of service against OMAPs holding bucket indices.

Bound the min & max values that a user could pass into the max-X
parameters, to keep the system safe. The default of 1000 is chosen to
match AWS S3 behavior.

Affected operations:
- ListBucket, via max-keys
- ListBucketVersions, via max-keys
- ListBucketMultiPartUploads, via max-uploads
- ListMultipartUploadParts, via max-parts

The Swift bucket listing codepath already enforced a limit, so is
unaffected by this issue.

Prior to this commit, the effective limit is the lower of
osd_max_omap_entries_per_request or osd_max_omap_bytes_per_request.

Backport: luminous, mimic
Fixes: http://tracker.ceph.com/issues/35994
Signed-off-by: Robin H. Johnson <rjohnson@digitalocean.com>
(cherry picked from commit d79f68a1e31f4bc917eec1b6bbc8e8446377dc6b)

 Conflicts:
src/common/options.cc:
  Conflicts due to options from master

mon/config-key: limit caps allowed to access the store

Henceforth, we'll require explicit `allow` caps for commands, or for the
config-key service. Blanket caps are no longer allowed for the
config-key service, except for 'allow *'.

(for luminous and mimic, we're also ensuring MonCap's parser is able to
understand forward slashes '/' when parsing prefixes)

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 5fff611041c5afeaf3c8eb09e4de0cc919d69237)

Merge pull request #23902 from VictorDenisov/backport_24826

luminous: run-make-check.sh ccache tweaks

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #24543 from wido/luminous-20465

luminous: os/bluestore: avoid frequent allocator dump on bluefs rebalance failure

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #24921 from wjwithagen/luminous

luminous: cmake: link unittest_compression against gtest

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #24997 from mcv21/luminous-24996

luminous: debian: correct ceph-common relationship with older radosgw package

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #25086 from smithfarm/wip-37154-luminous

luminous: tests: ceph-admin-commands.sh workunit does not log what it's doing

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #25173 from pdvian/wip-36391-luminous

luminous: rpm: Use hardened LDFLAGS

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #25187 from ifed01/wip-ifed-fix-set-label-luminous

luminous: ceph-bluestore-tool: fix set label functionality for specific keys

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

Merge pull request #25212 from badone/wip-luminous-fix-branch-3.2-placement

luminous: tests: ceph-ansible: Move "branch" out of "vars" section

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #25241 from smithfarm/wip-37383-luminous

luminous: test: Start using GNU awk and fix archiving directory

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #25516 from smithfarm/wip-36577-luminous

luminous: qa: teuthology may hang on diagnostic commands for fuse mount

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

Merge pull request #25558 from smithfarm/wip-37610-luminous

luminous: qa: pjd test appears to require more than 3h timeout for some configurations

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

Merge pull request #25560 from smithfarm/wip-37627-luminous

luminous: mds: fix incorrect l_pq_executing_ops statistics when meet an invalid item in purge queue

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

Merge pull request #25562 from smithfarm/wip-37629-luminous

luminous: mds: do not call Journaler::_trim twice

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

Merge pull request #25567 from vshankar/wip-37608

luminous: mds: disallow dumping huge caches to formatter

Reviewed-by:  Venky Shankar <vshankar@redhat.com>

qa: remove single mds yaml for cephfs multifs test

commit b98c982 (which backports 3b7233a) does not remove
this yaml file. This is causing failues such as:

     Only have 2 MDSs, require 4

Signed-off-by: Venky Shankar <vshankar@redhat.com>

mds: create heartbeat grace config option

Currently the MDS uses the mds_beacon_grace for the heartbeat timeout. If we
need to increase the beacon grace because the MDS is missing beacon replies for
some reason, we still want to see the warnings when the MDS is missing
heartbeats.

Fixes: http://tracker.ceph.com/issues/37674
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 5c143f3039c1967ca83d8a0cce35bf2a12509aef)

Conflicts:
src/mds/MDSRank.cc : Resolved in heartbeat_reset

Merge pull request #25257 from k0ste/luminous_backports2

luminous: mgr/balancer: add crush_compat_metrics param

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

Merge pull request #25258 from k0ste/luminous_backports3

luminous: mgr: balancer: python 3 compat fixes

Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #25296 from rzarzynski/wip-bug-36248-luminous

luminous: common: fix memory leaks in WeightedPriorityQueue.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #25297 from pdvian/wip-37427-luminous

luminous: auth/AuthSessionHandler: no handler if no session key

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

Merge pull request #25369 from pdvian/wip-37478-luminous

luminous: mgr: race between daemon state and service map in 'service status'

Reviewed-by: David Galloway <dgallowa@redhat.com>

mon: shutdown messenger early to avoid accessing deleted logger

In the monitor shutdown process, the MSG thread exits after the logger is released,
causing the null pointer to be accessed. So move the logger release to the MSG thread after it exits

Fixes: http://tracker.ceph.com/issues/37780
Signed-off-by: ningtao <ningtao@sangfor.com.cn>
(cherry picked from commit 47da5a0caa7edec17ff4253e363571b78372506a)

mon/OSDMonitor: do not populate void pg_temp into nextmap

Due to commit ea723fb, pg_temp with clean acting set are added to inc map.
The original intent was to clear out pg_temps during priming, but as
written it would set a new_pg_temp item clearing the pg_temp even if one
didn't already exist.  Adding the up != acting condition in there makes us
only take that path if there is an existing pg_temp entry to remove.

Fixes: https://tracker.ceph.com/issues/37784
Signed-off-by: Aleksei Zakharov <zakharov.a.g@yandex.ru>
(cherry picked from commit b1d3ca5e78eaee509c923f06e9024c23cc6ce31a)

Merge pull request #25838 from alfredodeza/luminous-rm37805

luminous ceph-volume tests/functional declare ceph-ansible roles instead of importing them

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

ceph-volume tests/functional declare ceph-ansible roles instead of importing them

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ad6b924e2bf3b06ec66eb5bc4fea065f5babc512)

Merge pull request #25776 from alfredodeza/luminous-rm37442

luminous ceph-volume normalize comma to dot for string to int conversions

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #25778 from alfredodeza/luminous-rm37486

luminous ceph-volume: set permissions right before prime-osd-dir

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

luminous: examples: fix link order in librados example Makefile

The library link order in librados example Makefile is incorrect
and as a result 'make' throws an error. This change fixes the order.

Fixes: http://tracker.ceph.com/issues/37795
Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
(cherry picked from commit 5b027155b41d15c9e9e26b81340a76673f483890)

osd/OSD.cc: log slow requests in OSD logs

This PR is specific to luminous because in later versions, we have
already taken care of it.

Fixes: https://tracker.ceph.com/issues/37806
Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #25748 from alfredodeza/luminous-cryptsetup-allow-discards

luminous ceph-volume: enable device discards

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #24374 from smithfarm/wip-26919-luminous

luminous: common: (mon) command sanitization accepts floats when Int type is defined resulting in exception fault in ceph-mon

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

Merge pull request #25387 from pdvian/wip-37482-luminous

luminous: rgw: Don't treat colons specially in resource part of ARN

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #25444 from theanalyst/wip-luminous-es-fixes

luminous: rgw: es fixes for working with nfs ganesha

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #25448 from smithfarm/wip-37519-luminous

luminous: rgw: fix max-size in radosgw-admin and REST Admin API

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #25484 from pdvian/wip-37549-luminous

luminous : rgw_file: user info never synced since librgw init

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

Merge pull request #25506 from smithfarm/wip-37551-luminous

luminous: rgw: multisite: sync gets stuck retrying deletes that fail with ERR_PRECONDITION_FAILED

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #25512 from smithfarm/wip-36733-luminous

luminous: rgw: beast frontend fails to parse ipv6 endpoints

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #25644 from pdvian/wip-37563-luminous

luminous: rgw: fix version bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #24986 from joscollin/wip-36691-luminous

luminous: client: request next osdmap for blacklisted client

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #24994 from jonsger/wip-36456-luminous

luminous: client: explicitly show blacklisted state via asok status command

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #25043 from smithfarm/wip-36460-luminous

luminous: mds: rctime not set on system inode (root) at startup

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #25407 from brtknr/luminous

luminous: cephfs: ceph-volume-client: allow setting mode of CephFS volumes

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #25518 from smithfarm/wip-37423-luminous

luminous: qa: wrong setting for msgr failures

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #25520 from smithfarm/wip-37602-luminous

luminous: mds: severe internal fragment when decoding xattr_map from log event

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #25522 from smithfarm/wip-37606-luminous

luminous: mds: directories pinned keep being replicated back and forth between exporting mds and importing mds

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #25524 from smithfarm/wip-37604-luminous

luminous: mds: PurgeQueue write error handler does not handle EBLACKLISTED

Reviewed-by: Venky Shankar <vshankar@redhat.com>

mds: obsolete MDSMap option configs

These configs were used for initialization but it is more appropriate to
require setting these file system attributes via `ceph fs set`. This is similar
to what was already done with max_mds. There are new variables added for `fs
set` where missing.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 67ca6cd229a595d54ccea18b5452f2574ede9657)
Fixes: http://tracker.ceph.com/issues/37540
Conflicts:
PendingReleaseNotes
qa/tasks/cephfs/filesystem.py
qa/tasks/cephfs/test_strays.py
src/common/legacy_config_opts.h
src/mds/FSMap.cc
src/mds/Locker.cc
src/mds/MDBalancer.cc
src/mds/MDSMap.h
src/mds/Server.cc

mds: extend reconnect period when mds is busy

Fixes: https://tracker.ceph.com/issues/37644
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit ad1f964395f65c5d3baed712c0949928998e47be)

 Conflicts:
src/mds/Server.cc

mds: renew client session when receiving any message

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 593dfee07334668a912abd9732a5d138eb27058a)

 Conflicts:
src/mds/MDSRank.cc
src/mds/Server.cc
src/mds/SessionMap.h

mds: use mono_clock for reconnect timeout

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 4982693fcfb722bc8256058f414ca9a0c7b397b0)

 Conflicts:
src/mds/Server.cc
src/mds/Server.h

qa: use timeout for fs asok operations

Otherwise a bug preventing an asok operation from completing will cause the
entire job to fail.

Fixes: http://tracker.ceph.com/issues/36335
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 296d89b0463ee3aad8dfb50b0e41a27e2c852ddb)

Merge pull request #25698 from xiexingguo/wip-37743

luminous: osd/OSDMap: cancel mapping if target osd is out

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #25021 from smithfarm/wip-36506-luminous

luminous: core: mon osdmap cash too small during upgrade to mimic

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #25289 from cbodley/wip-37091-luminous

luminous: rgw: catch exceptions from librados::NObjectIterator

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #25458 from pdvian/wip-37535-luminous

luminous: librbd: reset snaps in rbd_snap_list()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #25514 from smithfarm/wip-37343-luminous

luminous: osd: Prioritize user specified scrubs

Reviewed-by: David Zafman <dzafman@redhat.com>

Merge pull request #25604 from smithfarm/wip-37697-luminous

luminous: osd: failed assert when osd_memory_target options mismatch

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>

mon: mark REMOVE_SNAPS messages as no_reply

Fixes: http://tracker.ceph.com/issues/37568
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 1e9423ac65469708a6c02f58f3a91a9dca9f16bd)

Conflicts:
src/mon/OSDMonitor.cc : Resolved in preprocess_remove_snap

ceph-volume tests.functional fix typo when stopping osd.0 in filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit fba43289a2ff8a94361cc016e7a4dfdc61f324e8)

ceph-volume tests.functional.lvm stop all osds before activating again to test permissions

Otherwise, ``ceph-volume lvm activate --all`` will skip OSDs that are
already running. So the test that verifies that permissions are
corrected will fail because ``activate`` will simply skip them

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9be6b15d3316c8eab159bc5d374e95e23d082dde)

ceph-volume lvm.activate ensure filestore osd path is chowned always

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7d6c32b5db0627d95c2ffb9428e86271daa4a336)

ceph-volume: include the ceph-facts role when needed during testing

The ceph-ansible stable-3.2 branch does not have the ceph-facts role
but master does. We need to make sure to import this role only when
it's supported.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 569b4fb7b3894275a3b9f4ab603e32099301f9aa)

ceph-volume tests.functional set root:root in OSDs in filestore

To make sure that ceph-volume will be able to set the right permissions
when trying to activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 503396f685f6a93e0c63e97477677b7145f96c26)

ceph-volume tests.functional set root:root in OSDs in bluestore

To make sure that ceph-volume will be able to set the right permissions
when trying to activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 98631fdeeb6dbe765d3eb80c5c1800946735f2a2)

ceph-volume lvm.activate always chown osd path before osd-prime-dir in bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0af31ec24533091aa4991b2343fe80da94777b4d)

ceph-volume tests.util ensure ints and strings with commas can be converted to ints

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 91bc3a1479c550be7b48128d5755228a2007e4b0)

ceph-volume test verify strings with a comma can be converted to ints

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 818902e568adaefecc6da9afee58b3a804a0e4d0)

ceph-volume util normalize comma with dot for str-to-int conversion

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aa5323fbcfdc6c21177cb800884712b0252b84a0)

Merge pull request #25772 from alfredodeza/luminous-ceph-volume-fix-join

luminous ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

ceph-volume: Fix TypeError: join() takes exactly one argument (2 given)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 38f289b691ed1275bdf7342a4347434ed340c8fc)

Merge pull request #25352 from alfredodeza/luminous-rm37449

luminous: ceph-volume: zap: improve zapping to remove all partitions and all LVs, encrypted or not

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #24468 from vshankar/wip-36281

luminous: mds: add "drop cache" command

Reviewed-by: Venky Shankar <vshankar@redhat.com>