rgw: distribute cache for exclusive put

Distribute cache for exclusive put

Fixes: https://tracker.ceph.com/issues/48632
Thanks to Casey Bodley for finding the solution

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 4fb51bc125b4ec23c2f47e7326d67f885f7d268c)

Merge pull request #38626 from batrick/i48635

octopus: qa: tox failures

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

Merge pull request #36803 from ShyamsundarR/wip-46820-octopus

octopus: mgr/volumes: Implement subvolume version v2

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

Merge pull request #38688 from batrick/4ca8aaafa32bb7397eec80a8eb366d2dd781a72f-octopus

octopus: qa: unmount volumes before removal

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

Merge pull request #38594 from callithea/wip-48587-octopus

octopus: mgr/dashboard: RGW User Form is validating disabled fields

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #38759 from tchaikov/octopus-38263

octopus: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #38770 from votdev/wip-48629-octopus

octopus: mgr/dashboard: The /rgw/status endpoint does not check for running service

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #38592 from callithea/wip-48574-octopus

octopus: mgr/crash: Serialize command handling

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #38555 from kamoltat/wip-ksriivad-octopus-backport

octopus: qa/tasks/mgr/test_progress: update test suite to check for specific progress events

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

Merge pull request #38455 from trociny/wip-48470-octopus

octopus: librbd: fix regression in object map diff request

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

Merge pull request #38429 from smithfarm/wip-48194-octopus

octopus: bluestore: Make mempool assignment same after bufferlist rebuild

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

Merge pull request #38428 from smithfarm/wip-48094-octopus

octopus: os/bluestore: fix segfault on out-of-bound offset provided to  claim_free_to_right() call

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #38086 from orztt/wip-rgw-versioning-octopus

octopus: rgw: cls/rgw/cls_rgw.cc: fix multiple lastest version problem

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

Merge pull request #38782 from sebastian-philipp/octopus-backport-37607-38169-37696-37576-38211-38278-38304-38285-38317-38130-38064-3803

octopus: cephadm: batch backport January (1)

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #38798 from votdev/wip-48652-octopus

octopus: mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #38797 from rhcs-dashboard/wip-48626-octopus

octopus: mgr/dashboard: Fixing dashboard logs e2e test

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #38607 from rhcs-dashboard/wip-48605-octopus

octopus: mgr/dashboard: Fix CRUSH map viewer VirtualScroll

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #38583 from votdev/wip-48592-octopus

octopus: mgr/dashboard: Drop invalid RGW client instances, improve logging

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #38598 from callithea/wip-48494-octopus

octopus: mgr/dashboard: Fix for misleading "Orchestrator is not available" error

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #38597 from callithea/wip-48539-octopus

octopus: mgr/dashboard: adjust refresh intervals of Services and Daemons

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #38503 from callithea/wip-48511-octopus

octopus: mgr/dashboard: remove pyOpenSSL version pinning

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #37969 from bk201/wip-48132-octopus

octopus: mgr/dashboard: disable cluster selection in NFS export editing form

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

mgr/cephadm: fix bug in orch apply osd --dry-run where empty table printed

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 459fa5777d400d5aa9eb7d4fe520369d47c775b9)

qa/distros: configure podman to pull from docker-mirror

This also requires a change to cephadm.py to search for
registry entries for docker.io by 'prefix' or 'location',
and to only add the mirror if a mirror isn't already present

Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit f30c55a242f381f0d191b55c76d3fc5d027e602e)

cephadm: update permissions on newly created dirs

Use 755 instead of 700 on new directories created during
bootstrap

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 9ef60e9111691c6511baa93ca1d080250588d6c0)

cephadm: create default output dir during bootstrap

If the output dir doesn't exist the old behaviour was to
abort bootstrap. Since we're running with UID=0, this
patch will create the missing dirs for the user to keep the
bootstrap process going

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 27b5eada81189ad01b31ff34bf0e362353cfbd92)

mgr/cephadm: correct connection failure message

When add host fails with py3 missing, wasn't used in
the output returned to the admin - instead they saw
the generic failure message which "points them in the
wrong direction". This patch shows the py3 missing
message

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 9e27995bb0a7de0072742e5f18926343acf80e05)

pybind/mgr/cephadm: limit rgw osd caps

Using tagged pools ensures RGW only can access pools used for RGW.

