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)

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>

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)

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)

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

logrotate: also sighup rbd-mirror

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 86424fc3c895995d1d45f067c7852e6dce993027)

Conflicts:
src/cephadm/cephadm (does not exist)

rbd-mirror: reopen all contexts logs on SIGHUP

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 9ddf111506611a596c713ffe861a41aeda05e7a5)

Conflicts:
src/tools/rbd_mirror/Mirror.cc (std::lock_guard vs Mutex::Locker, ceph_abort_msgf does not exist)
src/tools/rbd_mirror/PoolReplayer.cc (std::lock_guard vs Mutex::Locker)

rbd-mirror: delay local/remote rados initialization until context created

We rely on that if a rados ref is initialized it contains the
valid context.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit f3b49191771d2a3a20a7f55a14e0a7482ee96172)

mgr: Change default upmap_max_deviation to 5

Fixes: https://tracker.ceph.com/issues/43312
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b0a1b758d012dfea40db3feca1a841c96f79defe)

Conflicts:
src/pybind/mgr/balancer/module.py (default isn't in COMMANDS section)
        qa/standalone/mgr/balancer.sh (setting upmap_max_deviations to 1 differ)

osdmaptool: Add --upmap-active to simulate active upmap balancing

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 621acf8ce7f48253e9d2189a9a2ee432fa1d3ba1)

Conflicts:
src/test/cli/osdmaptool/help.t (some options not present)
src/tools/osdmaptool.cc (ceph_assert is assert here)

doc: Add upmap options to osdmaptool man page and give example

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 184e9d1ae3b5bcc332d5fe3330d46a5cb8fcacd6)

tools: osdmaptool document non-upmap options that were missing

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e42a6ccb1819be4988e3ed7bd78fcf513f8d1589)

Conflicts:
doc/man/8/osdmaptool.rst (missing other options not part of this)

ceph-volume/test: patch VolumeGroups

In ceph_volume/tests/devices/lvm/strategies/test_bluestore.py the test
TestMixedType.test_filter_all_data_devs must patch VolumeGroups.

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

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

Fixes: https://tracker.ceph.com/issues/43017
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0d7b61d20423aeba842e0685428c42aa9000a88a)

ceph-volume: add test for create_lv using a PV

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 90d296b302e74b59fc67c395b4d08537e2d37a1e)

ceph-volume: add tests for tags

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit c88a6a8ad38410c60ea4945b46da6b3d458c0ff6)

ceph-volume: add tests for reduce_vg()

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 1f07776615b7bba5eacf34a8c9fa62c06a57eb4b)

ceph-volume: add tests for size_from_human_readable()

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 6e3b5306140a433667d1be95df2eba0b57d95ae9)

ceph-volume: add function to convert from a readable string to Size

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 50428062175623d561be01a8124e010a61221845)

Merge pull request #32530 from jan--f/wip-42754-mimic

mimic: ceph-volume: allow to skip restorecon calls

Merge pull request #32529 from jan--f/wip-42752-mimic

mimic: ceph-volume: add proper size attribute to partitions

ceph-volume tests validate restorecon skip calls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 01e7a14fdc48d6c328502d1fea3069dbb3098b1b)

ceph-volume util.system allow skipping restorecon calls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 33c8a64a54d9ea8962091caf8564cea3f603c5f5)

ceph-volume: add proper size attribute to partitions

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

Merge pull request #31552 from jan--f/wip-42740-mimic

mimic: ceph-volume: use fsync for dd command

ceph-volume: use fsync for dd command

fsync makes sure that data and metadata is actually written to device
being zapped before finishing.

Fixes: https://tracker.ceph.com/issues/39156
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 060f54960c3d2d800b28525ba8774a60578f67a8)

Merge pull request #31407 from smithfarm/wip-42533-mimic

mimic: ceph-volume: rearrange api/lvm.py

Merge pull request #31406 from smithfarm/wip-42534-mimic

mimic: ceph-volume: mokeypatch calls to lvm related binaries

osd: Rename backfill reservation reject names to reflect too full use

The only reason for a reject is in a too full condition.  Now that we
have two types of revoke, let's make this clearer.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 0115595c1d1366cb3633e9dc6730496b9e5cf5c4)

