rgw_file: dont deadlock in advance_mtime()

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

Merge pull request #28862 from liewegas/wip-bluefs-extents-nautilus

nautilus: os/bluestore/bluefs_types: consolidate contiguous extents

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

Merge pull request #29191 from mynaramana/patch-1

doc/rados: Correcting some typos in the clay code documentation

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

doc/rados: Correcting some typos in the clay code documentation
Signed-off-by: Myna <mynaramana@gmail.com>

Merge pull request #29551 from pdvian/wip-40882-nautilus

nautilus: rbd: Reduce log level for cls/journal and cls/rbd expected errors

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

Merge pull request #29722 from dillaman/wip-39499-nautilus

nautilus: librbd: snapshot object maps can go inconsistent during copyup

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #29723 from dillaman/wip-40511-nautilus

nautilus: librbd: improve journal performance to match expected degredation

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #29725 from dillaman/wip-41078-nautilus

nautilus: mgr/rbd_support: support scheduling long-running background operations

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #29745 from liewegas/wip-bluestore-no-cgroup-nautilus

nautilus: os/bluestore: do not set osd_memory_target default from cgroup limit

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

os/bluestore/bluefs_types: consolidate contiguous extents

If we allocate a new extent that is contiguous with the last extent,
just extend it.  This avoids having long vectors of continguous extents
when a single large extent would suffice--especially with log files.

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

os/bluestore: do not set osd_memory_target default from cgroup limit

On the aarch64 box I'm testing, this gives us a value of
7378697629483768832, which is not what we want.

I think we are better off relying on this limit being explicitly set via
environment variables (POD_* by kuberentes/rook) or via the command line.

This partially reverts 5c6b533697814af8acfd9e731a2599b2294687ef, but not
all of it, since we wan to keep the option itself, as it is now used by
common/config.cc when dealing with the POD_MEMORY_LIMIT env var.

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

Merge pull request #29650 from pdvian/wip-40945-nautilus

nautilus: mgr/dashboard: RGW User quota validation is not working correctly

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>

Merge pull request #29678 from pdvian/wip-40948-nautilus

nautilus: core: Better default value for osd_snap_trim_sleep

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

librbd: tweaks to improve throughput for journaled IO

Increase the per-object append flush bytes to 1MiB to mimic the 16MiB
in-memory writeback cache. Finally, default enable the new journal
writethrough until flush option.

Performance results comparing no journal, pre-change, and post-change:

no journal original modified
4K 40310.84 7223.73 27427.27
32K 21530.37 3256.39 10284.05
256K 3159.67 564.73 1627.16
4M 223.03 48.03 91.91

Fixes: http://tracker.ceph.com/issues/40072
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5f3b043896762fa97eb35648f8639004c45f5978)

librbd: new rbd_journal_object_writethrough_until_flush option

When set to true, the journal will not attempt to batch appends until
after it receives the the first flush request from the user.

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

Conflicts:
src/librbd/io/ImageRequest.cc: trivial resolution

journal: support dynamically updating recorder flush options

Default to disabling writeback-style append flushes unless overridden
by a call to 'set_append_batch_options'.

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

journal: fix broken append batching implementation

The original flush_interval/bytes/age batching options no longer
actually do anything. Integrate these better with the max in-flight
AIO handling.

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

journal: improve logging on recorder append path

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

journal: wait for in flight advance sets on stopping recorder

Before object overflow detection optimization (83461c42b) the
overflow was detected when trying to send data, so when an object
set was advanced we always had some data and flush always
completed later. But now we detect overflow on client side, it
may happen when buffer is empty and flush may complete
when "advance object set" is still in flight.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 340726ec89c4a2b57905aa1be328d55c96758fee)

journal: optimize object overflow detection

Previously to detect overflow we were sending journal append
requests until -EOVERFLOW is returned by osd. This means that we
had at least one waste (rejected) request per object set (though
there may be more if the number of in-flight appends is not
limited).

We can easily predict when the osd will start to return
-EOVERFLOW and avoid such additional requests.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 83461c42b03cf7d407ac3c5d02043cca1e908015)

Merge pull request #27684 from liewegas/wip-rgw-pgs-nautilus

nautilus: rgw: remove rgw_num_rados_handles; set autoscale parameters or rgw metadata pools

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #29478 from xiaoxichen/wip-41002

nautilus: cephfs: client: unlink dentry for inode with llref=0

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

Merge pull request #29724 from dillaman/wip-40888-nautilus

nautilus: doc/rbd: initial live-migration documentation

