script/build-with-container: Add Rocky 9

Signed-off-by: David Galloway <david.galloway@ibm.com>
(cherry picked from commit 2996390144f7d0a0ea94edcf95ca7b89c6a62013)

script/build-with-container: add a common packages target

Add a `packages` target to build-with-container.py that requests a build
of packages, whatever package type is native to the distro selected.
For example `./src/script/build-with-container.py -d ubuntu22.04 -e
packages` will automatically select a deb packages build where
`./src/script/build-with-container.py -d centos9 -e packages` will
trigger rpm packages to be built. The underlying package-type specific
targets remain unchanged.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 37b7d509c59348ae11badd6673cb49ce9ce303fa)

script/build-with-container: add more distro aliases

Add a system to define distro name aliases and use that to define some
additional aliases, primarily to match ubuntu codenames rather than
version numbers. Requested by Zack.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 65f055f0d8390b9787007433d16cf3a1737584ff)

script/build-with-container: add more distro aliases

Add a system to define distro name aliases and use that to define some
additional aliases, primarily to match ubuntu codenames rather than
version numbers. Requested by Zack.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 65f055f0d8390b9787007433d16cf3a1737584ff)

script/build-with-container: add a common packages target

Add a `packages` target to build-with-container.py that requests a build
of packages, whatever package type is native to the distro selected.
For example `./src/script/build-with-container.py -d ubuntu22.04 -e
packages` will automatically select a deb packages build where
`./src/script/build-with-container.py -d centos9 -e packages` will
trigger rpm packages to be built. The underlying package-type specific
targets remain unchanged.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 37b7d509c59348ae11badd6673cb49ce9ce303fa)

script/build-with-container: add rocky10 to built-in distros

Add "rocky10" (also aliased to "rockylinux10") to the known distro bases
so that the team can begin to experiment with the Rocky Linux 10 distro
for containerized builds.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 33b33ff129011d71dcbe94fe4b2bb790f98301ad)

script/build-with-container: support --build-arg arguments

Allow passing --build-arg arguments to build-with-container.py
which are passed directly to the container build command.
This allows a developer to toggle certain features of the build
container, however this should not be used in CI.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7802a61150af85ef49c666666af753cee5a14451)

buildcontainer-setup.sh: allow testing with various ELish bases

Allow testing with more RPM-based/EL style distros.
Simplify the centos selection as centos8 ought to always
be matched by the earlier block.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7975c52e81bb3062831615be9d0ce94e2b074281)

script/build-with-container: remove unused build arg

Remove the unused build arg for JENKINS_HOME. This was
once used to try and create build images like the CI jobs. However,
the env var is now unconditionally set in the build script and must
be passed (or not) explicitly by the user.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 6f5b23a39eadaa6e1f4df3a882cbb872f497d8fa)

script/build-with-container: add workarounds for older python versions

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 45e0979b60bd4e508fd1e00ac3bfdab5cdcf8a52)

script/buildcontainer-setup: set WITH_CRIMSON to support crimson builds

Set the WITH_CRIMSON env var so that crimson related dependencies are
installed and the build image can build crimson flavored ceph.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 8f6bcce1676f510c27130c35c7464c6a63175fd7)

script/build-with-container: handle failure to find source rpm better

Don't use an obscure assert, raise an exception with a helpful error
message.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7cd048c2ee21935312c3b05c9b128c183b4e6ad8)

script/build-with-container: fix rpm build step when using an overlay

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit acebfed03cacdef8735c37f68fc1f415b934f68a)

script/build-with-container: fix rpmbuild when no rpm build args are set

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit da9fca7a1084a84b94ee34d33e8d0cc5d4772330)

script/build-with-container: cache git branch result

Cache the branch we got from the git command as it is highly unlikely
to change during the script execution and if it does -- we mostly don't
care anyway.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit e562aa086197c2950c9ebb9f8f112e88e1e6e666)

script/build-with-container: detect when cached build images need rebuilding

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 8d0fafa40c1cfe92008b0b8d267253ae5c5ea945)

script/build-with-container: add log line with time taken

Add a log line with time taken to the output of the script, this can
help to see at a glance how long a particular bwc step took.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit e5c05e2bbf63a97f5ef963ed9900da690e89a5f8)

buildcontainer-setup.sh: Fix curl package conflict