Fixes: https://tracker.ceph.com/issues/48594
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 373cc847cf0f8b4ec7aefbfe64c01c3f18a4e021)

doc/cephadm: Add remove host to operations

Co-authored-by: Alexandra Settle <asettle@suse.com>
Co-authored-by: Kefu Chai <tchaikov@gmail.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 453000af19b25082aef1b473bd9284311ac98204)

mgr/cephadm: improve iscsi dashboard config

updating iscsi config dashboard to match what was done with ceph ansible.
This includes:
  - set iscsi api ssl verification to false when api_secure is set
  - using https rather than http in gateway url when spi_secure is set
  - default api_user and api_password to "admin"
  - convert hostname to ip address when creating gateway url

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit ba6d22b492400588de22b93189eee8818f647807)

mgr/cephadm: disallow_untyped_defs=True

simplifies mypy.ini

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

Conflicts:
src/mypy.ini

orchestrator: drop redundant try/except

YAML is validated up front, so the additional try/except
clause is not needed.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit a8690f1b50f0952155e327ffb17952d7cecfbe98)

orchestrator: validate osd yaml

Validate the yaml document ahead of usage, to catch
any basic errors in the yaml doc. If errors are found the
exception is shown in the mgr log, and the user gets a
more friendly error message, without the traceback.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 0f236c7911bdcc4b0266833e1b7da01a3c7e4eac)

cephadm: command_unit: call systemctl with verbose=True

Otherwise `cephadm unit ... status` won't print anything

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

mgr/cephadm: make type annotations for module.py mandatory

Fixing bogus json representation for registry-login

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

Conflicts:
src/mypy.ini
src/pybind/mgr/cephadm/module.py

doc/dev/cephadm: Add link to the index

Adds a link to the index for the compliance-check doc

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit f2791c0e26a81b8d0f1a7d070f67dd79cd6ed25c)

Conflicts:
doc/dev/cephadm/index.rst

doc/dev/cephadm: Updates following feedback

Minor grammatical and formatting changes

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 1facc5e9a725d33e57370c65d3086e952f13b05c)

doc: moved design doc under doc/dev

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 7168cbf0521aa29701f0133b4e38b858888e46b4)

docs: high level design for a compliance check feature

Document defining the high level goals of a compliance check
feature that could be added to mgr/cephadm.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 2407a7bf996fced3b053727db5c1dc17ffbc9624)

mgr/cephadm: make annotations for schedule.py mandatory

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

 Conflicts:
src/mypy.ini

mgr/cephadm: make annotations for inventory.py mandatory

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

Conflicts:
src/mypy.ini

mgr/cephadm: make annotations for serve.py mandatory

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

Conflicts:
src/mypy.ini

mgr/cephadm: make annotations for upgrade.py mandatory

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

mgr/orchestrator: Remove 'CONTAINER ID' col from orch ps if unknown

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9c241e946a9808b23e5f923ab9283666355883fd)

mgr/cephadm: improve logging during JSONDecodeError

improve logging around JSONDecodeErrors that can occur during a
cephadm image pull, load of the extra_ceph_conf, and parsing the cluster
health status

Fixes: https://tracker.ceph.com/issues/48120
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d4c9d5e680cb17379940a1ceaa038c6224b9b039)

mgr/cephadm: handle JSONDecodeError in OSD service

avoid exceptions when attempting an osd deployment etc.

Fixes: https://tracker.ceph.com/issues/48119
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 46692e26c12ed169a9f3569857a13304d09b41c1)

mgr/cephadm: handle JSONDecodeError in the serve loop

avoid exceptions when attempting to parse invalid JSON output as this
will later cause the cephadm module to fail with a MGR_MODULE_ERROR err

Fixes: https://tracker.ceph.com/issues/48118
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6d759fb5deac0c52b3c738a2e695738228749420)

cephadm: reference the last local image by digest

use the image digest rather than repo/tag combo when inferring the last
used local ceph image

Fixes: https://tracker.ceph.com/issues/48205
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4cf49997c3af7428d2767e72f62f6b875e55c51d)

mgr/cephadm: verify the `host` key exists during refresh

various parts of the host cache might not have a key for the desired
host due to ssh communication issues during host add/remove

Fixes: https://tracker.ceph.com/issues/48223
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 218d00c8ed8e3d1df2f08ce5d89ec9ddd4f07630)

