osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock.

Fixes: http://tracker.ceph.com/issues/37404
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 328ab2d9f0a27aa38d153469f8ed11e21a6c3ae8)

Merge pull request #25699 from xiexingguo/wip-37744

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

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

Merge pull request #25292 from smithfarm/wip-37417-mimic

mimic: mgr: various python3 fixes

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

Merge pull request #25299 from smithfarm/wip-37428-mimic

mimic: msg/async: crashes when authenticator provided by verify_authorizer not implemented

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

Merge pull request #25718 from ashishkumsingh/wip-37552-mimic

mimic: osdc/Objecter: update op_target_t::paused in _calc_target

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

Merge pull request #25759 from pdvian/wip-37599-mimic

mimic: pybind/mgr: drop unnecessary iterkeys usage to make py-3 compatible

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #25864 from ashishkumsingh/wip-37826-mimic

mimic: mgr: fix crash due to multiple sessions from daemons with same name

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

Merge pull request #25368 from pdvian/wip-37477-mimic

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

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

Merge pull request #25513 from smithfarm/wip-37342-mimic

mimic: osd: Prioritize user specified scrubs

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

Merge pull request #25605 from smithfarm/wip-37698-mimic

mimic: osd: failed assert when osd_memory_target options mismatch

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

Merge pull request #25809 from pdvian/wip-37742-mimic

mimic: build/ops: rpm: require ceph-base instead of ceph-common

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

Merge pull request #25844 from pdvian/wip-37810-mimic

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

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

Merge pull request #25846 from pdvian/wip-37812-mimic

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

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #25850 from ashishkumsingh/wip-37814-mimic

mimic: qa/workunits/rados/test_health_warnings: prevent out osds

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

Merge pull request #25854 from ashishkumsingh/wip-37824-mimic

mimic: os/bluestore: KernelDevice::read() does the EIO mapping now.

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

Merge pull request #25958 from xiexingguo/wip-mimic-async-fixes

mimic: msg/async: backport recent messenger fixes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>

Merge pull request #26118 from ceph/backport-mimic-26084

mimic: ceph-volume: mark a device not available if it belongs to ceph-disk

Reviewed-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #25386 from pdvian/wip-37483-mimic

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

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

Merge pull request #25449 from smithfarm/wip-37518-mimic

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

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

Merge pull request #25459 from pdvian/wip-37536-mimic

mimic: librbd: reset snaps in rbd_snap_list()

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

Merge pull request #25485 from pdvian/wip-37548-mimic

mimic: rgw_file: user info never synced since librgw init

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

Merge pull request #25505 from smithfarm/wip-37550-mimic

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

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

Merge pull request #25643 from pdvian/wip-37562-mimic

mimic: rgw: fix version bucket stats

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

Merge pull request #25740 from pdvian/wip-37649-mimic

mimic: rgw: feature -- log successful bucket resharding events

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #25899 from ashishkumsingh/wip-37558-mimic

mimic:  rgw: handle S3 version 2 pre-signed urls with meta-data

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

Merge pull request #26003 from smithfarm/wip-37948-mimic

mimic: rgw: debug logging for v4 auth does not sanitize encryption keys

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

Merge pull request #25607 from joscollin/wip-37684-mimic

mimic: doc/user-management: Remove obsolete reset caps command

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

Merge pull request #25501 from joscollin/wip-37601-mimic

mimic: doc: broken link on troubleshooting-mon page

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

ceph-volume: mark a device not available if it belongs to ceph-disk

The `ceph-volume inventory` command will now show if a device is being
used by ceph-disk and mark it not available if so.

Fixes: https://tracker.ceph.com/issues/24871
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit d14a6b284c44a3f61c0dd8c60ccc474203003653)

Merge pull request #26113 from alfredodeza/mimic-rm37963

mimic ceph-volume fix TypeError on dmcrypt when using Python3

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

ceph-volume tests verify behavior of create_dmcrypt_key in python 3

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

ceph-volume util.encryption ensure int is used for urandom (py3 compat)

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

Merge pull request #26035 from noahdesu/mimic-pr26015

mimic: cli: dump osd-fsid as part of osd find <id>

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

Merge pull request #26029 from alfredodeza/mimic-fix_raw_input

mimic ceph-volume: Adapt code to support Python3

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

Merge pull request #26013 from alfredodeza/mimic-bz1644847

mimic ceph-volume zap devices associated with an OSD ID and/or OSD FSID

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

cli: dump osd-fsid as part of osd find <id>

Dumps the osd-fsid uuid as part of the `osd find <id>` command.
Currently this uuid is only available as part of `osd dump` but
ceph-ansible has a use case to interrogate a single osd without needing
the entire osdmap dump.

Fixes: http://tracker.ceph.com/issues/37966
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit 4d01b2c96e0ea1122225c30da21bc39c40e15c0e)

ceph-volume: Adapt code to support Python3

- raw_input() has been renamed to input() in Python3
- Changed signature of prompt_bool. Variables that are named like built-ins must be named like xxx_ and not _xxx

Fixes: https://tracker.ceph.com/issues/37470
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit fe25a0ea625e75c598f6d0749e7259eef167fa8e)

ceph-volume tests.functional.batch symlink test_zap to all batch scenarios

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

ceph-volume tests.functional.batch add test_zap yaml to tox.ini

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

ceph-volume tests.functional.batch create a separate test_zap playbook

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

ceph-volume lvm.zap update success message for OSD IDs

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

doc/man/ceph-volume add zapping by osd-id examples

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

doc/ceph-volume add zapping by osd-id examples

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

ceph-volume tests.lvm verify associated lvs by osd id+fsid behavior

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

ceph-volume lvm.zap initial take on zapping by OSD ID, FSID

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

Merge pull request #25554 from jan--f/25238-mimic

mimic ceph-volume: introduce class hierachy for strategies

Reviewed-by: Alfredo Deza <adeza@redhat.com>

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

Fixes: http://tracker.ceph.com/issues/37847
CVE-2018-16889

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 000797941fd303c3adc24f0089aeee0e902da205)

ceph-volume lvm.strategies remove unused import

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

  Conflicts:
  src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
          resolved by removing str_to_int import

ceph-volume: filestore strategy use strategy class hierarchy

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 34df12ea6a8686f161b4bdfde92e557743f59cf4)

ceph-volume: bluestore strategy use strategy class hierarchy

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 302334ac6a4375125b6c1e68bf7160f8bc0597c2)

ceph-volume: add strategies.py to for shared code

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit b38987ee9652527e4845f2beb6406cbd398dac9b)

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: bump global_seq when retrying connection

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 #25923 from alfredodeza/mimic-ceph-volume-fix-json

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

Reviewed-by: Andrew Schoen <aschoen@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 #25819 from batrick/mimic-pr24562

doc: removed warning for resolved errata

Reviewed-by: John Wilkins <jowilkin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

rgw: handle S3 version 2 pre-signed urls with meta-data

Add CanonicalizedAmzHeaders to the v2 signing document, as required
in https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html

Also lift qs metadata into x_meta_map in RGWPutObj_ObjStore_S3::get_parms(),
so they are applied to the stored object.

Fixes: https://tracker.ceph.com/issues/23470
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 3b0480ed136cebd3fba2322a77c7d047ef6ad5e3)

rgw: distinguish parse_v4_credentials

The caller and callees of this method are v4-specific, and their
names contain a v4 infix.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit aa8c686da10ce1211a706f3519757045dfe34bed)

Conflicts:
src/rgw/rgw_auth_s3.cc
src/rgw/rgw_auth_s3.h
src/rgw/rgw_rest_s3.cc
  - Included v4 infix in 'parse_credentials()' and removed
    "session_token" param from definition, declaration and call
    of 'parse_v4_credentials()'.

Merge pull request #25868 from dillaman/wip-37842-mimic

mimic: test/pybind/test_rbd: filter out unknown list_children2 keys

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>

