Merge pull request #50728 from lxbsz/wip-59195

qa: switch to use the merge fragment for fscrypt

Merge pull request #51972 from vedanshbhartia/coverity_resource_leak

rgw: Add coverity annotations for resource leak false positives

Merge pull request #51864 from yuvalif/wip-yuval-fix-61540

rgw/kafka: make sure that destroy is called after connection is removed

Merge pull request #51994 from zdover23/wip-doc-2023-06-11-rados-operations-placement-groups-3-of-x

doc/rados: edit placement-groups.rst (3 of x)

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

doc/rados: edit placement-groups.rst (3 of x)

Edit doc/rados/operations/placement-groups.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>

Merge pull request #51366 from SMIL-Infra/fix-test-build

rgw: fix tests build w/o AMQP

Merge pull request #51468 from vedanshbhartia/coverity_time

rgw: Add coverity annotations to ignore warnings about 32 bit time

Merge pull request #51992 from zdover23/wip-doc-2023-06-10-rados-operations-change-mon-elections

doc/rados: edit change-mon-elections

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

Merge pull request #51991 from zdover23/wip-doc-2023-06-09-rados-operations-placement-groups-2-of-x

doc/rados: edit placement-groups.rst (2 of x)

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

doc/rados: edit placement-groups.rst (2 of x)

Edit doc/rados/operations/placement-groups.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>

doc/rados: edit change-mon-elections

Edit doc/rados/operations/change-mon-elections.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>

Merge pull request #51988 from ljflores/wip-release-checklist

doc/dev: update release checklist

Merge pull request #49316 from BryceCao/wip-add-initialization-for-RGWGC-process-call

rgw : fix add initialization for RGWGC::process()

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

Merge pull request #51715 from awojno-bloomberg/replication-race-condition-fix

RGW: Pass and check destination zone trace when fetching object

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

doc/dev: update release checklist

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

Merge pull request #51975 from zdover23/wip-doc-2023-06-09-rados-operations-placement-groups-1-of-x

doc/rados: edit placement-groups.rst (1 of x)

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

doc/rados: edit placement-groups.rst (1 of x)

Edit doc/rados/operations/placement-groups.rst.

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

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>

Merge pull request #48879 from samarahu/wip-d4n

RGW: WIP D4N

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #51967 from Dazul/add-config-missing-custom-container-images

doc: Add missing custom container_image

Merge pull request #51958 from zdover23/wip-doc-2023-06-07-rados-operations-pools-4-of-x

