Merge pull request #51431 from chrisphoffman/wip-59710-pacific

pacific: librbd: localize snap_remove op for mirror snapshots

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

librbd: localize snap_remove op for mirror snapshots

A client may attempt a lock request not quickly enough to
obtain exclusive lock for operations when another competing
client responds quicker. This can happen when a peer site has
different performance characteristics or latency. Instead of
relying on this unpredictable behavior, localize operation to
primary cluster.

Fixes: https://tracker.ceph.com/issues/59393
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit ac552c9b4d65198db8038d397a3060d5a030917d)

Conflicts:
src/cls/rbd/cls_rbd.cc [ commit 3a93b40 ("librbd:
  s/boost::variant/std::variant/") not in pacific ]
src/librbd/mirror/snapshot/UnlinkPeerRequest.cc [ ditto ]

Merge pull request #51856 from petrutlucian94/wip-61525-pacific

pacific: librbd: avoid decrementing iterator before first element

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

Merge pull request #51778 from idryomov/wip-61368-pacific

pacific: tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Reviewed-by: Christopher Hoffman <choffman@redhat.com>

Merge pull request #51429 from chrisphoffman/wip-59506-pacific

pacific: librbd: remove previous incomplete primary snapshot after successfully creating a new one

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

Merge pull request #51882 from adk3798/pacific-no-log-to-journald

pacific: doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"

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

doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"

This reverts commit bdb2241ca5a9758e8c52d47320d8b5ea0766aea9.

This commit https://github.com/ceph/ceph/commit/bdb2241ca5a9758e8c52d47320d8b5ea0766aea9
was updating on logging changes in quincy, but seems to have been
erroneously included in a pacific batch backport https://github.com/ceph/ceph/pull/42736

This stuff doesn't work in pacific. For example,

[ceph: root@vm-00 /]# ceph version
ceph version 16.2.13-257-gd8c5d349 (d8c5d34975dce1c5eb0aa3a7979a4d9b9a99d1ec) pacific (stable)
[ceph: root@vm-00 /]# ceph config set global log_to_journald false
Error EINVAL: unrecognized config option 'log_to_journald'

so we shouldn't have it in the pacific docs

Signed-off-by: Adam King <adking@redhat.com>

librbd: avoid decrementing iterator before first element

While trying to merge delayed requests, SimpleSchedulerObjectDispatch
can end up iterating before the first element.

With llvm, this leads to a crash:
https://paste.opendev.org/raw/bxnQqqDtIrkOfVvRfkZ6/

This change adds a check, ensuring that we won't decrement the iterator
before the first map element.

Fixes: https://tracker.ceph.com/issues/61503
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit ca65e85575f7b35ce679309e92e0c9bee8d6b96a)

Merge pull request #51826 from zdover23/wip-doc-2023-05-30-backport-51798-to-pacific

pacific: doc/rados: edit balancer.rst

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

doc/rados: edit balancer.rst

Edit doc/rados/operations/balancer.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d3660aa20d737729dac708264ceed37560362f91)

Merge pull request #51795 from zdover23/wip-doc-2023-05-28-backport-51587-to-pacific-second-attempt

doc/rados: edit bluestore-config-ref.rst (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/rados: edit bluestore-config-ref.rst (2 of x)

Edit the second part of doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthoy D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1ceeab30ebde767aaf675fe46e79b9b7d28b881a)

Merge pull request #51791 from zdover23/wip-doc-2023-05-27-backport-51771-to-pacific

pacific: doc/rados: edit bluestore-config-ref.rst (1 of x)

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

doc/rados: edit bluestore-config-ref.rst (1 of x)

Edit the first part of doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Confval directives have been removed from this backport, because they do
not build in the Pacific release branch.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 3879e4ad417dddef1247521c199925a679d490ac)

Merge pull request #51647 from adk3798/pacific-prom-ret-size

pacific: mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option

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

tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Signed-off-by: Chen Yuanrun <chen-yuanrun@foxmail.com>
Fixes: https://tracker.ceph.com/issues/61368
(cherry picked from commit e10bcb6905b7e4da4b3a04307d3a2b546da6d5b1)

mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option
fixes: https://tracker.ceph.com/issues/57422

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 4da92c59597dcbf0bba4be50db73233e34108ca9)

Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py

Merge pull request #51517 from adk3798/pacific-custom-config

pacific: mgr/cephadm: support for miscellaneous config files for daemons

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

Merge pull request #51757 from zdover23/wip-doc-2023-05-25-backport-51754-to-pacific

pacific: doc/rados: fix link in common.rst