It looks like at some point the centos9 image started shipping with
curl-minimal, which conflicts with the regular curl package. Asking dnf to find
the binary avoids this, since both packages provide it. Since we were already
doing this with rpmbuild, we can go ahead and loop wget into that in case
something similar happens there.

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit 8964380cbbf6c64eb8342b55bc7078f5617560b8)

build-with-container.py: Pass distro to make-debs

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit cc21dc48f59f31ace32c671cc964e9aeaf23648c)

build-with-container.py: Pass version to make-debs

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit 9ee29921b7ba744b617e5659a7af4a10cf742de1)

src/script: add seastar deps to ubuntu container image

Add some dependencies that are needed to build with seastar enabled on
ubuntu (22.04). These deps apparently don't get installed via
install-deps.sh - possibly because ubuntu packages never enable
seastar/crimson?

Signed-off-by: John Mulligan <phlogistonjohn@asynchrono.us>
(cherry picked from commit 6acd8f039ee56cfe0ad70d6c80cbcabe25984ac3)

script/build-with-container: fix building on docker

Fix building images on docker by using the `--pull` option instead of
`--pull=always`. The latter apparently only works on podman. The former
should do the same thing on both container engines.

Fixes: https://tracker.ceph.com/issues/70470
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit bc80c5fde5944f04a31d3f9f29db145b05214ab3)

script/buildcontainer-setup: set JENKINS_HOME while building image

Set the JENKINS_HOME environment variable while building the builder
image. This is needed because parts of scripts like run-make.sh and
install-deps.sh key off of this variable. Since we want to be able to
use the build container to build, run "make check" and the like, we want
that environment to be as similar to the jenkins CI environment as we
can make it.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit f026709b1f7e323908eaf8f4582ae1bd1ed7a323)

script/buildcontainer-setup: add dependency for llvm.sh to buildcontainer script

The container environment will need this additional dependency to
execute the llvm.sh installer script.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit a1a98e3e2107b9ffa8897ae40c98562a7a131693)

build-with-container.py: Add --rpmbuild-extra-args

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit fd75679cf4b93d3605a25af7a08e00be9aca48f6)

build-with-container.py: Add --ceph-version

So that we can build from an extracted tarball, as opposed to a git repo.

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit 800f5c2924dfd88292fbd483b881f25d15bbc928)

build-with-container.py: Add --env-file

Signed-off-by: Zack Cerza <zack@cerza.org>
(cherry picked from commit 8e9544fed3dc70ac91f995aacb3aed2edbd45554)

script/build-with-container: add --base-branch cli option

Add a command line option --base-branch that allows the user to supply a
custom base branch name. git doesn't make determining this easy so we
always assume a base branch of 'main' by default - but this option lets
one change that.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit ff34bf7241f1a1072f74494cc8f50156e0076019)

Merge pull request #64752 from stackhpc/doc-fix-mclock-links-squid

squid: doc: Fix links to mClock config reference

Merge pull request #64420 from ljflores/wip-72024-squid

squid: qa/tasks: generalize stuck pg ignorelist entry

Merge pull request #62472 from badone/wip-trackers-50371-67352-67489-69639-squid

squid: Wip trackers 50371 67352 67489 69639 squid

Merge pull request #64759 from zdover23/wip-doc-2025-07-30-backport-64737-to-squid