Reviewed-by: Mykola Golub <mgolub@suse.com>

rgw: pass mostly_omap flag when opening/creating pools

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

rgw/rgw_rados: pass mostly_omap flag when opening/creating pools

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

rgw: move rgw_init_ioctx() to rgw_tools.cc

move rgw_init_ioctx() out of rgw_rados.cc so that it doesn't need to be
duplicated by services/svc_rados.cc

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

 Conflicts:
src/rgw/rgw_gc.cc
include conflicts with scope_guard, added rgw_tools include as well which
introduces rgw_init_ioctx

rgw: Get rid of num_rados_handles infrastructure in RGWSI_RADOS

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 5666b4c41a70bac75e26b44a2cec1bd895d8375d)

rgw: Get rid of num_rados_handles infrastructure in RGWRados

Since we aren't supporting multiple handles, don't have the overhead.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 042776bbf64c34dc817980d52cebdd069492b0e6)

rgw: Remove rgw_num_rados_handles option

This has been deprecated for some time and underlies much of the
complexity of the RADOS service.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 55180511e5e5a2d9965a1bad17218ee64e023484)

Conflicts:
PendingReleaseNotes
updated to reflect current nautilus status

mon/mgr: add 'rbd_support' to list of always-on mgr modules

The 'rbd_support' mgr module provides many background functions that
are required by the 'rbd' CLI performance queries, as well as future
background long-running maintenance tasks.

Fixes: http://tracker.ceph.com/issues/40790
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7231aab4b844729c1c35da37515dce58026c26a2)

Conflicts:
src/mon/MgrMonitor.cc: trivial resolution

pybind/mgr/rbd_support: use image ids to detect duplicate tasks

This helps to to avoid the case where new tasks were not being scheduled
when an image name was re-used after having a task created under the
same name.

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

pybind/rbd: fix call to unregister_osd_perf_queries

.. should be invoked as self.unregister_osd_perf_queries()
rather than self.module.unregister_osd_perf_queries().

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 37a9b5375ff3793ea39ba7d13618aa977c8b302d)

pybind/mgr: don't log exception when cannot find RBD task by id

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

pybind/mgr: handle duplicate rbd task commands

The 'ceph' CLI will duplicate commands within teuthology to test
the MONs idempotency. This shouldn't be required for the MGR module,
but we can keep a fixed set of completed tests to handle this
possible command replay.

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

qa: test case for new rbd background tasks

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

pybind/mgr: rbd tasks now provide a dict to the progress events

This dict will include an origin key fixed to 'rbd_support' as well
as pool and image references.

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

pybind/mgr: mark progress events as failed if an error occurs

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

pybind/mgr: support marking progress events as failed

The failed events can also include a failure message to indicate
the reason for the failure.

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

Conflicts:
src/pybind/mgr/progress/module.py: tweaked missing backport for task start/stop times

pybind/mgr: new 'rbd task' background task management

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

pybind/rbd: new OperationCanceled exception

This allows the error to be directly caught instead of attempting
to parse the OSError.errno

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

pybind/rbd: flatten, remove, trash_remove, migration progress callback

This callback can be used to track progress and also to attempt to cancel
the operation while it's in-progress by returning a negative error code
from the callback.

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

librbd: abort an image removal if block objects cannot be removed

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

librbd: allow ProgressCtx::update_progress to cancel maintenance ops

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

doc/rbd: initial live-migration documentation

Fixes: http://tracker.ceph.com/issues/40486
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 20c80dfd3fac134a1e897f17d7b2f2082024d9e9)

Conflicts:
doc/rbd/rbd-operations.rst: did not backport restructuring

librbd: the first post-migration snapshot isn't always dirty

Currently, the first post-migration snapshot is always marked EXISTS
(i.e. dirty).  This is wrong, because the data can be inherited from
a pre-migration snapshot, handled by deep copy.

Mark all post-migration snapshots EXISTS_CLEAN in this case.

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

librbd: don't update snapshot object maps if copyup data is all zeros

If the data read from the parent is all zeros, deep copyup isn't
performed.  However snapshot object maps are updated unconditionally,
causing inconsistencies where nonexistent objects are marked
OBJECT_EXISTS or OBJECT_EXISTS_CLEAN.

Fixes: http://tracker.ceph.com/issues/39435
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 4456dc3939816a8bcb36dfc771adb1c699b37b0f)

librbd: avoid repeatedly invoking is_zero() in CopyupRequest

Invoke is_zero() just once, either in handle_read_from_parent() or
handle_deep_copy().

Initialize m_copyup_is_zero to true to preserve existing behavior:
on an empty bufferlist is_zero() returns true.

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

Merge pull request #29436 from wjwithagen/wip-41038-nautilus

nautilus: cmake: update FindBoost.cmake

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

Merge pull request #29454 from pdvian/wip-40734-nautilus

nautilus: mgr/diskprediction_cloud: Service unavailable

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

Merge pull request #29352 from Devp00l/wip-40658-nautilus

nautilus: mgr/dashboard: Pool graph/sparkline points do not display the correct values

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>

Merge pull request #29354 from Devp00l/wip-40982-nautilus

 nautilus: mgr/dashboard: Fix the table mouseenter event handling test

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by:  Tiago Melo <tmelo@suse.com>

Merge pull request #29524 from pdvian/wip-40846-nautilus

nautilus: mgr/dashboard: controllers/grafana is not Python3 compatible

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #29566 from pdvian/wip-40885-nautilus

nautilus: mon/MgrMonitor: fix null deref when invalid formatter is specified

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge pull request #29671 from neha-ojha/wip-40322-nautilus

nautilus: mon/OSDMonitor: allow pg_num to increase when require_osd_release < N

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

Merge pull request #29682 from b-ranto/wip-push-dash

nautilus: rpm: Require ceph-grafana-dashboards

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

Merge pull request #29308 from smithfarm/wip-40518-nautilus

nautilus: rgw: RGWGC add perfcounter retire counter

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

Merge pull request #29326 from smithfarm/wip-40540-nautilus

nautilus: rgw: multisite: 'radosgw-admin bilog trim' stops after 1000 entries

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

Merge pull request #29328 from smithfarm/wip-40237-nautilus

nautilus: rbd: profile rbd OSD cap should add class rbd metadata_list cap by default.

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

Merge pull request #29329 from smithfarm/wip-40501-nautilus

nautilus: rbd: [cli] 'export' should handle concurrent IO completions

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

Merge pull request #29409 from pdvian/wip-40600-nautilus

nautilus: rgw_file: fix readdir eof() calc--caller stop implies !eof

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

Merge pull request #29410 from pdvian/wip-40627-nautilus

nautilus: rgw_file: advance_mtime() should consider namespace expiration

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

Merge pull request #29499 from pdvian/wip-40848-nautilus

nautilus: rgw: Don't crash on copy when metadata directive not supplied

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

Merge pull request #29697 from pdvian/wip-41084-nautilus

nautilus: core: Change default for bluestore_fsck_on_mount_deep as false

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

Merge pull request #29660 from jan--f/wip-41248-nautilus

nautilus: ceph-volume: simple functional tests drop test for lvm zap

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

ceph-volume: don't try to test lvm zap on simple tests

Fixes: https://tracker.ceph.com/issues/41245
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 081109859a06f1b2ff6652dce07da4ddf6fb258e)

Merge pull request #29702 from jan--f/wip-41308-nautilus

nautilus: ceph-volume: [filestore,bluestore] single type strategies fail after tracking devices as sets

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

Merge pull request #29689 from jan--f/wip-41299-nautilus

nautilus: batch functional idempotency test fails since message is now on stderr

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

Merge pull request #29455 from pdvian/wip-40672-nautilus

nautilus: doc: fix rgw ldap username token

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

ceph-volume: fix batch functional tests, idempotent test must check stderr

Fixes: https://tracker.ceph.com/issues/41295
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 88807110f3014e7a2a39c37ae5c64bb3ab107d80)

ceph-volume: don't keep device lists as sets

This was introduced by #27754. The explicit device lists were cast to
sets but other parts of the code where not updated accordingly. To avoid
touching all code places, only cast to sets for disjoint test and keep
lists otherwise.

Fixes: https://tracker.ceph.com/issues/41292
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 0534cf188a671096d5ddb9d48cdae3dccc6c0b18)

Merge pull request #29690 from jan--f/wip-41082-nautilus

nautilus: ceph-volume: batch gets confused when the same device is passed in two device lists

common/options.cc: common/options.cc: change default value of bluestore_fsck_on_umount_deep to false

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 8c86c3a5b4bdca258016019f63359f52aa8cd84b)

common/options.cc: change default value of bluestore_fsck_on_mount_deep to false

Fixes: https://tracker.ceph.com/issues/41017
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 7c03f088f1004d4e26b6bdea8fa58f8455f1d6a2)

Merge pull request #29645 from yuriw/wip-yuriw-upgrade-rbd-nautilus

qa/tests: added rbd_fsx tests to the tests mix

