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

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

Merge pull request #32871 from shyukri/wip-43118-mimic

mimic: ceph-volume: import mock.mock instead of unittest.mock (py2)

Merge pull request #32865 from shyukri/wip-43463-mimic

mimic: ceph-volume/lvm/activate.py: clarify error message: fsid refers to osd_fsid

Merge pull request #32875 from shyukri/wip-43322-mimic

mimic: ceph-volume: use correct extents if using db-devices and >1 osds_per_device

Merge pull request #32861 from shyukri/wip-43282-mimic

mimic: ceph-volume: util: look for executable in $PATH

Merge pull request #32866 from shyukri/wip-42966-mimic

mimic: ceph-volume: check if we run in an selinux environment

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

Merge pull request #32867 from shyukri/wip-42972-mimic

mimic: ceph-volume: check if we run in an selinux environment, now also in py2

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

mon: Don't put session during feature change

The session gets put as result of the set_session call in the next
block.

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

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

On Linux system it is possible to set 64 character length hostname when
HOST_NAME_MAX is set to 64. It means that if we execute gethostname
function we should expect HOST_NAME_MAX characters + 1 for null
character ending hostname string as described here:
http://man7.org/linux/man-pages/man2/sethostname.2.html

With the current code on host with 64 long hostname osd during start
updates crush map with host=unknown_host.

Signed-off-by: Michal Skalski <mskalski@juniper.net>
(cherry picked from commit 5201048bbb16d6b4833585b9998c9d0364aaeac4)

Merge PR #33130 into mimic

* refs/pull/33130/head:
mimic: common/config: parse --log-early but ignore it

mimic: common/config: parse --log-early but ignore it

Ideally we woudl backport 933d5084cb66f299a7bf60f0a2a6382c0bd3cb2f, but
it does not apply cleanly to mimic.  Among other things, we modifies
behavior that changed in cd6a5b9c40779956629803f222c365bdb291a169 and
the related commits, which is non-trivial and not worth backporting.

We want this in mimic anyway because ceph_manager.py is now passing it
for all of the raw_cluster_cmds, and it would be even more awkward to
make that behavior conditional on version.

Fixes: https://tracker.ceph.com/issues/43946
Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #33124 from jan--f/wip-42897-mimic

mimic: ceph-volume: make get_devices fs location independent

Merge pull request #32528 from jan--f/wip-42704-mimic

mimic: ceph-volume: reject disks smaller then 5GB in inventory

Merge pull request #32557 from shyukri/wip-43023-mimic

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

Merge pull request #32559 from shyukri/wip-43276-mimic

mimic: ceph-volume/test: patch VolumeGroups

ceph-volume: refactor tests for refactored get_devices

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

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)

ceph-volume: reject disks smaller then 5GB in inventory

Volumes smaller than 5GB won't be created anyway. This also guards
against drives with size 0, as can happen in mdraid setups.

Fixes: http://tracker.ceph.com/issues/40776
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 34bd75a942daff305789c9ccd378f99e05ae1434)

mgr/telemetry: check get_metadata return val

get_metada() returns 'None' when requesting a missing service, hence
trying to access its content fails. Added a check for osd and mgr
get_metadata() calls.

Fixes: https://tracker.ceph.com/issues/43642
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit 9e7a0cbb6f12840217b8f854ed516e44ca8c831e)

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

(cherry picked from commit a1e0d623d5026baec9d1e6ed83201c3fb326fc10)

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)

Conflicts:
src/common/util.cc
- omitted modification of "mem_cgroup_limit" block which is not there in
  mimic

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)

ceph-volume: use correct extents when using db-devices and >1 osds_per_device

Actual data size depending on osds_per_device needs to be calculated here. Otherwise, if osds_per_device is greater than 1, ceph-volume will allocate 100% of the device to the first osd and then fail to create the LV for the second because the volume group is already full.

Fixes: https://tracker.ceph.com/issues/39442
Signed-off-by: Fabian Niepelt <f.niepelt@mittwald.de>
(cherry picked from commit ecde6cd619605003706f545b0b5ad4e2e8932f28)

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

ceph-volume: import mock.mock instead of unittest.mock (py2)

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

 Conflicts:
src/ceph-volume/ceph_volume/tests/api/test_lvm.py

 ceph-volume: python2 raises OSError on Popen with missing binary.

For compatibility alias FileNotFoundError to OSError.

Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 12c5f89ddb51a1db9399e03591e1db6c429b9c9e)

ceph-volume: py2 compatibility for selinux test

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

ceph-volume: don't assume SELinux

Expect selinux related binaries to not be present.

Fixes: 33c8a64a54d9ea8962091caf8564cea3f603c5f5
Fixes: https://tracker.ceph.com/issues/42957
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 72b79f71fa84fe0d56b2fd1745f5bb130380cc38)

ceph-volume: fix test test_selinuxenabled_doesnt_exist

Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.

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

lvm/activate.py: clarify error message: fsid refers to osd_fsid

Users complained[1] the error message isn't clear, and they thought
it referred to the cluster fsid instead of the osd_fsid.
Made it clearer.

[1] rook/rook#4547

Fixes: https://tracker.ceph.com/issues/43442
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
(cherry picked from commit ff3ba9200a6b5856fbdf4372fe292a7b94dd2539)

ceph-volume: util: look for executable in $PATH

Fixes: https://tracker.ceph.com/issues/36728
Fallback to predefined paths for backward compatibility.
Alter test involved for partial match in warning

Signed-off-by: Shyukri Shyukriev <shshyukriev@suse.com>
(cherry picked from commit a8577085dc52b0f214d9568c29a9605d1a826a45)

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

According to the path restriction example, the filesystem name
should be cephfs_a, not cephfs.  Converge on cephfs_a to avoid it
being confused with with the pool tag, which is always cephfs.

This was introduced in 160c4bfeb811 ("mon/AuthMonitor: Use new osd
auth caps for ceph fs authorize").

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

Conflicts:
doc/cephfs/client-auth.rst [ commit e7a7cf429ef3 ("doc:
  filesystem to file system") not in mimic ]

Merge pull request #32544 from jan--f/c-v-backport-pr27282

mimic: ceph-volume: add utility functions

Merge pull request #32598 from trociny/wip-43498-mimic

mimic: rbd-mirror: make logrotate work

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

Merge pull request #32361 from dzafman/wip-41255-mimic

mimic: osd: backfill_toofull seen on cluster where the most full OSD is at 1%

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

Merge pull request #31957 from dzafman/wip-balancer3-mimic

mimic: mgr: Release GIL and Balancer fixes

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

Merge pull request #31847 from smithfarm/wip-42990-mimic

mimic: tests: kernel.sh: update for read-only changes

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

Merge pull request #31557 from jan--f/wip-42765-mimic

mimic: mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore