ceph-volume: refactor tests for refactored get_devices

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 4749f4c59dc4edb1fd689e18e8d9f358f95cb945)

Conflicts:
src/ceph-volume/ceph_volume/tests/conftest.py
        resolved by importing PropertyMock

ceph-volume: refactor get_devices, don't use os.path.realpath

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

Merge pull request #32558 from shyukri/wip-43275-nautilus

nautilus: ceph-volume/test: patch VolumeGroups

Merge pull request #32556 from shyukri/wip-43022-nautilus

nautilus: ceph-volume: minor clean-up of "simple scan" subcommand help

Merge pull request #32998 from neha-ojha/wip-min-alloc-nautilus

nautilus: common/options: bluestore 4k min_alloc_size for SSD

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #32846 from smithfarm/wip-43256-nautilus

nautilus: common/config: update values when they are removed via mon

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #32997 from neha-ojha/wip-32939-nautilus

nautilus: mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls"

Reviewed-by: David Zafman <dzafman@redhat.com>

Merge pull request #32901 from smithfarm/wip-43631-nautilus

nautilus: common/util: use ifstream to read from /proc files

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

Merge pull request #32858 from smithfarm/wip-43473-nautilus

nautilus: common: fix deadlocky inflight op visiting in OpTracker.

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

Merge pull request #32845 from smithfarm/wip-43245-nautilus

nautilus: os/bluestore/BlueStore.cc: set priorities for compression stats

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

Merge pull request #32774 from dzafman/wip-43726-nautilus

nautilus: test: Fix wait_for_state() to wait for a PG to get into a state

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

Merge pull request #30689 from smithfarm/wip-42120-nautilus

nautilus: core: osd/OSDMap: health alert for non-power-of-two pg_num

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

Merge pull request #32857 from smithfarm/wip-43471-nautilus

nautilus: osd/PeeringState.cc: don't let num_objects become negative

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

Merge pull request #32848 from smithfarm/wip-43346-nautilus

nautilus: qa/suites/rados/thrash: force normal pg log length with cache tiering

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #32847 from smithfarm/wip-43319-nautilus

nautilus: osd/PeeringState.cc: skip peer_purged when discovering all missing

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

Merge pull request #32843 from smithfarm/wip-43099-nautilus

nautilus: osd/OSD: enhance osd numa affinity compatibility

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

Merge pull request #32773 from dzafman/wip-43246-nautilus

nautilus: osd: Use physical ratio for nearfull (doesn't include backfill resserve)

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

Merge branch 'nautilus' into wip-42120-nautilus

Merge pull request #32716 from smithfarm/wip-43650-nautilus

nautilus: osd: Diagnostic logging for upmap cleaning

Reviewed-by: David Zafman <dzafman@redhat.com>

Merge pull request #32715 from smithfarm/wip-43620-nautilus

nautilus: kv: fix shutdown vs async compaction

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

Merge pull request #32259 from smithfarm/wip-43243-nautilus

nautilus: selinux: Allow ceph to read udev db

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #32769 from liewegas/fix-42566-nautilus

nautilus: mgr/MgrClient: fix open condition

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

Merge pull request #32930 from rhcs-dashboard/wip-43845-nautilus

nautilus: mgr/dashboard: disable 'Add Capability' button in rgw user edit

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

Merge pull request #32827 from rhcs-dashboard/wip-43811-nautilus

nautilus: mgr/dashboard: check if user has config-opt permissions

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #31808 from bk201/wip-42956-nautilus

nautilus: mgr/dashboard: check embedded Grafana dashboard references

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

Merge pull request #31792 from rhcs-dashboard/wip-42936-nautilus

nautilus: mgr/dashboard: Dashboard can't handle self-signed cert on Grafana API

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #31190 from rhcs-dashboard/wip-42294-nautilus

nautilus: mgr/dashboard: add debug mode, and accept expected exception when SSL handshaking

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #32304 from ricardoasmarques/wip-43333-nautilus

nautilus: mgr/dashboard: iSCSI targets not available if any gateway is down (and more...)

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #32888 from shyukri/wip-42033-nautilus

nautilus: mgr/dashboard: Using wrong identifiers in RGW user/bucket datatables

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

mgr/dashboard: disable 'Add Capability' button when all the capabilities are added

Fixes: https://tracker.ceph.com/issues/43564
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 4ef0e2c1ba2c7c2b12556f5ee7a593ae4ba99144)

Conflicts:
  src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html

- Change applied manually in conflicting file.

mgr/dashboard: check if user has config-opt permissions before retrieving settings.

Fixes: https://tracker.ceph.com/issues/43595
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit ea1c8c7ef7f494208aec1c59d12fec2da759784a)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts

mgr/dashboard: Using wrong identifiers in RGW user/bucket datatables

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