doc/rados: edit pools.rst (4 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

Merge pull request #51955 from rhcs-dashboard/teuth-e2e-fix

qa/workunits: fix test_dashboard_e2e.sh: no spec files found

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #51911 from ronen-fr/wip-rf-recovery-updates

qa/standalone: osd-recovery-scrub: fix slow updates and recovery concurrency

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>

doc: Add missing custom container_image

While testing cephadm in order to migrate to it in the near
futur, I needed to use some custom images for haproxy
and keepalived. I needed to see into the code to see what
existed. So I put what I found on the code into documentation.

Signed-off-by: Luis Domingues <domingues.luis@protonmail.ch>

Merge pull request #51948 from xxhdx1985126/wip-61608

crimson/os/seastore/cached_extent: add prepare_commit interface

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Myoungwon Oh <myoungwon.oh@samsung.com>

Merge pull request #51917 from sseshasa/wip-mclock-cost-fix-relnotes

PendingReleaseNotes: Document mClock scheduler fixes and enhancements

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

rgw: Add coverity annotations for resource leak false positives

Signed-off-by: Vedansh Bhartia <vedanshbhartia@gmail.com>

Merge pull request #51892 from rzarzynski/wip-bug-61547

mon: fix timestamp formatting in cluster log

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

doc/rados: edit pools.rst (4 of x)

Edit doc/operations/rados/pools.rst.

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

Co-authored-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #51930 from zdover23/wip-doc-2023-06-06-rados-operations-pools-3-of-x

doc/rados: edit pools.rst (3 of x)

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

Merge pull request #46062 from markhpc/wip-crimson-tcmalloc

crimson: Enable tcmalloc when using seastar

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

qa/workunits: fix test_dashboard_e2e.sh: no spec files found

Fixes: https://tracker.ceph.com/issues/61578
Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #50054 from rhcs-dashboard/cache-invalidation

mgr/dashboard: RBD cache invalidation

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

PendingReleaseNotes: Document mClock scheduler fixes and enhancements

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>

crimson/os/seastore/cached_extent: add prepare_commit interface

move new fixedkv-btree nodes' inter-node pointer adjustments into
the prepare_commit interface

Fixes: https://tracker.ceph.com/issues/61608
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #51927 from ljflores/wip-rook-tests

qa/suites/rados: remove rook coverage from the rados suite

QA: Add D4N teuthology suite

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

Merge pull request #51943 from dvanders/update-contact-dan

Update affiliation for Dan van der Ster

Merge pull request #51925 from ljflores/wip-tracker-59192

qa/suites/rados: whitelist POOL_APP_NOT_ENABLED for cls tests

Update affiliation for Dan van der Ster

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Signed-off-by: Dan van der Ster <dan.vanderster@clyso.com>

crimson: Enable tcmalloc when using seastar

classic-osds have always caused significant memory fragmentation
when using the libc memory allocator due to the way that Ceph
tends to utilize memory.  In recent testing, crimson-osd was found
to use 25-27GB of RAM with the stock 3GB bluestore cache settings
(osd_memory_target is only used when tcmalloc is available).  Upon
further testing, it was found that the classic OSD is even worse,
using between 32-33GB of RAM after a 5 minute 4K sequential
write test when using libc malloc.

The good news is that it appears that crimson-osd is able to use
tcmalloc for alienstore without significant modification. Better
still, it drastically reduces memory usage.  In the same test that
resulted in 25GB RSS memory usage for crimson-osd with libc malloc,
a tcmalloc linked version took around 9GB (with an 8GB
osd_memory_target).  Since we do not yet (afaik) expose classic OSD
debugging in crimson it is tough to tell why we are still a little
over, but it's clear that for alienstore we are going to need to
use tcmalloc as we do in classic.

Signed-off-by: Mark Nelson <mnelson@redhat.com>

Revert "[CHERRY-PICKED FOR TESTING ONLY] crimson: Enable tcmalloc when using seastar"

This reverts commit 380bc6d2e4ec62e724612dbac57ffdbd82511f9d.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #51875 from Matan-B/wip-matanb-crimson-supress-tcmalloc

crimson/osd/lsan_suppressions.cc: Add MallocExtension::Initialize()

Reviewed-by: Samuel Just <sjust@redhat.com>

doc/rados: edit pools.rst (3 of x)

Edit doc/operations/rados/pools.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>

Merge pull request #51914 from zdover23/wip-doc-2023-06-05-rados-operations-pools-2-of-x

doc/rados: edit pools.rst (2 of x)

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

Merge pull request #51932 from stackhpc/typo-fix

doc/rados/operations: fix typo in balancer.rst

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

doc/rados: edit pools.rst (2 of x)

Edit doc/operations/rados/pools.rst.

There remains confusion in this part of the document regarding pg_num
and pgp_num. pg_num and pgp_num are not explained with sufficient
clarity. A future commit will clear up this confusion. There is also
some potential confusion between on the one hand the strings "pg-num"
and "pgp-num" and on the other hand "pg_num" and "pgp_num". The strings
with the hyphens are used in dummy commands, and the strings with the
underscores are used as key names. I think it possible that this could
confuse a reader, but I am open to discussion on the matter.

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>

doc/rados/operations: fix typo in balancer.rst

Signed-off-by: Pierre Riteau <pierre@stackhpc.com>

Merge pull request #50341 from yangdongsheng/ubbd

rbd: add support for new device type of ubbd

Reviewed-by: Mykola Golub <mykola.golub@clyso.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

qa/suites/rados: whitelist POOL_APP_NOT_ENABLED for rados cls tests

Fixes: https://tracker.ceph.com/issues/59192
Signed-off-by: Laura Flores <lflores@redhat.com>

qa/suites/rados: remove rook coverage from the rados suite

The rook team relies on a daily CI system to validate
rook changes. It doesn't seem that the teuthology tests
are maintained, so it makes sense to remove them from the
rados suite.

By removing this symlink, rook test coverage will remain
in the orch suite, and coverage will only be removed from the
rados suite.

Workaround for: https://tracker.ceph.com/issues/58585
Signed-off-by: Laura Flores <lflores@redhat.com>

Merge pull request #51294 from cfsnyder/wip-59588

mgr/dashboard: add 'omit_usage' query param to dashboard api 'get rbd' endpoint

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

cmake/rgw: include cpp_redis as system headers

this hides a lot of c++20-related warnings

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

cmake: replace WITH_CPP_REDIS with WITH_RADOSGW_D4N_FILTER

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

point cpp_redis submodule to ceph/cpp_redis

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

RGW: Add D4N classes and unit testing; update cpp_redis submodule

Signed-off-by: samarah <suriarte@redhat.com>

rgw: Add cpp-redis submodule to ceph

Signed-off-by: Ali Maredia <amaredia@redhat.com>
Signed-off-by: Arjun Sharma <arjsharm@redhat.com>

Merge pull request #51729 from NitzanMordhai/wip-nitzan-striper-api-aio-futex-wait

test: futex fail if more notification sent after destroy

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

Merge pull request #51706 from Wangwenjuan1105/wwj_clist_lat

Bluestore: fix bluestore collection_list latency perf counter

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

Merge pull request #51668 from YiteGu/fix-TrackedOp-event-order

osd/TrackedOp: Fix TrackedOp event order

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

Merge pull request #51424 from NitzanMordhai/wip-nitzan-monclient-reconnect-finish-auth-with-error

mon/MonClient: before complete auth with error, reopen session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #50651 from rosinL/cleanup

Cleanup the LevelDB residue

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

[CHERRY-PICKED FOR TESTING ONLY] crimson: Enable tcmalloc when using seastar

classic-osds have always caused significant memory fragmentation
when using the libc memory allocator due to the way that Ceph
tends to utilize memory.  In recent testing, crimson-osd was found
to use 25-27GB of RAM with the stock 3GB bluestore cache settings
(osd_memory_target is only used when tcmalloc is available).  Upon
further testing, it was found that the classic OSD is even worse,
using between 32-33GB of RAM after a 5 minute 4K sequential
write test when using libc malloc.

The good news is that it appears that crimson-osd is able to use
tcmalloc for alienstore without significant modification. Better
still, it drastically reduces memory usage.  In the same test that
resulted in 25GB RSS memory usage for crimson-osd with libc malloc,
a tcmalloc linked version took around 9GB (with an 8GB
osd_memory_target).  Since we do not yet (afaik) expose classic OSD
debugging in crimson it is tough to tell why we are still a little
over, but it's clear that for alienstore we are going to need to
use tcmalloc as we do in classic.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit 9f31ad7b7388996307808e26722260aed29d4ea1)