doc/rados: fix link in common.rst

Fix a link in doc/rados/configuration/common.rst that was missing its
final letter, causing a 404 error when readers attempted to follow it.

This bug was reported by stalwart friend of the Ceph documentation
project Eugen Block, who is here credited as a co-author. This bug was
reported at https://pad.ceph.com/p/Report_Documentation_Bugs.

Co-authored-by: Eugen Block <eblock@nde.ag>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8128ce20fef3d75c6251691d10af21861c01e155)

Merge pull request #51753 from zdover23/wip-doc-2023-05-25-backport-51745-to-pacific

pacific: doc/rados: edit filestore-config-ref.rst

doc/rados: edit filestore-config-ref.rst

Edit doc/rados/configuration/filestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

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

Merge pull request #51075 from aaSharma14/wip-59446-pacific

pacific: mgr/dashboard: Fix rbd snapshot creation

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

Merge pull request #51113 from rhcs-dashboard/wip-59460-pacific

pacific: mgr/dashboard: expose more grafana configs in service form

Reviewed-by: Pegonzal <NOT@FOUND>

Merge pull request #51741 from zdover23/wip-doc-2023-05-25-backport-50858-to-pacific

pacific: doc/rados/operations: Acting Set question

Merge pull request #51744 from zdover23/wip-doc-2023-05-25-backport-51730-to-pacific

pacific: doc/rados/operations: Fix erasure-code-jerasure.rst fix

doc/rados/operations: Fix erasure-code-jerasure.rst fix

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

doc/rados/operations: Acting Set question

Clear up a paragraph that describes the behavior of the Acting Set.

https://tracker.ceph.com/issues/58485

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

Merge pull request #51433 from Svelar/wip-59687-pacific

pacific: cephadm: eliminate duplication of sections

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

Merge pull request #51346 from mgfritch/wip-59649-pacific

pacific: mgr/cephadm: don't try to write client/os tuning profiles to known offline hosts

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

Merge pull request #51727 from zdover23/wip-doc-2023-05-24-backport-51273-to-pacific

pacific: doc: Update jerasure.org references

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

doc: Update jerasure.org references

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

Merge pull request #51722 from zdover23/wip-doc-2023-05-24-backport-51679-to-pacific

pacific: doc/mgr: edit "leaderboard" in telemetry.rst

doc/mgr: edit "leaderboard" in telemetry.rst

Standardize the presentation of commands in the "Leaderboard" section of
doc/mgr/telemetry.rst.

Follow-up to https://github.com/ceph/ceph/pull/50977

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

Merge pull request #51261 from k0ste/wip-53166-pacific

pacific: ceph_test_rados_api_watch_notify: extend Watch3Timeout test

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

Merge pull request #51330 from trociny/wip-59616-pacific

pacific: rgw/rados: check_quota() uses real bucket owner

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

Merge pull request #51266 from mkogan1/wip-58332-pacific

pacific: rgw: under fips & openssl 3.x allow md5 usage in select rgw ops

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

Merge pull request #50560 from ljflores/wip-59091-pacific

pacific: rgw: LDAP fix resource leak with wrong credentials

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

Merge pull request #48928 from yuvalif/wip-58036-pacific

pacific: tests: remove pubsub tests from multisite

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

Merge pull request #51341 from NitzanMordhai/wip-59628-pacific

pacific: src/valgrind.supp: Adding know leaks unrelated to ceph

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

Merge pull request #51258 from k0ste/wip-56604-pacific

pacific: Monitor: forward report command to leader

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

Merge pull request #51324 from rhcs-dashboard/wip-59622-pacific

pacific: mgr/dashboard: fix the rbd mirroring configure check

Reviewed-by: cloudbehl <NOT@FOUND>

Merge pull request #51695 from zdover23/wip-doc-2023-05-23-backport-51682-to-pacific

pacific: doc/glossary: update bluestore entry

doc/glossary: update bluestore entry

Update the BlueStore entry in the glossary, explaining that as of Reef
BlueStore and only BlueStore (and not FileStore) is the storage backend
for Ceph.

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

Merge pull request #51654 from zdover23/wip-doc-2023-05-22-backport-51319-to-pacific

pacific: doc: deprecate the cache tiering

doc: deprecate the cache tiering

This topic has been discussed many times; recently at the Dev
Summit of Cephalocon 2023.

This commit is the minial version of the work, contained entirely
within the `doc`. However, likely it will be expanded as there
were ideas like e.g. adding cache tiering back experimental feature
list (Sam) to warn users when deploying a new cluster.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 535b8db33ea03fbab7ef0c4df5251658f956b0c5)

