qa/workunits/rbd: adapt import_export test to handle multiple units

Fixes: http://tracker.ceph.com/issues/24740
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #22855 from jcsp/wip-luminous-cephfs-doc

[luminous] doc/cephfs: remove lingering "experimental" note about multimds

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

doc/cephfs: remove lingering "experimental" note about multimds

Signed-off-by: John Spray <john.spray@redhat.com>

Merge pull request #22831 from ceph/backport-luminous-22828

luminous: ceph-volume: provide a nice errror message when missing ceph.conf

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

ceph-volume: always ignore a missing ceph conf in main.py

Now that we have a nice error message when a ceph.conf is missing
and we try to use values from it, maintaining a list of commands that
don't need ceph.conf isn't as helpful. We had actually missed 'simple
trigger' when we first implemented this causing all our luminous tests
for simple to fail when we backported.

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

ceph-volume: show a nice error message when ceph.conf is not loaded

If the ceph configuration file is not loaded correctly and then values
from it are used then an undescript error message is shown, e.g.

AttributeError: 'property' object has no attribute 'get'

With this change that same error condition shows the message:

RuntimeError: No valid ceph configuration file was loaded.

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

Merge pull request #22746 from ceph/backport-luminous-22724

luminous: ceph-volume: error on commands that need ceph.conf to operate

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

ceph-volume: error on commands that need ceph.conf to operate

We had been ignoring the failure to load ceph.conf for all subcommands
but most of them require that a ceph.conf be present. This changes that
so only commands that do not need ceph.conf ignore the failure to find
it.

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

Merge pull request #22716 from liewegas/wip-24661-luminous

luminous: os/bluestore: don't store/use path_block.{db,wal} from meta

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.de>

ceph-volume util make chown links affect links as well as paths

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

ceph-volume lvm.activate chown bluestore symlinks

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

os/bluestore: make bad symlink target error messages more informative

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit aea215103caf669c3e289cc07f978511d61f68b0)

os/bluestore: don't store/use path_block.{db,wal} from meta

This reverts most of 8d07fa5ad0772b4d979dc10695d230074d1f1e69.

ceph-volume goes to great lengths to ensure that the symlinks in the
osd dir are accurate.  Having these values here is an opportunity to
get them out of sync.  And that can happen very easily if the initial
mkfs was performed using a /dev/sdX device name (which is unstable
across reboots).  Even after ceph-volume corrects the symlink, bluestore
will continue to use the stale device path.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ef510e43f0ee14b49e99beed9ae8feda6db3429a)

# Conflicts:
# src/os/bluestore/BlueStore.cc

- add_block_device has an extra arg in newer code

Merge pull request #21368 from smithfarm/wip-23675-luminous

luminous: qa/workunits/mon/test_mon_config_key.py fails on master

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

Merge pull request #22115 from pdvian/wip-24048-luminous

luminous: crush, osd: handle multiple parents properly when applying pg upmaps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #22215 from tchaikov/luminous-24025

luminous: cmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb

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

Merge pull request #22269 from xiaoxichen/backport_22243

luminous: mon/OSDMonitor: Respect paxos_propose_interval

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

Merge pull request #22296 from tchaikov/luminous-24321

luminous: qa: wait longer for osd to flush pg stats

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

Merge pull request #22366 from b-ranto/wip-branto-mgr-luminous

luminous: Sync up ceph-mgr prometheus module

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

Merge pull request #22650 from liewegas/wip-24319-luminous

luminous: os/bluestore: fix SharedBlobSet refcounting race

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

Merge pull request #22567 from pdvian/wip-24334-luminous

luminous: ARMv8 feature detection broken, leading to illegal instruction crashes

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

Merge pull request #22568 from pdvian/wip-24351-luminous

luminous: slow mon ops from osd_failure

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

Merge pull request #22381 from pdvian/wip-24258-luminous

luminous: crush: fix device_class_clone for unpopulated/empty weight-sets

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