test/crimson: embed lsan_suppressions into tests executables

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #51915 from zdover23/wip-doc-2023-06-05-rados-operations-pools-typo

doc/rados: pools.rst: "decreaesed"

mgr/dashboard: invalidate rbd image cache on CRUD ops

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
Fixes: https://tracker.ceph.com/issues/58710

Merge pull request #51746 from rosinL/fix-61227

crimson/osd/ops_executer: fix double apply_stats() when writing

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>

doc/rados: pools.rst: "decreaesed"

s/decreased/decreased/

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #51908 from zdover23/wip-doc-2023-06-04-rados-operations-pools-1-of-x

doc/rados: edit pools.rst (1 of x)

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

doc/rados: edit pools.rst (1 of x)

Edit doc/rados/operations/pools.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>

qa/standalone: osd-recovery-scrub: fix slow updates and recovery concurrency

1. Setting frequent scrub status updates, to compensate for the removal
of some 'send updates' in PR#50283.

2. Switching back to using the wpq scheduler, as otherwise the number of
concurrent recovery operations is below what the test expects.

Fixes: https://tracker.ceph.com/issues/61386
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #51901 from zdover23/wip-doc-2023-06-03-rados-troubleshooting-log-and-debug-2-of-x

doc/rados: edit log-and-debug.rst (2 of x)

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