test/pybind/test_rbd: filter out unknown list_children2 keys

Fixes: http://tracker.ceph.com/issues/37729
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 24cc60335d86ff625e0c5d98cab0c4449a24f296)

mgr: fix crash due to multiple sessions from daemons with same name

Don't assume perf counter instances are stable. If there are
multiple sessions from daemons reporting the same name (e.g. rgws),
the instances are cleared in DaemonServer::handle_open.
If the daemons have different counter names (for counters like
"objecter-0x55b6f4f1a630.op_active") it will throw out_of_range in
DaemonPerfCounters::update when accessing the instance removed by
another session.

The regression was introduced when adding avgcount support.

Fixes: https://tracker.ceph.com/issues/36244
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 5b6037aeb43aff90111fdae08807ddda290bc570)

os/bluestore: KernelDevice::read() does the EIO mapping now.

Fixes: http://tracker.ceph.com/issues/36455
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit a1e0ece7f987c7a563b25ec0d02fc6f8445ef54e)

qa/workunits/rados/test_health_warnings: prevent out osds

Fixes: http://tracker.ceph.com/issues/37776
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d8d16ba6aa9b00379aac7d2732f60bfd68b20c0c)

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 #25837 from alfredodeza/mimic-rm37805

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

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

Merge pull request #25775 from alfredodeza/mimic-rm37442

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

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)

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 #25777 from alfredodeza/mimic-rm37486

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

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

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)

removed warning for resolved errata

Signed-off-by: Scoots Hamilton <scoots@redhat.com>
(cherry picked from commit 93528996189f2eaf42bae18db428f3ea18f28b14)

Conflicts:
doc/cephfs/cache-size-limits.rst

Merge pull request #25749 from alfredodeza/mimic-cryptsetup-allow-discards

mimic ceph-volume: enable device discards

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

Merge pull request #25551 from jan--f/25203-mimic

mimic ceph-volume: fix Batch object in py3 environments

Reviewed-by: Alfredo Deza <adeza@redhat.com>

spec: requires ceph base instead of common

Currently rbd-mirror and radosgw packages installation won't create the
Ceph directories in /var/lib/ceph since they depend on ceph-common
only. ceph-base is responsible for creating these directories.

Since ceph-base requires ceph-common then let's use ceph-base as a
dependency.

Fixes: http://tracker.ceph.com/issues/37620
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c0f77bd69ed0f0d813b1e9c2dd7375828fd42503)

Conflicts:
ceph.spec.in : Resolved for ceph-base

Merge PRs after 13.2.3 and before 13.2.4 back into mimic branch

13.2.4

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>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 29bc434a6a81a2e5c5b8cfc4c8d5c82ca5bf538a)
mimic specific fixes:
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

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 #25291 from smithfarm/wip-37414-mimic

mimic: mgr/balancer: add crush_compat_metrics param to change optimization keys

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

Merge pull request #25771 from alfredodeza/mimic-ceph-volume-fix-join

mimic 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 #25351 from alfredodeza/mimic-rm37449

mimic 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 #24695 from vshankar/wip-35932

mimic : client: retry remount on dcache invalidation failure

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

Merge pull request #25031 from smithfarm/wip-36576-mimic

mimic: cephfs: mgr/status: fix fs status subcommand did not show standby-replay MDS' perf info

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

Merge pull request #25198 from pdvian/wip-37285-mimic

mimic: rgw: radosgw-admin: translate reshard status codes (trivial)

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

Merge pull request #25213 from badone/wip-mimic-fix-branch-3.2-placement

mimic: qa/ceph-ansible: Move "branch" out of "vars" section

Reviewed-by: Robin H. Johnson <robbat2@gentoo.org>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #25218 from k0ste/mimic_backports

mimic: mgr: prometheus: added bluestore db and wal devices to ceph_disk_occupation metric.

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #25227 from pdvian/wip-37288-mimic

mimic: tests: qa/tasks/ceph: ignore failure when chown ceph:ceph

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