ceph-volume: refactor devices/lvm/listing.py

Get rid of duplicate and redundant code and use get_lvs, get_vgs and
get_pvs to simplify the module as much as possible.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit d02bd7dd581a4bd4041eb397fae540a18f16a88b)

ceph-volume: sort and align output

This commit targets the `ceph-volume lvm list` command.
The output is sorted by the osd id and each device's
attributed are sorted, so the ceph operators can find
relevant information easier. The devices (block,db,..etc)
are now properly aligned.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
(cherry picked from commit 209afb54ad1812f2b380081de8ae92f37e953623)

ceph-volume: add new method in api/lvm.py

The method determines whether given LV is managed by Ceph or not.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 876244b6ab2cf1fbd724fd33966501a3366c6d3f)

ceph-volume: add helper methods to get only first LVM devs

These convenience methods shortens following phrase to
"lv = get_first_lv()" -

lvs = get_lvs()
if len(lvs) >= 1:
lvs = lv[0]

These methods do the same things as above phrase internall. Rewrite
listing.py to use these new helper methods.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 17957d9beb42a04b8f180ccb7ba07d43179a41d3)

ceph-volume: filter based on tags for api.lvm.get_* methods

get_pvs, get_vgs and get_lvs must accept tags and filter volumes based
on tags.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit fb1390964fdfd10815ab4a4302ad454169bc0d5f)

Merge pull request #33578 from jan--f/wip-43850-mimic

mimic: ceph-volume: add sizing arguments to prepare

Merge pull request #33579 from jan--f/wip-43872-mimic

mimic: ceph-volume: batch bluestore fix create_lvs call

Merge pull request #32862 from shyukri/wip-43340-mimic

mimic: lvm/deactivate: add unit tests, remove --all

ceph-volume: batch bluestore fix create_lvs call

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

ceph-volume: remove redefinition of [LV,PV,VG]_FIELDS

This was introduced in https://github.com/ceph/ceph/pull/32242
erroneously.

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

tests: fix tests after batch sizing was fixed

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

lvm/batch: adjust devices for byte based size calculation

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

lvm: add sizing arguments to prepare and create.

This adds options to size to-be-created LVs in the prepare and create
subcommands. Sizing can be done explicitly by passing a sizes or
implicitly by specifying the number of slots per [data|journal|wal|db]
device. The former will try to create a LV of the specified size and use
that to create OSDs if it succeeds. The latter will carve up the device
size into $n slots and use one of those slots for the to-be-created OSD.
If partitions or LVs are passed these options are ignored.
This also creates the foundation to move to byte-based sizing, by moving
VolumeGroup lvm querying and size calculation to bytes as the base unit.

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

util/disk: extend Size class

The Size class can now parse strings and has support for arithmetic
operations and comparisons with numbers.

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

Merge pull request #33201 from jan--f/wip-43854-mimic

mimic: ceph-volume/batch: fail on filtered devices when non-interactive

Merge pull request #33215 from jan--f/wip-32242-notrack-mimic

mimic: ceph-volume: add methods to pass filters to pvs, vgs and lvs commands

ceph-volume: add methods to pass filters to pvs, vgs and lvs commands

Filters can be passed to these commands by using option '-S'.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit a4f2fcefb80df524c472782e8c1d18b3c2d1c1fc)

lvm/deactivate: add unit tests, remove --all

Remove the --all flag until its actually implemented.

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

 Conflicts:
src/ceph-volume/ceph_volume/devices/lvm/deactivate.py

Merge pull request #32876 from shyukri/wip-43569-mimic

mimic: ceph-volume: Dereference symlink in lvm list

Merge pull request #33208 from jan--f/wip-deactivate-mimic

mimic: ceph-volume: lvm deactivate command

lvm: add deactivate subcommand

This new subcommand unmounts and OSDs tmpfs mount and closes crypt
devices if there are any.

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

util/system: add unmount_tmpfs helper

Thsi unmounts a path if and only if it's a tmpfs mount.

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

api/lvm: add get_lv_by_osd_id method

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

api/lvm: add deactivate method to Volume class

Simply calls lvchange -an to deactivate a logical volume.

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

Merge pull request #32869 from shyukri/wip-42946-mimic

mimic: ceph-volume: allow raw block devices everywhere

Merge pull request #32872 from shyukri/wip-43200-mimic

mimic: ceph-volume: fix the integer overflow

Merge pull request #33331 from smithfarm/wip-43472-mimic

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

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

Merge pull request #33329 from smithfarm/wip-43320-mimic

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

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

Merge pull request #33324 from smithfarm/wip-42998-mimic