Conflicts:
src/osd/PeeringEvent.h
- file does not exist in nautilus due to refactoring: made the changes manually to src/osd/PGPeeringEvent.h
src/osd/PeeringState.cc
src/osd/PeeringState.h
- files do not exist in nautilus due to refactoring: made the changes manually to src/osd/PG.{cc,h}
  by doing:
      s/RejectRemoteReservation/RejectTooFullRemoteReservation/g
      s/RemoteReservationRejected/RemoteReservationRejectedTooFull/g

osd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7810ee584cc0fe9ca1b819d2a807dfc7cd13d292)

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

osd: Don't set backfill_toofull in RemoteReservationRevoked path

We shouldn't set backfill_toofull when a revoke occurs in the non-toofull
case.

Fixes: https://tracker.ceph.com/issues/41255
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit fa569ecfecc43ce685b29e0456f62cb085788f25)

Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
  to src/osd/PG.cc
- no "DECLARE_LOCALS" in nautilus

Merge pull request #32214 from smithfarm/wip-43235-mimic

mimic: tests: radosgw-admin: remove dependency on bunch package

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

Merge pull request #32255 from ideepika/wip-43315-mimic

mimic: doc: wrong datatype describing crush_rule

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

Merge pull request #32228 from alimaredia/wip-s3-tests-branch-name-refactor-mimic

mimic: update s3-test download code for s3-test tasks

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

mimic: update s3-test download code for s3-test tasks

Fixes: https://tracker.ceph.com/issues/43077
- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-mimic the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks

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

doc/rados/operations: crush_rule is a name

like
```
ceph osd pool set <pool-name> crush_rule <rule-name>
```
where `<rule-name>` is a string instead of a number.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3ed3de6c964ba998d5b18ceb997d1a6dffe355db)

Merge pull request #32249 from neha-ojha/wip-32197-mimic

mimic: doc/_templates/page.html: redirect to etherpad

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

doc/_templates/page.html: redirect to etherpad

This simplifies things for users who are not able to add cards to
https://github.com/ceph/ceph/projects/4 due to insufficient permissions.

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

13.2.8

qa: radosgw-admin: remove dependency on bunch package

Fixes: https://tracker.ceph.com/issues/43184
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 1bf21326aa7f8eaafd7049b44eb73aeb36bcc5d7)

release note: Add pending release notes for already merged code

Follow on to https://github.com/ceph/ceph/pull/31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03bae8b4f50cc3cbaa50640eaeab4cabd711f)

Merge pull request #32087 from yuriw/wip-yuriw-p2p-mimic

qa/tests: added missing ponit release versions

qa/tests: added missing pnoit release versions

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #32033 from cbodley/wip-qa-swift-mimic

qa/rgw: add missing force-branch: ceph-mimic for swift tasks

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #32000 from smithfarm/wip-43119-mimic

mimic: osd: fix sending incremental map messages (more)

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

qa/rgw: add missing force-branch: ceph-mimic for swift tasks

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

test: Fix test to use -gt instead of creating an empty file "0"

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d0b260c272cf2732437c838c80ab380b4bb8d433)

test balancer: Backport specific fixes

Add "ceph balancer sleep" command to set balancer sleep_interval for testing
Remove unavailable "ceph balancer pool" part of testing
Remove setting of nonexistant osd_pool_default_pg_autoscale_mode
Improve balancer module log message
Fix log message test (no pg merging)
Pool balancing isn't grouped by rule, so results different here

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

qa/standalone/ceph-helpers.sh: fix mgr module path

callers of get_python_path were not passing in a $1 parameter, so
ceph_lib was an empty string resulting in an invalid path to the built
cython modules. assume this is called from the `lib` parent directory.

pass path to the manager modules when starting ceph-mgr.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit 7d3fa9bda3b0160c872e388c9f75cd1cabf9d4b5)

osd: do not send peers really old maps

We may receive a message that sat in a queue for a while with a low
priority and is tagged with an older epoch.  Don't send a bunch of old
maps that we have already sent the peer.

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

osd: build_incremental_map_msg: recover if we are missing an incremental

If we are building a history and are missing an incremental, continue with
a full map in its place.

Generally speaking, an OSD should *always* have a full map stored, but
may not have the corresponding incremental for various reasons.

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

osd: build_incremental_map_msg: behave if we have latest full but not incremental