mgr/dashboard: Unable to remove an iSCSI gateway that is already in use

Fixes: https://tracker.ceph.com/issues/43900
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit bcb05d0cae89deeb6c5e6a0cf282d84fed7811c3)

Merge branch 'nautilus-saved' into nautilus

Resetting branch after 14.2.7 hotfix release

14.2.7

rgw: drop the partial message check while reading messages

Avoid leaking connections that had partially-consumed
client data on unexpected disconnect.

Signed-off-by: Or Friedmann <orfriedma@redhat.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #32979 from leseb/bkp-32828

nautilus: ceph-volume: add db and wal support to raw mode

common/options: bluestore 64k min_alloc_size for HDD

Until we understand the performance regression and allocator behavior,
go back to 64k.  This will continue to have a high space overhead for
small objects and EC, but will preserve the current performance levels
for all workloads.

This partially reverts 0ec75c99ddb103c664f66c04450003ed4c407708

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

common/options: Set bluestore min_alloc size to 4K

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

Merge pull request #32221 from smithfarm/wip-43168-nautilus

nautilus: rgw/pubsub: fix records/event json format to match documentation

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>

mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls"

Makes it easier to know what the always_on_modules for each release are, without
having to look at the code.

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

ceph-volume: add db and wal support to raw mode

Using the raw mode, the OSD preparation can now be called with extra
arguments to specify a block device for either rocksdb db or wal.

The code expects the device to be available and no validation will be
performed. Also, the entire block device will be consumed.

The goal is run this on Kubernetes with Rook and OSD are running on PVC.
Users will request PVC from a certain size, the request will be
acknowledged and a block will be created, then attached to the machine.
Later on consumed by Rook's preparation job.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c8f23c7182e2681f2bc756776a890995aca1efd2)

ceph-volume: fix raw list

There is no json anymore, just plain output.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit e99eb8cc95c5f50ec13170f202226c3581e3f5e2)

ceph-volume: remove unnecessary comment

This comment is not relevant since we will never bring systemd support
to the raw mode.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit af3f5fded95e4dcc0dfa2a0b2eec5fb2c4252b6c)

ceph-volume: remove osd-id and osd-fsid flag

These are not used since we only rely on the device path so removing
them to avid confusion.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 525957be98a0a6ff742f6bae4450f291591f516f)

ceph-volume: remove "create" call from raw mode

This mode is intented to work when the cluster is running on Kubernetes
and OSDs are running on PVC.
So we always have a "prepare" pod and an "activate" pod.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c7a2ecc59394a9eb323a19ff233a2e3dfe04a018)

Merge pull request #32835 from smithfarm/wip-43812-nautilus

nautilus: rgw: support radosgw-admin zone/zonegroup placement get command

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

Merge pull request #32834 from smithfarm/wip-43789-nautilus

nautilus: rgw: fix opslog operation field as per Amazon s3

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

Merge pull request #32833 from smithfarm/wip-43786-nautilus

nautilus: rgw: the http response code of delete bucket should not be 204-no-content

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

Merge pull request #32832 from smithfarm/wip-43782-nautilus

nautilus: rgw: Incorrectly calling ceph::buffer::list::decode_base64 in bucket policy

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

Merge pull request #32504 from smithfarm/wip-43477-nautilus

nautilus: rgw: Select the std::bitset to resolv ambiguity

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #32437 from pritha-srivastava/wip-42385-nautilus

nautilus: rgw: Adding 'iam' namespace for Role and User Policy related REST APIs.

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

Merge pull request #32239 from smithfarm/wip-43300-nautilus

nautilus: rgw: fix bugs in listobjectsv1

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

Merge pull request #32825 from smithfarm/wip-43779-nautilus

nautilus: rgw: return error if lock log shard fails

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

Merge pull request #32824 from smithfarm/wip-43728-nautilus

nautilus: rgw: move forward marker even in case of many rgw.none indexes

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

Merge pull request #32822 from smithfarm/wip-43576-nautilus

nautilus: rgw: fix a bug that bucket instance obj can't be removed after resharding completed

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

Merge pull request #32821 from smithfarm/wip-43574-nautilus

nautilus: rgw: fix data consistency error casued by rgw sent timeout

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

Merge pull request #32820 from smithfarm/wip-43571-nautilus

nautilus: rgw: build_linked_oids_for_bucket and build_buckets_instance_index should return negative value if it fails

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

Merge pull request #32819 from smithfarm/wip-43373-nautilus

nautilus: rgw: data sync markers include timestamp from datalog entry

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

Merge pull request #32818 from smithfarm/wip-43372-nautilus

nautilus: rgw: radosgw-admin: sync status displays id of shard furthest behind

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

Merge pull request #32759 from smithfarm/wip-43203-nautilus