mimic: osd/PeeringState: do not exclude up from acting_recovery_backfill

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

Merge pull request #33322 from smithfarm/wip-42852-mimic

mimic: mon/OSDMonitor: fix format error ceph osd stat --format json

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

Merge pull request #33154 from shyukri/wip-43881-mimic

mimic: mon: Don't put session during feature change

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

Merge pull request #33145 from shyukri/wip-43987-mimic

mimic: osd: Allow 64-char hostname to be added as the "host" in CRUSH

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

Merge pull request #32717 from smithfarm/wip-43652-mimic

mimic: osd: Diagnostic logging for upmap cleaning

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

Merge pull request #32258 from smithfarm/wip-43244-mimic

mimic: selinux: Allow ceph to read udev db

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #32125 from dvanders/dvanders_40890

mimic: osd: set collection pool opts on collection create, pg load

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

Merge pull request #33323 from smithfarm/wip-42879-mimic

mimic: common/admin_socket: Increase socket timeouts

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

Merge pull request #33158 from shyukri/wip-43925-mimic

mimic: mgr/prometheus: report per-pool pg states

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

Merge pull request #33096 from k0ste/wip-43978-mimic

mimic: mgr/telemetry: check get_metadata return val

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>

Merge pull request #32902 from smithfarm/wip-43630-mimic

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

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

Merge pull request #31673 from smithfarm/wip-42833-mimic

mimic: os/bluestore: fix improper setting of STATE_KV_SUBMITTED.

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

Merge pull request #31805 from smithfarm/wip-42851-mimic

mimic: pybind/mgr: Cancel output color control

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

Merge pull request #31305 from smithfarm/wip-42544-mimic

mimic: qa/tasks/cbt: run stop-all.sh while shutting down

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

Merge pull request #33377 from badone/wip-mimic-upgrade-ceph_ansible

mimic: qa/ceph-ansible: Upgrade to stable-3.2.30 branch

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

Merge pull request #31861 from smithfarm/wip-43014-mimic

mimic: rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

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

Merge pull request #31754 from smithfarm/wip-42896-mimic

mimic: rgw: add list user admin OP API

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

Merge pull request #31377 from smithfarm/wip-41635-mimic

mimic: rgw: add bucket permission verify when copy obj

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

Merge pull request #31299 from smithfarm/wip-42554-mimic

mimic: rgw: prevent bucket reshard scheduling if bucket is resharding

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

Merge pull request #31183 from croit/mimic-rgw-bucket-stats-num-shards

mimic: rgw: add num_shards to radosgw-admin bucket stats

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

Merge pull request #30804 from smithfarm/wip-41975-mimic

mimic: rgw: add missing admin property when sync user info

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

Merge pull request #33304 from smithfarm/wip-43206-mimic

mimic: rgw: fix bad user stats on versioned bucket after reshard

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

Merge pull request #33303 from smithfarm/wip-43202-mimic

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

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

Merge pull request #33302 from smithfarm/wip-42734-mimic

mimic: rgw: allow reshard log entries for non-existent buckets to be cancelled

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #33341 from tpsilva/wip-44130-mimic

mimic: rgw: make max_connections configurable in beast

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

Merge pull request #33313 from smithfarm/wip-43876-mimic

mimic: rgw: maybe coredump when reload operator happened

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

Merge pull request #33309 from smithfarm/wip-43633-mimic

mimic: rgw: find oldest period and update RGWMetadataLogHistory()

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

Merge pull request #33312 from smithfarm/wip-43847-mimic

mimic: rgw: update the hash source for multipart entries during resharding

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #33311 from smithfarm/wip-43658-mimic

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

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #31378 from smithfarm/wip-41859-mimic

mimic: rgw: fix memory growth while deleting objects with

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #33306 from smithfarm/wip-43575-mimic

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

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #33305 from smithfarm/wip-43480-mimic

mimic: rgw: change the "rgw admin status" 'num_shards' output to signed int

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #33300 from smithfarm/wip-42732-mimic

mimic: rgw: auto-clean reshard queue entries for non-existent buckets

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #33314 from smithfarm/wip-42992-mimic

mimic: qa: update krbd_blkroset.t and add krbd_get_features.t

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

Merge pull request #33316 from smithfarm/wip-43242-mimic

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

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

Merge pull request #33318 from smithfarm/wip-43507-mimic

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

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

Merge pull request #33315 from smithfarm/wip-43238-mimic

mimic: librbd: fix rbd_open_by_id, rbd_open_by_id_read_only

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

Merge pull request #32952 from shyukri/wip-43829-mimic

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

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

Merge pull request #32714 from smithfarm/wip-43625-mimic