mgr/cephadm: upgrade: fail gracefully, if daemon redeploy fails

Current behaviour kills the `serve()` loop of mgr/cephadm

Fixes: https://tracker.ceph.com/issues/47684
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1ceb6dfb15781569ece627fc53bbd1eb294bf2b7)

mgr/cephadm: OSD service: reduce log noise

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

mgr/cephadm: Get host facts data in host cache

Include cephadm gather-facts information in host cache

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit ab43d6d0c6e696fb365694102e2a26d7ae8cba68)

doc/dev/cephadm: update index links

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit ba485f2472fa0549a8cad8b9be5aad6535c1af33)

doc: Update drivegroup spec examples

The examples currently miss the document separator, so a
copy/paste will result in only a single doc being parsed (the
last one!)

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 92fa97347c41955692031858103ea0728a596152)

mgr/cephadm: add docstring describing the HostCache

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

mgr: Fix various typos

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit d3e09b6e04c6a9990807ac1b6ff340a8004fa8f9)

mgr/orchestrator: Sort 'ceph orch device ls' by host

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit c6e6eb5ef53278b9d0cc0198bc32a441ab8f9a81)

doc/cephadm: document setting custom monitoring templates

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

doc/cepham: instructions for custom Grafana TLS certs

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 344c0a69b34013a92b4224325af1e4e71a9c8564)

rpm: cephadm package is noarch

The cephadm package contains an architecture-independent Python script,
empty directories, and an empty authorized_keys file. There are no
architecture-dependent files here, so we can use a single noarch RPM
across all host architectures.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit d73134660e9a0c5dbda996fc91e2939c4c0bf687)

doc/dev/cephadm: Updates following PR feedback

Minor update adding an idea for future development as
per suggestion from @anthonyeleven

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit df1afd6b127d215cbd6dbd254ff5e8c5090aca78)

doc/dev/cephadm: add link for feature designs

Add a link from the main cephadm page to the index
within /dev/dev/cephadm

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 10f382c359226070a0eceafcc9f74be26cb943b9)

doc/dev/cephadm: Doc defining the design for host maintenance

Initial PR to define/agree the scope and goals of providing
a host maintenance feature.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 8f3ed063a7c7a58d430e0c9a2ac43a7214fe86e4)

mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled

Set a health check warning if debug mode is enabled.

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

mgr/dashboard: Fixing dashboard logs e2e test

Yesterday there were some changes went in which disables the logging of config set and config-key set to to be logged in mgr audit logs. Dashboard has an e2e test which checks for this config set and broke the current e2e jenkins job. This commit removes that certain test to fix the jenkins job.

Fixes: https://tracker.ceph.com/issues/48623
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0b2b172930845dbbec2e458addb5a04b609c6c24)

Merge pull request #38620 from smithfarm/wip-48615-octopus

octopus: Do not add sensitive information in Ceph log files

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

Merge pull request #38477 from ifed01/wip-ifed-fast-rm-p1-oct

octopus: osd: optimize PG removal (part1)

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #38353 from ifed01/wip-ifed-fix-statfs-out-oct

octopus: mgr: don't update osd stat which is already out

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

Merge pull request #38267 from idryomov/wip-relax-preauth-asserts-again-octopus

octopus: msg/async/ProtocolV2: allow rxbuf/txbuf get bigger in testing, again

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

Merge pull request #38165 from rishabh-d-dave/wip-48279-octopus

octopus: qa/mgr: mgr_test_case: raise SkipTest instead of calling skipTest()

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

Merge pull request #38098 from trociny/wip-48243-octopus

octopus: bluestore: fix "end reached" check in collection_list_legacy

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

qa/mgr/test_progress: fix bug 48217

Fixes a failing test case regarding osd coming back
after being marked out. The old test case wasn't accounting
for a specific event, therefore this resulted in the failure.
The fix basically accounts for a specific event of osd being
marked in/out.

Fixes: https://tracker.ceph.com/issues/48217
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 52fe9dbdae87b65a99a6c3bac3519c9528f22ea2)

Conflicts:
qa/tasks/mgr/test_progress.py - trivial fix

mgr/dashboard: The /rgw/status endpoint does not check for running service

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

Merge pull request #38596 from callithea/wip-48551-octopus