doc/rados: edit log-and-debug.rst (2 of x)

Edit roughly the second half of
doc/rados/troubleshooting/log-and-debug.rst.

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

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #51895 from zdover23/wip-doc-2023-06-03-rados-troubleshooting-troubleshooting-mon-1-of-x

doc/rados: edit troubleshooting-mon.rst (1 of x)

Merge pull request #51885 from zdover23/wip-doc-2023-06-02-rados-troubleshooting-log-and-debug-1-of-x

doc/rados: edit log-and-debug.rst (1 of x)

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

doc/rados: edit log-and-debug.rst (1 of x)

Edit roughly the first half of
doc/rados/troubleshooting/log-and-debug.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>

doc/rados: edit troubleshooting-mon.rst (1 of x)

Edit the first 150 lines of
doc/rados/troubleshooting/troubleshooting-mon.rst.

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

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #50576 from rzarzynski/wip-script-unmerged-backport

script: ceph-backport.sh respects --force when  PR is not merged in main

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

Merge pull request #51896 from zdover23/wip-doc-2023-06-03-rados-operations-pg-repair

doc/rados: fix typos in pg-repair.rst

doc/rados: fix typos in pg-repair.rst

Fix one RST formatting error and one mistakenly-left-in plural noun in
doc/rados/operations/pg-repair.rst.

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

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #51821 from markhpc/wip-bs-rocksdb-cf-tuning

common/options: Update RocksDB CF Tuning

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

mon: fix timestamp formatting in cluster log

Fixes: https://tracker.ceph.com/issues/61547
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #51872 from zdover23/wip-doc-2023-06-01-cephadm-48180-cleanup-3-of-x

doc: update the cephadm download instructions

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

Merge pull request #51851 from Matan-B/wip-matanb-cmake-allocator-status

CMakeLists.txt: increase verbosity for selected allocator

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>

crimson/osd/lsan_suppressions.cc: Add MallocExtension::Initialize()

In similarity to lsan.supp:
```
leak:^MallocExtension::Register
```

Shouls suppress this:
```
==2692420==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 45 byte(s) in 1 object(s) allocated from:
    #0 0x5641d4ffaedd in operator new(unsigned long) (/home/jenkins-build/build/workspace/ceph-pull-requests/build/bin/unittest-object-data-handler+0x7c01edd) (BuildId: 7aeb00a388469f4de54fedaaceb47fc006ce2906)
..
    #7 0x7fb22a6426f0 in MallocExtension::Initialize() (/lib/x86_64-linux-gnu/libtcmalloc.so.4+0x2a6f0) (BuildId: eeef3d1257388a806e122398dbce3157ee568ef4)
```

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #51176 from linuxbox2/wip-fix-rgwfile-ver

rgw/file: advance rgw_file interface version

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

doc: update the cephadm download instructions

Starting with reef, cephadm is a compiled (zipapp) python application.
The cephadm script has been renamed and thus the old curl-based
download instructions will no loner work. While cephadm still has
no dependencies outside the Python stdlib, this will be changed in
future versions so it is no longer appropriate to just download the
source file of cephadm and run it either.

This change updates the `Install cephadm` section of the doc to explain
how to acquire a "compiled" version of cephadm as well as:
* moving and tweaking the note that the two installation methods are
  distinct
* adding a new note linking to instructions on building cephadm
* moving the distribution-specific installations before the curl-based
  installation to subtly hint that we prefer you to get it using
  packages if you can
* Noting cephadm's minimal required python verision and how to run it
  with a particular python version.