Fixes 47a3f63ef71522d6b9572e81674598dd3e19df9d and
follow-on 57a13adc8d0e34b4bb1a4022eacbb3de2636df53

Fixes: http://tracker.ceph.com/issues/38330
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e861f03b943653a1b3f595d31e1f25a482a9482b)

tools/osdmaptool.cc: do not use deprecated std::random_shuffle()
the use of `std::random_shuffle()` was introduced by
b946308 .

in this change, it is replaced using `std::shuffle()`.

Fixes: https://tracker.ceph.com/issues/43084
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 30dfef208d859a67c1f1b13c314735861c536e85)

Conflicts:
src/tools/osdmaptool.cc (randomizing pools here instead of rules)

test: Add test case based on Xie script in commit comment

Other test fixes to reflect changes

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9d2e0267e1f025a634ee4925c919008cacdd3d38)

Conflict:
src/test/cli/osdmaptool/upmap-out.t (older output format)
src/test/cli/osdmaptool/upmap.t (older output format)

osd: ceph_pg_upmaps() use any overfull when there are still underfull

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f38d38398f33f64bd49f017b1c8e737452157c53)

osd: Create more_underfull with below target that aren't in underfull

Use more_underfull for finding remaps for overfull OSDs

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit fe03383e6691f6bd95189d3ba4d91fbb2ea9e9c8)

osd/OSDMap.cc: don't output over/underfull messages to lderr

There can be cases where overfull and underfull(see example in
https://tracker.ceph.com/issues/42756) will be empty, which is not
necessarily an error. These error messages can end up spamming
the ceph-mgr log.

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

osd: calc_pg_upmaps() pick most overfull remap from try_pg_upmap()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3f132061fd33c82dc131e18ae80cbec067b53cae)

osd: ceph_pg_upmaps() use max_deviation to determine perfect distribution

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7f4ae9312314c329b63c850e09b403a95ad18bed)

Conflicts:
src/pybind/mgr/balancer/module.py (upmap_max_deviation config option
   handled differently)

tools: osdmaptool: Perform upmap calculation as ceph-mgr does

This is the backportable commit that works with older balancer module.py

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b946308f03f1798915fafe7878f34b4a234c2ae4)

osd: For balancer crush needs the rule passed to get_parent_of_type()

Fixes: https://tracker.ceph.com/issues/42718
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3eb69fd0cb15974e33e675babdd5d232d69c3c6d)

osdmaptool: Match default max value of 10

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 91bab14ea0e2ec7c94eb758cd76f9a620688725f)

tools: odsmaptool truncate target upmap file

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a49324ceb9c322f792ea00720f438ea9ea09555f)

mgr: Improve balancer module status

Add balancer status fields so that slow optimizations can be detected

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f04c505b9dc128bdfbcca49d82f8aac4abf8b56f)

test: Test balancer module commands

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3a0e2c8ff1cce44bf44b139572f4d1bd9bbfb766)

mgr: Release GIL before calling OSDMap::calc_pg_upmaps()

Prevent optimize and execute commands from running with active balancer

Fixes: https://tracker.ceph.com/issues/42432
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e2a35e8c8e9f381a635ad0ca01326a2c512590a9)

Conflicts:
src/pybind/mgr/balancer/module.py (trivial)
src/test/cli-integration/balancer/misplaced.t (doesn't exist)

qa: kernel.sh: update for read-only changes

Snapshot existence validation code was removed from krbd.  It was racy
and relied on having watch established for snapshots.

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

13.2.7

Merge pull request #31659 from neha-ojha/wip-29704-mimic

mimic: ceph-objectstore-tool: return 0 if incmap is sane

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

Merge pull request #31640 from yuriw/wip-yuriw-42802-mimic

qa/tests: Removed s3tests !

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

ceph-objectstore-tool: return 0 if incmap is sane

this change addresses the regression introduced by 2e2414b3

Fixes: https://tracker.ceph.com/issues/41177
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d03f397544187d7de21d4849f58ce51baafcff8b)

qa/tests: Removed s3tests !

Fixes: https://tracker.ceph.com/issues/42802
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #31615 from jan--f/wip-42801-mimic

mimic: ceph-volume: assume msgrV1 for all branches containing mimic

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

ceph-volume: assume msgrV1 for all branches containing mimic

With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume
that if mimic (or luminous) occur in the branch name, the OSDs are
running msgrv1 only.

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