octopus: mgr: Fix for dashboard/prometheus failure due to laggy pg state

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>

Merge pull request #38526 from s0nea/wip-48538-octopus

octopus: mgr/dashboard: test_standby* (tasks.mgr.test_dashboard.TestDashboard) failed locally

Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #38508 from rhcs-dashboard/wip-48515-octopus

octopus: mgr/dashboard: Updating the inbuilt ssl providers error

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #38489 from s0nea/wip-47975-octopus

octopus: mgr/dashboard: Add clay plugin support

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #38469 from s0nea/wip-48474-octopus

octopus: mgr/dashboard: assign flags to single OSDs

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #37960 from callithea/wip-47996-octopus

octopus: monitoring: Use null yaxes min for OSD read latency

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users

see also
https://www.boost.org/doc/libs/1_74_0/doc/html/boost_asio/std_executors.html#boost_asio.std_executors.polymorphic_i_o_executor

we could use `asio::any_io_executor` later on though for better
performance.

also, define CMP0093, so FindBoost reports Boost_VERSION in x.y.z
format. it is simpler to use `VERSION_GREATER_EQUAL` to compare its
version with 1.74 instead of its C macro version ("107000").

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

Conflicts:
CMakeLists.txt
src/librbd/CMakeLists.txt: trivial resolutions

Merge pull request #37362 from smithfarm/wip-47085-octopus

octopus: mds: dump granular cap info in mds_sessions

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

Merge pull request #38553 from batrick/i47095

octopus: mds: provide altrenatives to increase the total cephfs subvolume snapshot counts to greater than the current 400 across a Cephfs volume

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

Merge pull request #38551 from batrick/i48372

octopus: client: dump which fs is used by client for multiple-fs

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

Merge pull request #38550 from batrick/i48524

octopus: qa: accept timeout argument in run_shell

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

Merge pull request #38202 from Vicente-Cheng/wip-48111-octopus

octopus: doc: document MDS cache configuration

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

Merge pull request #38095 from kotreshhr/wip-48191-octopus

octopus: mds: throttle cap acquisition via readdir

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

Merge pull request #37989 from Vicente-Cheng/wip-48109-octopus

octopus: cephfs: client: increment file position on _read_sync near eof

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

Merge pull request #37987 from Vicente-Cheng/wip-48098-octopus

octopus: cephfs: osdc: restart read on truncate/discard

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

Merge pull request #37985 from Vicente-Cheng/wip-48096-octopus

octopus: cephfs: mds: move start_files_to_recover() to recovery_done

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

Merge pull request #37690 from smithfarm/wip-47659-octopus

octopus: qa: ignore logrotate state rename error

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

qa: unmount volumes before removal

To avoid potential failures/hangs in umount.

Fixes: https://tracker.ceph.com/issues/23718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4ca8aaafa32bb7397eec80a8eb366d2dd781a72f)

Merge pull request #37794 from ifed01/wip-ifed-fix-alloc-multi-reg-octopus

octopus: bluestore: provide a different name for fallback allocator

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #37860 from smithfarm/wip-47708-octopus

octopus: bluestore: Support flock retry

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

os/bluestore: fix "end reached" check in collection_list_legacy

To preserve the old bluestore behavior it should compare the
current object with the end using bluestore keys, not oids.

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

Merge pull request #38338 from smithfarm/wip-48127-octopus

octopus: rgw: keep syncstopped flag when copying bucket shard headers

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

Merge pull request #37766 from smithfarm/wip-47963-octopus

octopus: cephadm: Revert "spec: Podman (temporarily) requires apparmor-abstractions on suse"

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

mon, messages: use TOPNSPC::common for crimson compatibility

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

Conflicts:
src/messages/MMonCommand.h
- in master, class declaration has "final" qualifier which is missing in octopus
src/messages/MMonCommandAck.h
- in master, class declaration has "final" qualifier which is missing in octopus

Merge pull request #38344 from smithfarm/wip-48341-octopus

octopus: pybind/mgr/rbd_support: delay creation of progress module events

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

Merge pull request #38343 from smithfarm/wip-48225-octopus

octopus: librbd: update hidden global config when removing pool config override

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

Merge pull request #38342 from smithfarm/wip-48086-octopus

octopus: mgr/rbd_support: store global schedule without localized prefix

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