squid: doc/cephfs: edit ceph-dokan.rst (2 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/cephfs: edit ceph-dokan.rst (2 of x)

Edit the last half of doc/cephfs/ceph-dokan.rst. This is part of a
larger project whose goal is the improvement of the CephFS
documentation.

Follows https://github.com/ceph/ceph/pull/64690.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9dc57f9e2da72c6de92fc0e3bb52ddc8f4a50f65)

Merge pull request #64735 from zdover23/wip-doc-2025-07-29-backport-64690-to-squid

squid: doc/cephfs: edit ceph-dokan.rst (1 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #64665 from rhcs-dashboard/add-nvmrc-in-squid

squid: mgr/dashboard: add .nvmrc so ci can pick the node version

Reviewed-by: Afreen Misbah <afreen@ibm.com>

doc: Fix links to mClock config reference

Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
(cherry picked from commit 0a2d4b096af168b6646e54a1a5772ad8b6a3c8d6)

doc/cephfs: edit ceph-dokan.rst (1 of x)

Edit the first 62 lines of doc/cephfs/ceph-dokan. This is part of a
larger project whose goal is the improvement of the CephFS
documentation.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 803140e92113ee7919b8188ea3677b472d91ac48)

Merge pull request #64589 from idryomov/wip-70917-squid

squid: test/rbd: remove unit tests about cache tiering

Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #64597 from idryomov/wip-cephadm-rbd-iscsi-ignore-mon-down-squid

squid: qa/rbd/iscsi: ignore MON_DOWN warning in logs

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Adam King adking@redhat.com

Merge pull request #64013 from cbodley/wip-71714-squid

squid: deb: use glob match to support systemd unit dir changes

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

Merge pull request #63725 from cbodley/wip-71565-squid

squid: debian: radosgw: add media-types packages as alternative for mime-support

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #63764 from zdover23/wip-doc-2025-06-06-backport-63085-to-squid

squid: doc/src/common/options: mgr.yaml.in edit

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

Merge pull request #64552 from ceph/squid-release

v19.2.3

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #64455 from ronen-fr/wip-rf-noempty-64429-squid

squid: qa/standalone/scrub: fix "scrubbed in 0ms" in osd-scrub-test.sh

Reviewed-by: Laura Flores <lflores@redhat.com>

doc/src/common/options: mgr.yaml.in edit

Improve the "desc" field under the "mgr_data" entry in
src/common/options/mgr.yaml.in.

This is a test to determine whether the Jenkins tests can be passed.
This test is made after the mystifying failure of
https://github.com/ceph/ceph/pull/62983.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 30411f3f97c82b8f0bfae6802e1b5c1b83036d77)

Merge pull request #60177 from joscollin/wip-68414-squid

squid: cephfs_mirror: 'ceph fs snapshot mirror ls' command

Merge pull request #64336 from joscollin/wip-71950-squid

squid: qa: fix multi-fs tests in test_mds_metrics.py

Merge pull request #64449 from joscollin/wip-72084-squid

squid: qa: increase the wait time to prevent check_counter failing

mgr/dashboard: add .nvmrc so ci can pick the node version

already delivered in main and tentacle but missing in other branches

Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #64644 from zdover23/wip-doc-2025-07-23-backport-64640-to-squid

squid: doc/cephfs: edit disaster-recovery.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #64647 from zdover23/wip-doc-2025-07-23-backport-64639-to-squid

squid: doc/radosgw: edit config-ref.rst

doc/radosgw: edit config-ref.rst

Follow up on the suggestions made by Anthony D'Atri in
https://github.com/ceph/ceph/pull/64532.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 18e9b08393cac7ed8fdb1c65021f74deba3dc44c)

doc/cephfs: edit disaster-recovery.rst

Follow up on the suggestions made by Anthony D'Atri in
https://github.com/ceph/ceph/pull/64604.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 37df8e43baa1e75587686fd661310dfb4ad30312)

Merge pull request #64608 from zdover23/wip-doc-2025-07-21-backport-64604-to-squid

squid: doc/cephfs: edit disaster-recovery.rst

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

Merge pull request #64399 from zdover23/wip-doc-2025-07-09-backport-64162-to-squid

squid: doc: do not depend on typed-ast

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

Merge pull request #64266 from zdover23/wip-doc-2025-06-30-backport-62785-to-squid

squid: pybind/mgr: Fix missing empty lines in mgr_module.py

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

Merge pull request #64613 from rhcs-dashboard/sys-packages-dashboard-squid

squid: mgr/dashboard: use system packages when running tox

Reviewed-by: Afreen Misbah <afreen@ibm.com>

mgr/dashboard: catch protobuf error due to mismatch in version

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit acb0f19c4a50b2ea68f328a61a14a2da06be298b)

 Conflicts:
src/pybind/mgr/dashboard/services/nvmeof_client.py
 - only kept relavant portion applicable for squid

mgr/dashboard: unpin grpcio deps

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

 Conflicts:
src/pybind/mgr/dashboard/requirements.txt
 - only unpin the grpc

mgr/dashboard: sitepackages only for py3

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 6985ed15ce20c24f7fa87c23ac65b28cf544c9b7)

Revert "mgr/dashboard: pin lxml to fix run-dashboard-tox-make-check failure"