nautilus: rgw: adding mfa code validation when bucket versioning status is changed

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

Merge pull request #32489 from bzed/clang-build-fix

nautilus: rgw/rgw_rest_conn.h: fix build with clang

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #32057 from smithfarm/wip-43010-nautilus

nautilus: rgw multisite: fixes for concurrent version creation

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

Merge pull request #32900 from smithfarm/wip-43830-nautilus

nautilus: rbd: librbd: don't call refresh from mirror::GetInfoRequest state machine

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

Merge pull request #32842 from smithfarm/wip-43735-nautilus

nautilus: librbd: support compression allocation hints to the OSD

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

Merge pull request #32841 from smithfarm/wip-43511-nautilus

nautilus:  librbd: skip stale child with non-existent pool for list descendants

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

Merge pull request #32840 from smithfarm/wip-43508-nautilus

nautilus: rbd:  creating thick-provision image progress percent info exceeds 100%

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

Merge pull request #32839 from smithfarm/wip-43501-nautilus

nautilus: librbd: remove pool objects when removing a namespace

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

Merge pull request #32837 from smithfarm/wip-43237-nautilus

nautilus: librbd: fix rbd_open_by_id, rbd_open_by_id_read_only

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

Merge pull request #32815 from tchaikov/nautilus-pr-30284

nautilus: tests: add missing header cmath to test/mon/test_mon_memory_target.cc

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #32441 from tchaikov/nautilus-boost-1.72

nautilus: switch to boost 1.72

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

librbd: don't call refresh from mirror::GetInfoRequest state machine

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

Conflicts:
src/librbd/api/Mirror.cc
- C_ImageGetInfo ctor takes only two arguments in nautilus
- nautilus does not have LambdaContext as a class; use FunctionContext
  instead

common/util: use ifstream to read from /proc files

refactor `collect_sys_info()` to use ifstream, getline and boost string
helpers to read and parse the /proc/meminfo and /proc/cpuinfo. for
better readability, and it's less error-prone.

Related-To: https://tracker.ceph.com/issues/43306
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ecddb1dd24756b0049cf9d32fe49ae5d13f96b44)

common,tools: make sure the destination buffer can handle the size of the string

fix klocwork issues:
Width is not specified for 's' conversion specifier.
This can result in an overflow of the buffer
provided in argument 3 of a call to 'sscanf'

Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit 5e8c412e63d6a86aa4846efe4cceff52ca8f16d5)

nautilus: monitoring: add details to Prometheus' alerts (#32892)

nautilus: monitoring: add details to Prometheus' alerts

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>

Merge pull request #32838 from smithfarm/wip-43241-nautilus

nautilus: qa: krbd_exclusive_option.sh: update for recent kernel changes

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

monitoring: add details to Prometheus' alerts

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

rgw: Adding 'iam' namespace for Role and User Policy related REST APIs.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 121a2695544bd56973459fad9b4f545b4ee412f8)

Conflicts:
src/common/options.cc
src/rgw/CMakeLists.txt
src/rgw/rgw_main.cc
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h

Merge pull request #32781 from idryomov/wip-doc-fs-authorize-fix-nautilus

nautilus: doc/cephfs/client-auth: description and example are inconsistent

Reviewed-by: Jeff Layton <jlayton@redhat.com>

common: fix deadlocky inflight op visiting in OpTracker.

Fixes: https://tracker.ceph.com/issues/42780
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 57ebdc2a77e88e113957b0a4b42475fc4c304bf7)

librbd: allow remove snapshot with child from non-existent pool

Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit 50f3cc199e5a4ace0ccf1d755ac682aeb489a454)

Conflicts:
src/test/librbd/test_librbd.cc
- nautilus does not have test "DISABLED_TestSeqWriteAIOPP"
        test/librbd/operation/test_mock_SnapshotRemoveRequest.cc
- nautilus uses "RWLock::RLocker", instead of "std::shared_lock", with
  owner_locker

rgw: fix radosgw-admin zone/zonegroup placement get command

Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit 9f0e461ce33808496e1df5c0706ed8b4403b7109)

Conflicts:
    src/rgw/rgw_admin.cc
- nautilus uses "store->svc.sysobj"

osd/PeeringState.cc: don't let num_objects become negative

If num_objects become negative, we may end up incorrectly setting
the PG_STATE_DEGRADED flag. Instead reset num_objects to zero and set
the PG_STATE_INCONSISTENT flag when this happens expecting scrub to fix
the inconsistency.

Fixes: https://tracker.ceph.com/issues/43308
Co-authored-by: David Zafman <dzafman@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 54c5eca48ce94dc4a1416836a06203db880c3842)

Conflicts:
src/osd/PeeringState.cc
- file is missing in nautilus; backported the code change manually
  to src/osd/PG.cc

Merge pull request #32208 from smithfarm/wip-43280-nautilus

nautilus: rpm: add rpm-build to SUSE-specific make check deps

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

qa/suites/rados/thrash: force normal pg log length with cache tiering

When we are doing cache tiering, we are more sensitive to short PG logs
because the dup op entries are not perfectly promoted from the base to
the cache.

See:
 http://tracker.ceph.com/issues/38358
 http://tracker.ceph.com/issues/24320

This works around the problem by not testing short pg logs in combination
with cache tiering.  This works because the short_pg_log.yaml fragment
sets the short log in the [global] section but the cache workloads overload
it (back to a large/default value) in the [osd] section.

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

osd/PeeringState.cc: skip peer_purged when discovering all missing

We hit a couple of bugs because in discover_all_missing() we send
pg_query to an OSD that was marked stray and already got purged. This results
in a state machine crash on the purged OSD. Fix this by skipping any
purged peers.

Fixes: https://tracker.ceph.com/issues/41317
Fixes: https://tracker.ceph.com/issues/40963
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 4960f579a234f9984d73767fde073c419e884c17)

Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus; made the changes manually in
  src/osd/PG.cc

Merge pull request #32079 from smithfarm/wip-43143-nautilus

nautilus: mds: tolerate no snaprealm encoded in on-disk root inode

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

common/config: update values when they are removed via mon

If a value is set via the mon (ceph config set ...), and then later
removed, the removal doesn't propagate to the legacy values (or debug
options) because update_legacy_values() only iterates over legacy value
and not debug options.

Similarly, we want to trigger a config notification to any observers,
so we need to add the option to values.changed.

Fixes: https://tracker.ceph.com/issues/42964
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 56be2e4a373dcf794756eaf05958dd6f44a4ca9e)

os/bluestore/BlueStore.cc: set priorities for compression stats

To allow compression statistics to be exported by ceph-mgr and make
them appear on the dashboard.

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

osd/OSD: enhance osd numa affinity compatibility

add bond network numa affinity compatibility support
add subnet compatibility support
add public and cluster network numa nodes not matching log

Fixes: https://tracker.ceph.com/issues/42411
Signed-off-by: Dai zhiwei <daizhiwei3@huawei.com>
(cherry picked from commit 637fdea62b08c4d675a280e2218bcef1039ba25d)

osd/osd: set_numa_affinty: add an err log when it unable to
         identify cluster interface's numa node

Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit e928f1a9bd568ffff751662ebf781dc17f40370f)

doc/rbd: documented 'rbd compression hint' config option

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

librbd: support compression allocation hints to the OSD

A new "rbd_compression_hint" configuration option can be applied
globally, at the pool level, or to individual images to send
the associated compression allocation hint to the OSD on write
operations.

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

librbd: skip stale child with non-existent pool for list_descendants

Fixes: https://tracker.ceph.com/issues/41241
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit a485eb827009b629c4c7804ec1b7191cfe6b6dd7)

librbd: fix error param of ioctx when passing to `list_descendants`

Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit b7ac8a17ef0b0602301eebea0e2e3c8032889174)

rbd:the progress percent info exceeds 100%

Signed-off-by: Xiangdong Mu <muxiangdong@inspur.com>
(cherry picked from commit 4877c8a12181ec9cbc1c1e59bea3a615e0367588)

librbd: remove pool objects when removing a namespace

Avoid leaving RBD pool objects within a pool namespace that is
being deleted.

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

Conflicts:
src/librbd/api/Namespace.cc
- "r = Mirror<I>::mode_set(ns_ctx, RBD_MIRROR_MODE_DISABLED)"
  block is missing in nautilus

qa: kernel.sh: unlock before rolling back

"rbd snap rollback" expects an unlocked image, but we may get there
locked if object map is enabled (or if lock_on_read is specified in
rbd_default_map_options).

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

qa: krbd_exclusive_option.sh: update for recent kernel changes

Since 5.3:
- a plain "rbd map" acquires the lock, so it's not different from
  "rbd map -o exclusive" in this regard
- if the lock is held by the exclusive peer, I/O is failed right away
  instead of blocking
- lock_timeout option is respected only by "rbd map" and not by I/O

Since 5.5:
- if the mapping is read-only, the lock isn't acquired

Added blacklisting test case, dropped lock_timeout test case.

Fixes: https://tracker.ceph.com/issues/43127
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 50933b863a1d239bbca0a25663c0dbe7ab8963ce)

librbd: fix rbd_open_by_id, rbd_open_by_id_read_only

These methods incorrectly delete ImageCtx on error, resulting
in double-free heap corruption.

Fixes: https://tracker.ceph.com/issues/43178
Signed-off-by: yangjun <yangjun@cmss.chinamobile.com>
(cherry picked from commit 3457192c24a66ba499a7c9b1747bc29c79b34636)