Merge pull request #22391 from pdvian/wip-24290-luminous

luminous: common: fix typo in rados bench write JSON output

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

Merge pull request #22592 from pdvian/wip-24356-luminous

luminous: osd: increase default hard pg limit

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

Merge pull request #22474 from yuriw/wip-yuriw-p2p-luminous

qa/tests - added tag 12.2.5. to the mix and removed -x path as unneeded

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

qa/tests - added tag 12.2.5. to the mix and removed -x path as unneeded

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

Merge pull request #22641 from ceph/backport-luminous-22627

luminous: lvm: when osd creation fails log the exception

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

Merge pull request #22201 from batrick/i24185

luminous: client: anchor dentries for trimming to make cap traversal safe

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

Merge pull request #22558 from pdvian/wip-24331-luminous

luminous: mon/MDSMonitor: do not send redundant MDS health messages to cluster log

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

Merge pull request #22603 from batrick/i23792

luminous: MDSMonitor: crash after assigning standby-replay daemon in multifs setup

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

qa/suites/rados/objecstore/backends/objectstore: capture coredumps

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 55f390d0eb0c96cc563190371a35c41f103eb662)

os/bluestore: more debug output

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit fd3036d2e186eb0299785c43aefe6f2ce88f244d)

os/bluestore: print cnode from _open_collections

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b308b6b1554b3203e02e64e3963ef4901274f23f)

os/bluestore: print cnode on fsck

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f3c89ef6e7ce313a2eda2136be5181735e5684d8)

qa/suites/rados/objecstore: preserve data dir for ceph_test_objecstore

If we fail, preserve the data directory.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 23dd6279bb518709b0719132d850c70b7fc554a8)

os/bluestore: fix SharedBlobSet deregister race

In commit 8c8944b2c45ca9dc5b8fd4db1590e1d24206c0b3 we fixed one narrow race
and introduced a new (probably less narrow) one:

A: put shared blob foo, nref = 0, start removing self from set
B: open_shared_blob -> lookup gets nullptr (nref==null), creates a new shared blob
  B: takes lock, sets sb_map[sbid] = newblob
A: gets lock, erases sb_map[sbid]
B: open_shared_blob -> lookup gets null, creates another new shared blob

Fix by only removing the sb_map entry for the nref=0 sb if it still points
to us.  If it doesn't, that means some new blob has shown up in its place.

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

Merge pull request #22438 from pdvian/wip-24298-luminous

luminous: rgw: fix 'copy part' without 'x-amz-copy-source-range' when compressi…

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

Merge pull request #22465 from pdvian/wip-24302-luminous

luminous: rgw: Allow swift acls to be deleted.

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

Merge pull request #22541 from pdvian/wip-24314-luminous

luminous: test/rgw: fix for bucket checkpoints

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

Merge pull request #22551 from smithfarm/wip-24477-luminous

luminous: Bucket lifecycles stick around after buckets are deleted

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

lvm: when osd creation fails log the exception

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

client: delay dentry trimming until after cap traversal

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

Conflicts:
    src/client/Client.cc

mon: respect standby_for_fscid when choosing standby replay mds

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

mon: fix standby replay in multimds setup

The code should break loops for two level. otherwise, in multimds setup,
a standby mds may get assigned to standby replay multiple times. This
bug may cause monitor to crash.

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

osd: increase default hard pg limit

The hard limit was too easy to hit during failure cases, especially
due to mismatched device sizes causing high variance in pgs/osd.

Fixes: https://tracker.ceph.com/issues/24243
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit dfdedce89521f89046fb13287d9fdd683c91e242)

mon/OSDMonitor: no_reply on MOSDFailure ops we eventually process

Failure ops get attached to the failure report.  Once we finally process
them, mark them no_reply so that the forwarding mon will know about it.
The other paths through prepare_failure() do no_reply on the messages
that don't get logged in the failure_info_t::reporters.

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

mon/OSDMonitor: no_reply on ignored MOSDFailure

If we are ignoring the message, tell the forwarding mon to discard it's
state.

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

common/arch/arm: Improve CPU feature check.

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

common/crc/aarch64: Added cpu feature pmull and make aarch64 specific crc function to depend on it.

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

mon/MDSMonitor: do not send redundant MDS health messages to cluster log

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

Merge pull request #22109 from tchaikov/luminous-24180

luminous: mon/LogMonitor: call no_reply() on ignored log message

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

Merge pull request #22290 from pdvian/wip-24216-luminous

luminous: common: partially revert 95fc248 to make get_process_name work

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #22308 from pdvian/wip-24214-luminous

luminous: Module 'balancer' has failed: could not find bucket -14

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

Merge pull request #22414 from wido/luminous-influx

luminous: backport various fixes to mgr/influx module

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

qa: test for trim_caps segfault for trimmed dentries

Test case by Yan Zheng [1].

[1] http://tracker.ceph.com/issues/24137#note-6

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit abb2fa4d5bcba7ae7318c384cd10da348f68fd78)

rgw: add tenant to shard_id in RGWDeleteLC::execute()

in RGWDeleteLC::execute(), we should add bucket.tenant to shard_id,
otherwise, the lc entry can't delete after this op

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 3e7cffb17ed6a473ecbcf8475a72dd2416e077f4)

Conflicts:
src/rgw/rgw_op.cc - luminous does not have 3e528f1ee837a09e1337283a2992e81a87f1bd98

test/rgw: fix for bucket checkpoints

both zones must complete a checkpoint before comparing their bucket contents

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

Merge pull request #22530 from ceph/backport-luminous-22062

luminous: ceph-volume dmcrypt and activate --all documentation updates

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

doc/man/ceph-volume explain encryption and activate all with examples

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

doc/ceph-volume activate is able to use --all for existing OSDs

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

Conflicts:
doc/ceph-volume/lvm/activate.rst

doc/ceph-volume encryption is enabled with the --dmcrypt flag

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

doc/ceph-volume prepapre accepts a --dmcrypt flag

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

doc/ceph-volume activate does not need a dmcrypt flag

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

Merge pull request #22510 from ceph/backport-luminous-22399

luminous: ceph-volume tests do not include admin keyring in OSD nodes

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

Merge pull request #22506 from ceph/backport-luminous-22437

luminous: ceph-volume tests destroy osds on monitor hosts

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

Merge pull request #22513 from ceph/backport-luminous-21890

luminous: ceph-volume describe better the options for migrating away from ceph-disk

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

doc/rados add an anchor to reference replacing osds

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

doc/ceph-volume describe the options for migrating away from ceph-disk

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

doc/ceph-volume high-level description of simple activate at index.rst

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

ceph-volume tests do not include admin keyring in OSD nodes

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

ceph-volume tests functional osd destroy on mons only for dmcrypt

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

ceph-volume tests/functional destroy filestore osds on the monitors

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

ceph-volume tests/functional destroy bluestore osds on the monitors

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

Merge pull request #21938 from pdvian/wip-23985-luminous

luminous: librbd: prevent watcher from unregistering with in-flight actions

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

Merge pull request #22142 from pdvian/wip-24084-luminous

luminous: rbd-mirror: ensure remote demotion is replayed locally

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

Merge pull request #22143 from pdvian/wip-24059-luminous

luminous: Deleting a pool with active notify linger ops can result in seg fault

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

Merge pull request #22172 from pdvian/wip-24086-luminous

luminous: [rbd-mirror] potential races during PoolReplayer shut-down

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

qa: wait longer for osd to flush pg stats

it's the test_create_from_mon()'s counterpart of 38074726.

Fixes: http://tracker.ceph.com/issues/24321
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 16b84f7332fe42c5ca3e378cf23b2fe0185cccc6)

qa: wait longer for osd to flush pg stats