mimic: nautilus: rbd-mirror: fix 'rbd mirror status' asok command output

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

Merge pull request #32470 from zhengchengyao/diff_mimic

mimic: rbd: librbd: diff iterate with fast-diff now correctly includes parent

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

Merge pull request #31520 from trociny/wip-42727-mimic

mimic: rbd-mirror: clone v2 mirroring improvements

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

mimic: qa/ceph-ansible: Upgrade to stable-3.2.30 branch

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

rgw: make max_connections configurable in beast

Beast frontend currently accepts a hardcoded number of connections
that is defined by boost::asio::socket_base::max_connections. This
commit makes it configurable via a 'max_connections' config option
on rgw frontend.

Fixes: https://tracker.ceph.com/issues/43952
Signed-off-by: Tiago Pasqualini <tiago.pasqualini@canonical.com>
(cherry picked from commit d6dada5bcb356abaef8d9237ceca8f42d4fcfb74)

Conflicts:
        src/rgw/rgw_asio_frontend.cc
- trivial resolution

doc: update ceph-volume lvm prepare

Add option to pass raw physical devices everywhere, restructure a little
(bluestore section before filestore) and reword a few things.

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

ceph-volume: make lvm report fields into constants

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

ceph-volume: api/lvm create or reuse a vg

This changes create_lv so one can pass the desired device and either a
VG with a name starting with ceph is re-used or a new one is created.
This commit also adds two new lvm primitives, making use of lvm's select
feature. The goal is to eventually avoid keeping a full list of lv's (or
vg's) around and query the lvm system as needed.

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

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

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 mimic; made the changes manually in
  src/osd/PG.cc

Revert "osd/PG: avoid choose_acting picking want with > pool size items"

This reverts commit a0d49cf83ae3b845f2724aec28234d8796c66747.

c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3 was backported to mimic by a0d49cf83ae3b845f2724aec28234d8796c66747.
In master, c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3 was reverted by 82bb83f0ba930d7f83bea5a5397629b3e334bae2.

The revert is not cherry-picked from master because it's better to
revert the mimic backport directly.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

osd/PeeringState: do not exclude up from acting_recovery_backfill

If we choose a primary that does not belong to the current up set,
and all up peers are still recoverable, then we might end up excluding
some up peer from the acting_recovery_backfill set too due to the
"want size <= pool size" constraint (since https://github.com/ceph/ceph/pull/24035),
as a result of which all up peers might not get recovered in one go.

Fix by falling through any oversized want set to async recovery, which
should be able to handle it nicely.

Fixes: https://tracker.ceph.com/issues/42577
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 22c8cdad8ee1d7376c7d200bdb6ec94ed6d3b5e6)

Conflicts:
src/osd/PeeringState.cc
- file does not exist in mimic; made the change manually to
  src/osd/PG.cc

rgw: add list user admin OP API unit tests

Signed-off-by: Oshyn Song <dualyangsong@gmail.com>
(cherry picked from commit b7580932c07e1c8048d016aa63981e00b0175698)

rgw: add list user admin OP API

The radosgw-admin tool support the `user list` subcommand to list radosgw users, but there is no user listing function for the admin OP API. It needs to support this API.

Signed-off-by: Oshyn Song <dualyangsong@gmail.com>
(cherry picked from commit 97e1ff50e57a51744a6d864cef15f9afe0e84b66)

Conflicts:
src/rgw/rgw_user.h
- needed to adapt the list_user RGWOp name() override

common/admin_socket: Increase socket timeouts

With the move of the 'bench' command to the admin socket the recv
timeout is being exceeded in testing due to the duration of the command.

Fixes: https://tracker.ceph.com/issues/42387
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 4dd67b9e3cb1a4168f6804b144e4178f2b821108)

Merge pull request #32782 from idryomov/wip-doc-fs-authorize-fix-mimic

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

Reviewed-by: Nathan Cutler <ncutler@suse.com>

osd/OSDMap: fix format error ceph osd stat --format json

Fixes: https://tracker.ceph.com/issues/42501
Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
(cherry picked from commit a85499ca57dd22e61bcad614897dc5fd57196353)

rgw: when a period lookup for oldest_realm_epoch returns an ENOENT,
find the oldest one and update RGWMetadataLogHistory. This is to avoid an
empty cursor being passed in to ceph_assert() in PurgePeriodLogsCR::operate()
in case of incomplete period history.

Fixes: https://tracker.ceph.com/issues/40341
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 0ea65d81d4d5431ca22340149dbd714e395ecdc3)

Conflicts:
src/rgw/services/svc_mdlog.cc
- file does not exist in mimic; made the changes manually to
  src/rgw/rgw_metadata.cc