Note from Zac Dover, June 1, 2023: Note: This commit is a cherry-pick of
d11cf0e, which was introduced by John Mulligan in #48180. This is one of
three commits introduced in that PR, and this cherry-pick cleans up
omissions I (Zac Dover) inadvertently introduced while attempting to
rectify the merge conflicts in #51843. This should be the final
main-branch-targeting commit that cleans up PR#51483.

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

Merge pull request #51857 from zdover23/wip-doc-2023-05-31-cephadm-48180-cleanup-1-of-x

doc: make instructions to get an updated cephadm common

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

Merge pull request #51844 from rhcs-dashboard/fix-qa-failure-orch

mgr/dashboard: fix test_dashboard_e2e.sh failure

Reviewed-by: Pegonzal <NOT@FOUND>

rgw/kafka: make sure that destroy is called after connection is removed

in addition. the dtor calls "destroy()", so there is no need to call
it explictly

Fixes: https://tracker.ceph.com/issues/61540
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>

Merge pull request #51347 from adk3798/maint-host-no-write

mgr/cephadm: also don't write client files/tuned profiles to maintenance hosts

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

Merge pull request #51701 from rkachach/fix_issue_61361

cephadm: delete /tmp/cephadm-<fsid> when removing the cluster

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

Merge pull request #51660 from rkachach/fix_issue_61330

cephadm: Adding support to configure public_network cfg section

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

Merge pull request #50805 from rkachach/fix_issue_59254

mgr/cephadm: show meaningful messages when failing to execute cmds

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

Merge pull request #51816 from AliMasarweh/wip-alimasa-admin-delete-persistent-topic

RGW:notifications: persistent topics are not deleted via radosgw-admin

Merge pull request #50614 from phlogistonjohn/jjm-nfs-haproxy-cfg

mgr/cephadm: add support for nfs with haproxy protocol

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

Merge pull request #51859 from zdover23/wip-doc-2023-05-31-cephadm-48180-cleanup-2-of-x

doc: add instructions for compiling cephadm

doc: add instructions for compiling cephadm

Now that cephadm is based on zipapp, add a short section to the
developer docs explaining how to build cephadm yourself.

Note: This commit is a cherry-pick of
9ad38033cc5c7f177cb8fe3bae696682687e0346, which was introduced by John
Mulligan in #48180. This is one of three commits introduced in that PR,
and this cherry-pick cleans up omissions I (Zac Dover) inadvertently
introduced while attempting to rectify the merge conflicts in #51843. I
expect that one more cherry-picked commit (specifically,
d11cf0e82aab8d4cef9d423e5d463a373eaf383a, which cannot be merged easily
until d7921e88d69b4bc355da9c0327cc33e59e7d7abb has been merged into
main, for reasons that are too
Rick-and-Morty-there-should-never-be-more-than-one-dot to go into here)
will follow this one.

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

doc: make instructions to get an updated cephadm common

As discussed in person and over the ceph orch weekly, we want all users
to use a recent supported version of cephadm. Previously, the
instructions only had those downloading cephadm with curl using the
"add-repo" and "install" commands to get a up-to-date cephadm build.
According to ADK we've seen cases of users get "old" distro packages
in the past. Change the instructions so that the "update cephadm" steps
are common after acquiring a "bootstrap copy" of cephadm.

Note: This commit is a cherry-pick of
d7921e88d69b4bc355da9c0327cc33e59e7d7abb, which was introduced by John
Mulligan in https://github.com/ceph/ceph/pull/48180. This is one of
three commits introduced in that PR, and this cherry-pick cleans up
omissions I (Zac Dover) inadvertently introduced while attempting to
rectify the merge conflicts in https://github.com/ceph/ceph/pull/51843.
I expect that two more cherry-picked commits will follow this one.

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

Merge pull request #51828 from petrutlucian94/it_decrement_issue

librbd: avoid decrementing iterator before first element

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

Merge pull request #51814 from idryomov/wip-61382

osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile

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