pg sends pg-stats to mgr every 5 seconds, so we cannot check for the
number of pgs right after creating the pool, at that moment, the number
of pgs could be 0, that's why manger.wait_for_clean() returns right
away, and leaves us with 0 pgs: the pgs serving the pool are still being
created. that's why `manager.get_num_active_clean()` returns `0`
sometimes. so, we should force osd to flush their stats to mgr, and wait
until the pg stats converages.

Fixes: http://tracker.ceph.com/issues/24321
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 380747268a1e4a3e8db618d66006c104091fafd5)

Merge pull request #21412 from ukernel/luminous-23698

luminous: mds: misc load balancer fixes

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

Merge pull request #21897 from batrick/i24055

luminous: VolumeClient: allow ceph_volume_client to create 'volumes' without namespace isolation

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

Merge pull request #22354 from ukernel/luminous-24369

luminous: client: void sending mds request while holding cap reference

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

mon/ConfigKeyService: dump: print placeholder value for binary blobs

JSON cannot express arbitrary binary blobs.  Instead of outputting invalid
and unparseable JSON, represent the value of blobs as something like
'<<< binary blob of length 12 >>>'.

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

Conflicts:
PendingReleaseNotes: 12.2.6 dropped, will be added in a seperate pr
src/mon/ConfigKeyService.cc (ConfigKeyService::store_dump does not take
            prefix argument in luminous)

Merge pull request #21968 from ceph/backport-21605

luminous: mon: High MON cpu usage when cluster is changing

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

Merge pull request #22253 from jdurgin/wip-stat-decode

luminous - osd/osd_types: fix object_stat_sum_t decode

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

Merge pull request #22331 from pdvian/wip-24245-luminous

luminous : mon/MgrMonitor: change 'unresponsive' message to info level

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

Merge pull request #22351 from pdvian/wip-24247-luminous

luminous: os/bluestore: simplify and fix SharedBlob::put()

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

Merge pull request #22360 from tchaikov/luminous-24361

luminous: mon: enable level_compaction_dynamic_level_bytes for rocksdb

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

Allow swift acls to be deleted.

The openstack "swift" command deletes acls by submitting an
acl with an empty string.  The existing logic uses c++ strings,
which can't distinguish between an empty string and a non-existant
string.  Additional, the strings are coming from RGWEnv which
supplies C strings not c++.  Using C strings instead makes it
trivial to pass "non-existance" (as a null string).  It also avoids
some type conversion with string copying.

Fixes: http://tracker.ceph.com/issues/22897
Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit 1fc69243bdfadb1a8c68a9fa5491e32287bc33b4)

Merge pull request #22400 from yuriw/wip-yuriw-p2p-luminous

qa/tests - moved point-to-point suite into own folder

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

Merge pull request #21437 from pdvian/wip-23683-luminous

luminous: rgw: radosgw-admin should not use metadata cache for readonly commands

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

Merge pull request #21724 from smithfarm/wip-23231-luminous

luminous: rgw: rgw_statfs should report the correct stats

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

Merge pull request #21738 from cbodley/wip-23906

luminous: rgw: fix use of libcurl with empty header values

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

Merge pull request #22177 from pdvian/wip-24120-luminous

luminous: rgw: trim all spaces inside a metadata value

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

Merge pull request #22302 from linuxbox2/wip-luminous-irange

luminous: rgw: add configurable AWS-compat invalid range get behavior

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

Merge pull request #22352 from pdvian/wip-24252-luminous

luminous: rgw: Do not modify email if argument is not set

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

Merge pull request #22363 from mdw-at-linuxbox/wip-luminous-rgw-implt

luminous: rgw: making implicit_tenants backwards compatible

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

Merge pull request #21316 from pdvian/wip-23607-luminous

luminous: rbd: improve 'import-diff' corrupt input error messages

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

Merge pull request #22180 from pdvian/wip-24156-luminous

luminous: [rbd-mirror] potential deadlock when running asok 'flush' command

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