- in mimic, find_oldest_period takes an argument: store
- in mimic, write_history takes an additional argument: store

rgw: move forward marker even in case of many non-existent indexes

Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit 2eaac132d491ef3c6f8cb50c34fc67f56e006c07)

Conflicts:
        src/rgw/rgw_rados.cc
- manual cherry-pick

rbd:the progress percent info exceeds 100%

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

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)

Conflicts:
src/librbd/librbd.cc

qa: add krbd_get_features.t test

Run it together with krbd_blkroset.t.

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

qa: krbd_blkroset.t: update for read-only changes

If an image is mapped read-only, setting its partition(s) to read-write
via BLKROSET is no longer allowed.

Add read-only OSD caps test cases.

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

rgw: maybe coredump when reload operator happened

Fixes: https://tracker.ceph.com/issues/42119
Signed-off-by: Richard Bai(白学余) <baixueyu@inspur.com>
(cherry picked from commit 78125a8dba6b59b012c642c6b756a2c4f34912b1)

Conflicts:
        src/rgw/rgw_rados.cc
- manual cherry-pick

rgw: update the hash source for multipart entries during resharding
Fixes: https://tracker.ceph.com/issues/43583
Signed-off-by: dongdong tao <dongdong.tao@canonical.com>
(cherry picked from commit fb6f78a3a54a39fb2f43fa7846cb847e4917860d)

Conflicts:
src/rgw/rgw_reshard.cc
- mimic does not have 7e613fdc55bd3db200cce912b0e27a99a128aa27
- in mimic, RGWMPObj is defined in rgw_rados.h

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

Fixes: https://tracker.ceph.com/issues/42691
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit 03039d9630e65088b525e9637dfc6f8f2c0a2702)

Conflicts:
src/rgw/rgw_reshard.cc
- in master, *store has type "rgw::sal::RGWRadosStore", while in nautilus
  it has type "RGWRados", but this line appears to be merely incidental
  to the patch

rgw: change the 'rgw admin status" nun_shards output to signed int

Fixes: http://tracker.ceph.com/issues/37645
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 9bdc324cb6667244bd32ee09760f91819383b30d)

rgw: fix bad user stats on versioned bucket after reshard

User stats should only count bucket index entries that refer to actual
data. So only count entries with categories MAIN or MULTIMETA.

Note: the full solution is provided by the combination of the fixes in
PR 25333 (https://github.com/ceph/ceph/pull/25333) and these changes.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 8cd7ff99dd6cb7b3d63b80e09c8a2f229445e0a1)

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

When the user changes bucket versioning status from Enabled->Suspended
and vice versa, MFA code needs to be validated, if MFA has been enabled
for the bucket.

Fixes tracker issue #42911

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

rgw: allow reshard log entries for non-existent buckets to be cancelled

The radosgw-admin tool allows admins to add buckets to the reshard log
and to cancel buckets from the reshard log. Both operations check for
the existence of the bucket before proceeding and fail for nonexistent
buckets.

It's possible, however, for an admin to add a bucket to the reshard
log and then, before the bucket is resharded, for a user to delete the
bucket. This leaves the entry in the reshard log.

Prior to this commit an attempt to use radosgw-admin to cancel the
reshard log entry would fail. With this commit it will still fail
*but* notify the user they can use the --yes-i-really-mean-it
command-line option to do it nonetheless. And if the user includes
that option, it will succeed.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 9f893a7398716127711a0baaa937070a495a7a56)

Conflicts:
src/rgw/rgw_admin.cc
- mimic has "g_conf->rgw_reshard_bucket_lock_duration" where master has
  store->ctx()->_conf.get_val<uint64_t>("rgw_reshard_bucket_lock_duration")

rgw: auto-clean reshard queue entries for non-existent buckets

It is possible for a bucket to be added to the reshard queue and then
to be removed before its entry in the reshard queue is processed. When
this is now encountered, processing of the reshard queue errors out.

This fix recognizes when the reshard queue entry refers to a
non-existent bucket and remove the entry from the reshard queue,
allowing processing of the queue to continue.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 304ad8803292e92911e86b84c39a6c2ff0d0121b)

Conflicts:
src/rgw/rgw_reshard.cc
- omitted cosmetic change in get_bucket_info arg list

mgr/prometheus: report per-pool pg states

This commit adds per-pool pg states metrics
with unique 'pool_id' label.

Signed-off-by: Aleksei Zakharov <zakharov.a.g@yandex.ru>
(cherry picked from commit 8fb16e43e6a21989ee6f0a45551d65f740011595)

 Conflicts:
src/pybind/mgr/prometheus/module.py