This reverts commit 1f84505f1232dd8445df1a2a819fa000062d3934.

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 8e6b6cdd5c302577c81aa041ef4b3f494ed717a7)

 Conflicts:
src/pybind/mgr/dashboard/requirements.txt
 - only removed the lxml dep

mgr/dashboard: disable saml2 tests when the dep is not there

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 8acf8f7e4fe6d283212154857abd97b6e641de4d)

 Conflicts:
src/pybind/mgr/dashboard/controllers/saml2.py
 - kept the config changes as is on squid
src/pybind/mgr/dashboard/tox.ini
 - kept the file as it is

mgr/dashboard: use system packages when running tox

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

pybind/mgr: Hack around the 'ImportError: PyO3 modules may only be initialized once per interpreter process' issue.

Fixes: https://tracker.ceph.com/issues/64213
Signed-off-by: Paulo E. Castro <pecastro@wormholenet.com>
(cherry picked from commit 5b2aa8f8c61d7c2a56e1480c479801079a1ff822)

doc/cephfs: edit disaster-recovery.rst

Edit the section "Data Pool Damage" in doc/cephfs/disaster-recovery.rst.
This commit is part of the project of improving the data-recovery parts
of the CephFS documentation, as requested in the Ceph Power Users
Feedback Summary in mid-2025.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 891e9cf2492ad250936171e9b510e8df4996faf9)

qa/rbd/iscsi: ignore MON_DOWN warning in logs

These seem to be popping up very briefly and don't
appear to be relevant to what is being tested

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

test: remove unit tests about cache tiering

Cache tiering was deprecated in the Reef release,
so we are no longer supporting any issues related
to it.

Ref: https://docs.ceph.com/en/latest/rados/operations/cache-tiering/

Fixes: https://tracker.ceph.com/issues/70917
Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit b6dd408c87b384ce88b097f706f324e50fc61ace)

Merge pull request #59443 from kamoltat/wip-67720-squid

squid: src/pybind/mgr/pg_autoscaler/module.py: fix 'pg_autoscale_mode' output

Merge pull request #62924 from kamoltat/wip-71028-squid

squid: mon: Track and process pending pings after election

Merge pull request #63024 from kamoltat/wip-71091-squid

squid: HealthMonitor: Add topology-aware netsplit detection and warning

Merge pull request #63804 from badone/wip-tracker-70645-mon_memory_target-fix-squid

Squid: OSDMonitor: Make sure pcm is initialised

Merge pull request #64547 from zdover23/wip-doc-2025-07-17-backport-64532-to-squid

squid: doc/radosgw: edit "Lifecycle Settings"

doc/radosgw: edit "Lifecycle Settings"

Edit the section "Lifecycle Settings" in the file
doc/radosgw/config-ref.rst. Remove solecisms and pleonasms and plain old
infelicitious formulations.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit ac2e5f502523d1bf326303e904ccb47236c81fcb)

19.2.3

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>

test/libcephfs: copy DT_NEEDED entries from input libraries

On Ubuntu 22.04, the linker is not stumbling thinking the libceph-common
library is missing on the command-line. This appears to be a bug and the only
workaround I've found is to copy the DT_NEEDED entries for the input shared
objects (which is traditional linker behavior). I don't have an explanation for
why this occurs only for a few test executables.

Fixes: https://tracker.ceph.com/issues/70498
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit c6ac71d398c16afa4aa888feaf7087bf61038bf0)
(cherry picked from commit b1068d1f751023f39b6453604f6efec9d8851c2f)

test/fs: only add libcephfs as library dependency

ceph-common is implied.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 600584f749ef262b858f599c82f16c7d58c8adcb)
(cherry picked from commit 08e97895769c7722f61167fd459f0bf6547ed890)

test/client: do not depend on libcephfs

This is a client test -- no libcephfs.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 9d22425c55a57a8e9035450ad36d82de0616266e)
(cherry picked from commit 808f53885e21c3a81415248647cdb215580c3557)

Merge pull request #64530 from zdover23/wip-doc-2025-07-16-backport-64433-to-squid

squid: doc: update mgr modules notify_types

Merge pull request #63809 from zdover23/wip-doc-2025-06-09-backport-63781-to-squid

squid: doc/mgr: edit telemetry.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc: update mgr modules notify_types

Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit fc4396d6280fcbf0a95567cff144052d81dcd964)