Merge pull request #29065 from s0nea/wip-40786-nautilus

nautilus: mgr/dashboard: SSL certificate upload command throws deprecation warning

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>

Merge pull request #29372 from pdvian/wip-40537-nautilus

nautilus: osd/PG: do not queue scrub if PG is not active when unblock

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

Merge pull request #29373 from pdvian/wip-40542-nautilus

nautilus: mon: take the mon lock in handle_conf_change

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

Merge pull request #29562 from liewegas/wip-41037-nautilus

nautilus: common/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars

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

Merge pull request #29694 from jan--f/c-v-no-dashboard-test-nautilus

nautilus: ceph-volume: run functional tests without dashboard

Merge pull request #29484 from pdvian/wip-40737-nautilus

nautilus: doc/rgw: document use of 'realm pull' instead of 'period pull'

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

Merge pull request #29444 from ricardoasmarques/fix-ceph-iscsi-required-version-nautilus

nautilus: doc: Update 'ceph-iscsi' min version

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

ceph-volume: when testing disable the dashboard

ceph-ansible has started enabling the dashboard by
default as of https://github.com/ceph/ceph-ansible/pull/4268

Disabling the dashboard gets us around needing to run
the grafana_server role which is required for the dashboard
and not needed for ceph-volume functional tests.

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

Merge pull request #29306 from smithfarm/wip-40498-nautilus

nautilus: doc: Object Gateway multisite document read-only argument error

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

ceph-volume: batch ensure device lists are disjoint

Fixes: https://tracker.ceph.com/issues/41018
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8fcdb4d628f3a55e4783f0a3df7ac7c0a36eaa43)

rpm: Require ceph-grafana-dashboards

The recently introduced 'dashboard grafana dashboards update' command
requires the grafana dashboards for it to work properly. Adding the
dependency.

Signed-off-by: Boris Ranto <branto@redhat.com>

common/options.cc, doc: osd_snap_trim_sleep overrides other variants

A value > 0 for osd_snap_trim_sleep, will override the backend specific
variants of osd_snap_trim_sleep.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 733df09fe5111e7beca75f8be0afb8669ef9a625)

doc/rados/configuration/osd-config-ref.rst: document snap trim sleep

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit accf95e9dea257c3aaa64b7a36d077468d7c86ec)

osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

This is better than the earlier default, which was set to 0.

Fixes: https://tracker.ceph.com/issues/40528
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 560fca12e695a817e1b7e46d365838ed871b64bd)

Conflicts:
src/osd/OSD.cc : Resolved for get_osd_snap_trim_sleep

mon/OSDMonitor.cc: use CEPH_RELEASE_LUMINOUS instead of ceph_release_t::nautilus

This commit is specific to nautilus, since cherry-pick of
7e7134aa9317a0d64503edb20b9ea1f4035c7e9e and
d2c591a142479cf5dd58da599da8d7212f5c5701, did not result in conflicts.

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

Merge pull request #29442 from pdvian/wip-40659-nautilus

nautilus: mgr/dashboard: Interlock `fast-diff` and `object-map`

mon/OSDMonitor: require nautilus to set pg_autoscale_mode

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

mon/OSDMonitor: allow pg_num to increase when require_osd_release < N

Setting pg_num_target has no effect when we encode our OSDMap with mimic
or luminous features.  Fall back to the pre-nautilus behavior of directly
setting pg_num.

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

Merge pull request #29617 from pdvian/wip-40942-nautilus

nautilus: mon/OSDMonitor.cc: better error message about min_size

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

mgr/dashboard: RGW User quota validation is not working correctly

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

qa/tests: added rbd_fsx tests to the tests mix

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

mgr/dashboard: Pool list shows current r/w byte usage in graph

Now the pool list will show the current read and write byte usage in the
sparkline graph like it is already done in the OSD listing.

Fixes: https://tracker.ceph.com/issues/39650
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 2f18cf577033f8a4f3e0115b1eb86240c084fc98)

 Conflicts (trivial):
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts

Merge pull request #29600 from jan--f/wip-41203-nautilus

nautilus: ceph-volume prints log messages to stdout

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

mon/OSDMonitor.cc: better error message about min_size

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit ce25ac0a9196f90acef82915f122c5a06277993a)

Merge pull request #29440 from neha-ojha/wip-40940-nautilus

nautilus: rocksdb: Updated to v6.1.2

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

Merge pull request #29439 from neha-ojha/wip-40969-nautilus

nautilus: rocksdb: rocksdb_rmrange related improvements

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