Merge pull request #51621 from zdover23/wip-doc-2023-05-21-backport-51618-to-pacific

pacific: doc: Add missing `ceph` command in documentation section `REPLACING A…

doc: Add missing `ceph` command in documentation section `REPLACING AN OSD`

Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
(cherry picked from commit 0557d5e465556adba6d25db62a40ba55a5dd2400)

doc/cephadm: custom config files documentation

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

Conflicts:
doc/cephadm/services/index.rst

mgr/cephadm: unit testing for custom config files

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

Conflicts:
src/pybind/mgr/cephadm/tests/test_cephadm.py

Merge pull request #51597 from zdover23/wip-doc-2023-05-20-backport-51594-to-pacific

pacific: doc/rados: edit data-placement.rst

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

doc/rados: edit data-placement.rst

Edit doc/rados/data-placement.rst.

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 32600c27c4dca6b9d5fae9892c0a1660b672781c)

Merge pull request #51587 from zdover23/wip-doc-2023-05-19-backport-51580-to-pacific

pacific: doc/radosgw: explain multisite dynamic sharding

doc/radosgw: explain multisite dynamic sharding

Add a note to doc/radosgw/dynamicresharding.rst and a note to
doc/radosgw/multisite.rst that explains that dynamic resharding is not
supported in releases prior to Reef.

This commit is made in response to a request from Mathias Chapelain.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d4ed4223d914328361528990f89f1ee4acd30e79)

Merge pull request #49688 from joscollin/wip-58408-pacific

pacific: doc: document the relevance of mds_namespace mount option

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

Merge pull request #51245 from k0ste/wip-53566-pacific

pacific: mgr/dashboard: API docs UI does not work with Angular dev server

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

Merge pull request #51578 from zdover23/wip-doc-2023-05-19-backport-51572-to-pacific

pacific: doc/rados: line-edit devices.rst

doc/rados: line-edit devices.rst

Edit doc/rados/operations/devices.rst.

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8d589b43d76a4e291c96c3750d068dba18eb9309)

Merge pull request #51491 from zdover23/wip-doc-2023-05-16-backport-51485-to-pacific

pacific: doc/start/os-recommendations: drop 4.14 kernel and reword guidance

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

Merge pull request #50988 from lxbsz/wip-59268

pacific: client: clear the suid/sgid in fallocate path

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50986 from lxbsz/wip-59386

pacific: mds: wait for unlink operation to finish

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50811 from vshankar/tr-59023

pacific: mds: record and dump last tid for trimming completed requests (or flushes)

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50809 from dparmar18/wip-59252-pacific

pacific: mgr/nfs: disallow non-existent paths when creating export

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50773 from batrick/i57597

pacific: qa: data-scan/journal-tool do not output debugging in upstream testing

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50765 from batrick/i57825

pacific: qa: mirror tests should cleanup fs during unwind

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #51544 from zdover23/wip-doc-2023-05-18-backport-51534-to-pacific

pacific: doc/cephfs: line-edit "Mirroring Module"

doc/cephfs: line-edit "Mirroring Module"

Line-edit the "Mirroring Module" section of
doc/cephfs/cephfs-mirroring.rst. Add prompts and formatting where such
things contribute to the realization of adequate sentences.

This commit is a follow-up to https://github.com/ceph/ceph/pull/51505.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit dd8855d9a934bcdd6a026f1308ba7410b1e143e3)

Merge pull request #50756 from batrick/i52677

pacific: qa: test_simple failure

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #51522 from zdover23/wip-doc-2023-05-17-backport-51505-to-pacific

pacific: doc: explain cephfs mirroring `peer_add` step in detail

doc: explain cephfs mirroring `peer_add` step in detail

@zdover23 reached out regarding missing explanation for `peer_add`
step in cephfs mirroring documentation. Add some explanation and
and example to make the step clear.

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

Merge pull request #51504 from zdover23/wip-doc-2023-05-16-backport-51492-to-pacific

pacific: doc/start: KRBD feature flag support note

mgr/cephadm: allow mounting custom conf files

Fixes: https://tracker.ceph.com/issues/56394
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit de43dab44012fc239e4c8c09be264bf5a5a7981c)

Conflicts:
src/cephadm/cephadm
src/pybind/mgr/cephadm/services/cephadmservice.py

src/python_common: Add CustomConfig class

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

Conflicts:
src/python-common/ceph/deployment/drive_group.py
src/python-common/ceph/deployment/service_spec.py

Merge pull request #49263 from ifed01/wip-ifed-fix-read-error-code-pac

pacific: blk/kernel: Fix error code mapping in KernelDevice::read.

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

Merge pull request #50637 from ifed01/wip-ifed-bound-rm-range-keys-pac

pacific: kv/RocksDBStore: cumulative backport for rm_range_keys and around

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

Merge pull request #50496 from ifed01/wip-ifed-fix-prefixed-kv-iterator-pac

pacific: kv/RocksDBStore: don't use real wholespace iterator for prefixed access

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

Merge pull request #50322 from ifed01/wip-ifed-57271-pac

pacific: blk/KernelDevice: Modify the rotational and discard check log message

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

Merge pull request #50932 from ifed01/wip-ifed-fix-spillover-alert-pac

pacific: os/bluestore: fix spillover alert

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

Merge pull request #50506 from ifed01/wip-ifed-report-min-alloc-size-pac

pacific: os/bluestore: report min_alloc_size through "ceph osd metadata"

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

doc/start: KRBD feature flag support note

Add KRBD feature flag support note to doc/start/os-recommendations.rst.

This change was suggested by Anthony D'Atri in https://github.com/ceph/ceph/pull/51485.

Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 2a619dba2d22749e6facaf8dd0d370e16a1672c4)

Merge pull request #51479 from zdover23/wip-doc-2023-05-15-backport-51473-to-pacific

pacific: doc/rados: edit devices.rst

doc/start/os-recommendations: drop 4.14 kernel and reword guidance

The 4.14 LTS kernel has less than a year left in terms of maintenance,
drop it.

Also, the current wording with an explicit list of kernels tends to go
stale: it's missing the latest 6.1 LTS kernel.

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

Merge pull request #50733 from lxbsz/wip-58881

pacific: mds: make num_fwd and num_retry to __u32

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50725 from lxbsz/wip-59007

pacific: mds: force replay sessionmap version

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50715 from joscollin/wip-58807-pacific

pacific: cephfs-top: dump values to stdout and -d [--delay] option fix

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50596 from neesingh-rh/wip-58866-pacific

pacific: cephfs-top: Some fixes in `choose_field()` for sorting

Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #50523 from trociny/wip-59019-pacific

pacific: tools/cephfs-data-scan: support for multi-datapool

Reviewed-by: Kotresh HR <khiremat@redhat.com>

doc/rados: edit devices.rst

Line-edit doc/rados/operations/devices.rst.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Co-authored-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8321b457a25a4394439f908c500091ce30e0736a)

Merge pull request #51471 from zdover23/wip-doc-2023-05-14-backport-51175-to-pacific

pacific: doc: add link to "documenting ceph" to index.rst

doc: add link to "documenting ceph" to index.rst

Add a link to the landing page of docs.ceph.com to direct documentation
contributors to documentation-related information.

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

Merge pull request #51467 from zdover23/wip-doc-2023-05-13-backport-51463-to-pacific

pacific: doc/cephfs: edit fs-volumes.rst (1 of x)

doc/cephfs: edit fs-volumes.rst (1 of x)

Edit the syntax of the English language in the file
doc/cephfs/fs-volumes.rst up to (but not including) the section called
"FS Subvolumes".

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

Merge pull request #51460 from zdover23/wip-doc-2023-05-12-backport-51458-to-pacific

pacific: doc/cephfs: rectify prompts in fs-volumes.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/cephfs: rectify prompts in fs-volumes.rst

Make sure all prompts are unselectable. This PR is meant to be
backported to Reef, Quincy, and Pacific, to get all of the prompts into
a fit state so that a line-edit can be performed on the Englsh language
in this file.

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

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

Merge pull request #51436 from zdover23/wip-doc-2023-05-11-backport-51427-to-pacific

pacific: doc/cephfs: fix prompts in fs-volumes.rst

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

doc/cephfs: fix prompts in fs-volumes.rst

Fixed a regression introduced in
e5355e3d66e1438d51de6b57eae79fab47cd0184 that broke the unselectable
prompts in the RST.

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

test_cephadm: fix conf format

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>

test_cephadm: fix conf format

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>

cephadm: eliminate duplication of sections

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>

librbd: always refresh after creating snapshot in CreatePrimaryRequest

Up until now this was conditioned on whether the caller expressed
interest in the ID of the created snapshot and happened to work only
because CreatePrimaryRequest wasn't actually consulting any mirror
snapshot metadata.  This has just changed with unlink_peer() needing to
see an up-to-date complete flag which is set in SetImageStateRequest
following the write out of image state object(s).

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