Merge pull request #64496 from zdover23/wip-doc-2025-07-15-backport-63877-to-squid

squid: doc/rados/ops: edit cache-tiering.rst

doc/rados/ops: edit cache-tiering.rst

Add material to doc/rados/operations/cache-tiering.rst, as suggested by
Anthony D'Atri in
https://github.com/ceph/ceph/pull/63745#discussion_r2127887785.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d3c46820a5fc72391ef46ab4b03bbe867e0e51d2)

Merge pull request #64357 from mkogan1/wip-71957-squid

squid: rgw: allow specifying ssl certificate for radosgw-admin operations

Merge pull request #64202 from ideepika/wip-71152-squid

squid: rgw: make keystone work without admin token(service ac requirement)

Merge pull request #64492 from zdover23/wip-doc-2025-07-15-backport-64483-to-squid

squid: doc: add note admonitions in two files

doc: add note admonitions in two files

Add note admonitions when discussing client package support in the
context of OS Recommendations in the following two files:

- doc/cephfs/ceph-dokan.rst
- doc/rbd/rbd-windows.rst

This addresses a change requested by Ilya Dryomov in
https://github.com/ceph/ceph/pull/64374#discussion_r2199756581.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 69d641f0207d803cd9a3c3e102d5b2073e6b0f77)

Merge pull request #64313 from ivancich/wip-69408-squid

squid: rgw: fix empty storage class on display of multipart uploads

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

Merge pull request #64481 from zdover23/wip-doc-2025-07-15-backport-64374-to-squid

squid: doc: Clarify the status of MS Windows client support

doc: Clarify the status of MS Windows client support

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 89eabfc3f0c8db3501b3ea3097e2983617c5234a)

Merge pull request #64472 from zdover23/wip-doc-2025-07-14-backport-64462-to-squid

squid: doc/cephfs: Improve mount-using-fuse.rst

Merge pull request #64475 from zdover23/wip-doc-2025-07-14-backport-63080-to-squid

squid: doc/radosgw: Improve rgw-cache.rst

doc/radosgw: Improve rgw-cache.rst

Try to improve the language by completely rewriting some sentences.
Attempt to format the document more like the rest of the docs.
Fix several errors in punctuation, capitalization, spaces etc.
Use blocks with bash prompts for CLI commands instead of hardcoded
prompts.
Fix section hierarchy and section title underline lengths.
Use admonition.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit 6e836f8f1e1e53bc7f8d8b497960b100e6b625d6)

doc/cephfs: Improve mount-using-fuse.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 329ee7b3038e49cf0def2f2628444e3e90796c05)

Merge pull request #64387 from cbodley/wip-72026-squid

squid: rgw: don't use merge_and_store_attrs() when recreating a bucket

Merge pull request #64269 from zdover23/wip-doc-2025-06-30-backport-64164-to-squid

squid: mgr/dashboard: Fix inline markup warning in API documentation

Reviewed-by: Afreen Misbah <afreen@ibm.com>

qa/standalone/scrub: fix "scrubbed in 0ms" in osd-scrub-test.sh

The specific test looks for a 'last scrub duration' higher than
0 as a sign that the scrub actually ran.  Previous code fixes
guaranteed that even a scrub duration as low as 1ms would be
reported as "1" (1s).  However, none of the 15 objects created
in this test were designated for the tested PG, which remained
empty.  As a result, the scrub duration was reported as "0".

The fix is to create a large enough number of objects so that
at least one of them is mapped to the tested PG.

Fixes: https://tracker.ceph.com/issues/71801
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit b303afed7a8b2a65043f56170ed478f8d2bc591a)

qa: increase the wait time to prevent check_counter failing

Fixes: https://tracker.ceph.com/issues/70441
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit a86f6a6ce89ff20f2f160464abb7500499db76b3)

qa/tasks: generalize stuck pg ignorelist entry

Fixes: https://tracker.ceph.com/issues/70307
Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit 26fdfbb9171664f69038b1fda26f4a225d7e52f8)

Merge pull request #64086 from adk3798/wip-69514-squid

squid: mgr/cephadm: mgr orchestrator module raise exception if there is trailing tab in yaml file

Reviewed-by: Redouane Kachach <rkachach@ibm.com>

Merge pull request #59829 from joscollin/wip-68108-squid

squid: qa: multiple fixes in test_mirroring.py

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