Merge pull request #41982 from neha-ojha/wip-50989-pacific

pacific: mon/OSDMonitor: drop stale failure_info even if can_mark_down()

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

Merge pull request #42016 from rhcs-dashboard/wip-50773-pacific

pacific: mgr/dashboard: fix typo: Filesystems to File Systems

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: navinbarnwal <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #42008 from rhcs-dashboard/wip-51180-pacific

pacific: mgr/dashboard: fix for right sidebar nav icon not clickable

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: aaryanporwal <NOT@FOUND>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #41948 from rhcs-dashboard/wip-51273-pacific

pacific: mgr/dashboard: bucket details: show lock retention period only in days

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #41913 from sebastian-philipp/pacific-backport-41265-41746-41556-41632-41805-41799-41846-41820-41813-41346-

pacific: cephadm: june batch 3

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

mgr/dashboard: fix typo: Filesystems to File Systems

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 9879b442acb122b8a5842a3ea9d979272e738572)

mgr/dashboard: fix typo: Filesystems to File Systems

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 537b5e70d97b8097b14d160355c6e4e23a18732e)

mgr/dashboard: fix typo: Filesystems to File Systems

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit e55ff44dfbbfb4687a496e284ca42848d6b17761)

mgr/dashboard: fix typo: Filesystems to File Systems
Added breadcrumbs and edited Filesystem -> File Systems in dashboard
Navigation.

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 432e3279366e61e85f337c81609e4ec9a5592765)

Merge pull request #41503 from idryomov/wip-50931-pacific

pacific: rbd-mirror: fix segfault in snapshot replayer shutdown

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

Merge pull request #41304 from MrFreezeex/wip-50713-pacific

pacific: librbd/mirror/snapshot: avoid UnlinkPeerRequest with a unlinked peer

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #42010 from trociny/wip-51345-pacific

pacific: test/librbd: use really invalid domain

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

test/librbd: use really invalid domain

in TestMockMigrationHttpClient.OpenResolveFail

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

Merge pull request #41987 from rhcs-dashboard/wip-51326-pacific

pacific: mgr/dashboard: Alertmanager fails to POST alerts

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: fix for right sidebar nav icon not clickable

fixed the responsive sidebar not opening on click event, and close sidebar on clicking tasks and notification list item because it'll be over shadowed by the sidebar
Signed-off-by: Aaryan Porwal <aaryanporwal2233@gmail.com>
(cherry picked from commit 4e53a139d96215477d00eb709c1662d8277cba1d)

Merge pull request #41768 from neha-ojha/wip-50797-pacific

pacific: mon: load stashed map before mkfs monmap

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

Merge pull request #41872 from kamoltat/wip-ksirivad-backport-pacific-fix-49988

pacific: pybind/mgr/progress: Disregard unreported pgs

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

Merge pull request #41893 from cfsnyder/wip-51001-pacific

pacific: rgw: crash on multipart upload to bucket with policy

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

Merge pull request #41877 from ideepika/wip-51241-pacific

pacific: debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #41863 from cfsnyder/wip-50710-pacific

pacific: rgw: radosgw_admin remove bucket not purging past 1,000 objects

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

Merge pull request #41862 from cfsnyder/wip-51094-pacific

pacific: mgr/DaemonServer.cc: prevent mgr crashes caused by integer underflow that is triggered by large increases to pg_num/pgp_num

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

Merge pull request #41755 from ifed01/wip-ifed-tchaikov-wip-rocksdb-pac

pacific: bluestore: use string_view and strip trailing slash for dir listing

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

Merge pull request #40819 from ivancich/wip-50301-pacific

pacific: rgw: radoslist incomplete multipart parts marker

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

Merge pull request #40804 from k0ste/wip-50294-pacific

pacific: mgr/prometheus:Improve the pool metadata

Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

mgr/dashboard: Alertmanager fails to POST alerts

Fixes: https://tracker.ceph.com/issues/51312
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit bbff025b00a62d9292c939ecaf98d9d7464ffecf)

mon/OSDMonitor: drop stale failure_info even if can_mark_down()

in a124ee85b03e15f4ea371358008ecac65f9f4e50, we add a check to drop
stale failure_info reports. but if osdmap does not prohibit us from
marking the osd in question down, the branch checking the stale info
is not executed. in general, it is allowed to mark an osd down, so
the fix of a124ee85b03e15f4ea371358008ecac65f9f4e50 just fails to
work.

in this change, we check for stale failure report of osd in question
as long as the osd is not marked down in the same function. this should
address the slow ops of failure report issue.

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

Merge pull request #41714 from k0ste/wip-51105-pacific

pacific: ceph-volume: fix batch report and respect ceph.conf config values

mgr/dashboard: bucket details: show lock retention period only in days

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

Merge pull request #41891 from s0nea/wip-51053-pacific

pacific: mgr/dashboard: show partially deleted RBDs

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #41818 from rhcs-dashboard/wip-api_label-pacific

pacific: .github/labeler: add api-change label

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #41823 from batrick/i51186

pacific: qa: add async dirops testing

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

Merge pull request #41822 from batrick/i51185

pacific: qa: update RHEL to 8.4

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

Merge pull request #41811 from batrick/i51170

pacific: qa: AttributeError: 'RemoteProcess' object has no attribute 'split'

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

Merge pull request #41691 from kotreshhr/wip-51084-pacific

pacific: mds: Add full caps to avoid osd full check

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

Merge pull request #41294 from kotreshhr/wip-50627-pacific

pacific: client: Fix executeable access check for the root user

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

Merge pull request #41915 from rhcs-dashboard/wip-51259-pacific

pacific: mgr/dashboard: Fix 500 error while exiting out of maintenance

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: Fix 500 error while exiting out of maintenance

When you add a host in maintenance mode and then exit the maintenance
mode, a 500 server error will popup which will interrupt the whole
exit maintenance process and leave the host in an unknown/offline state.
It happened when I was setting the status of the host through the
HostSpec(). With this change, I am using the enter_maintenance api of
the orch to enable the maintenance.

Fixes: https://tracker.ceph.com/issues/51218
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit ea89b60e3f5e73a653eebf5cdcc3227acb7b2e62)

Conflicts:
     src/pybind/mgr/dashboard/controllers/host.py
 - Removed the addr and label variables since its not backported yet to
   pacific
 - Removed Versioning since for pacific this endpoint is not yet
   versioned to 0.1
src/pybind/mgr/dashboard/services/orchestrator.py
 - Removed the addr and label variables since its not backported yet to
   pacific
src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.ts
 - Didn't included this file because the changes in there are irrelevant
   in pacific
src/pybind/mgr/dashboard/openapi.yaml
 - Regenerated the openapi file

doc/cephadm: removing "Octopus" from procedure

This PR removes "Octopus" from the curl-based installation
procedure.

After we moved on to Pacific, referring to Octopus looks wrong.
It looks wrong because it now is wrong.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 1036edd69ab91144ab5e1185f11eae18fdd00f0b)

mgr/cephadm: skip ok-to-stop for mds in upgrade if not enough mds daemons

Fixes: https://tracker.ceph.com/issues/50817
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 2bfc4bdccfc25bc336dc5d6a472b6fd94337beef)

mgr/cephadm: unit test for _enough_mds_for_ok_to_stop

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit dde64400ed6ab428c7dc60a0d92d7321d272f208)

cephadm: throw error when trying to add some unsupported repos

we son't have any repos available for fedora os always error there.

unlike octopus, el7 yum/dnf distros are not supported in pacific
so error there as well.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 32f4d8e0cfb3b013a8bfa5d51fb8da3fe9aff3a5)

cephadm: use gpg key for add-repo on ubuntu/debian

We were using the ascii version of the gpg key which
was marked as an unsupported filetype by apt-get which
caused apt-get to not make use of the repo source we
were adding.

Additionally, added aomething to make sure we update the
package list after adding the source and key

Fixes: https://tracker.ceph.com/issues/44972
Fixes: https://tracker.ceph.com/issues/45009
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 54055381fd61d290bf3b44ec01e7d4f3a0eb5f1c)

cephadm: add log warn when unable to infer mon ip addr

fixup for `--mon-ip` bootstrap test (introduced b3e2c43):
  ValueError: 'eth0' does not appear to be an IPv4 or IPv6 address

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ae7271d47da01dfeb90ed643da2cba91fc8fa2ce)

cephadm: raise `Error()` when unable to bind to an ip

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit db8d2a25c30dd25c468de598678dd15c81f3d19e)

cephadm: remove unit test inheritance

avoid running the `TestCephAdm` tests twice

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9939573adb60aa999ea7e6233d71ed119c058d7a)

doc: fix typo in option

Fixes: https://tracker.ceph.com/issues/51214
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3511c83c6bf7519e2183b922e81805d5f18a50cb)

cephadm: validate `--fsid` during bootstrap

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 37ff72ac9ba377abd7115f5fa6db9488fa374645)

cephadm: set TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728

This used to live in /etc/{sysconfig,defaults}/ceph, but that does not
apply inside the container.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 140653be0b26293fe2ebe97dadd8bd9dc41f6d99)

mgr/cephadm: fix errors in command <ceph orch osd> help and documentation

Resolves: https://tracker.ceph.com/issues/51043

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit cd5584f86b782732bb9f2a4480298a271d639901)

mgr/cephadm: unit test for orch ls --service-type flag usage

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit ea3e6b392dd6ef7fb771486349f6426a462d42ab)

mgr/cephadm: fix --service-type flag in orch ls when service has id

The running daemon count comes out wrong if the service type is
for a service that has an id.

Fixes: https://tracker.ceph.com/issues/50981
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 29ad6b45f313e3c201c6e11d4087e1581b30b617)

mgr/cephadm: When test osd active, it need to add "mock call" to make sure execute correctly

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit 73dd266dc837b9a11d27ee17cbe75f8b6c36c799)

mgr/cephadm: When create osd which include db, _create_daemon will be executed twice. So we should filter the db type

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit ca52b4935111c7bb0439be111f5b6936f3993b3f)

doc/cephadm: rewrite "config ssl/tls f. grafana"

This PR streamlines the grammar in the subsection
called "Configuring SSL/TLS for Grafana" in the
monitoring.rst file. It also corrects the prompt
rst.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit b9554b0840d6973a3abc71d0f816e32c70202dd2)

debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook anymore

per https://www.debian.org/doc/debian-policy/ch-relationships.html

> Recommends
>   This declares a strong, but not absolute, dependency.
>
> The Recommends field should list packages that would be found together
> with this one in all but unusual installations.

ceph-mgr-modules-core provides a set of ceph-mgr modules which are
always enabeld. but the rook module enables ceph-mgr to install and
configure a Ceph cluster using Rook. this module is very useful but
it does not have such a strong connection with ceph-mgr-modules-core.
we can always install it separately for using better intergration with
Rook.

See-also: https://tracker.ceph.com/issues/45574
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 814fb28892370bef3337f90edccfd6f9c00bf350)

rgw: crash on multipart upload to bucket with policy

crash on multipart upload to bucket with policy Fixes: https://tracker.ceph.com/issues/50556

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 413b23a5483d1feb5ea087ee96bd31b14bc0a285)

Conflicts:
  src/rgw/rgw_op.cc
- rgw::sal::RGWObject renamed to rgw::sal::Object

mgr/dashboard: show partially deleted RBDs

An RBD might be partially deleted if the deletion
process has been started but was interrupted. In
this case return the RBD as part of the RBD list
and mark it as partially deleted.

Fixes: https://tracker.ceph.com/issues/48603
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit d83c277ac1861df31d2a39d16e20c7bebbea676e)

Conflicts:
src/pybind/mgr/dashboard/services/rbd.py
Fixed minor imports conflict.

Merge pull request #41815 from sebastian-philipp/pacific-backport-41555-41444-41693-41653-41241-41242

pacific: cephadm: june batch 2

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

Merge pull request #41680 from neha-ojha/wip-50706-pacific

pacific: osd/PG.cc: handle removal of pgmeta object

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

pybind/mg/progress: Disregard unreported pgs

The global recovery event progress calculations only
takes into account pgs with `reported_epoch < start_epoch_of_event`
but sometimes the pgs doesn't get move before or after the creation
of the global recovery event, therefore this might result in a bug
where the global event gets stuck forever unless there is another
event that specifically makes the pgs that get stuck moves and updates
its `reported_epoch`.

Therefore, we decided to disregard pgs that are in active+clean state
but has `reported_epoch < start_epoch_of_event`.

Fixes: https://tracker.ceph.com/issues/49988
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 4b00f1c2bd5b15bcf7e5d143eebb2168c007b602)

rgw: radosgw_admin remove bucket not purging past 1,000 objects

The zipper refactoring combines use of old is_truncated variable and
newer structure that manages is_truncated. This prevented advancing
past the first page of 1,000 entries.

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

Conflicts:
src/rgw/rgw_sal_rados.cc

mgr/DaemonServer.cc: prevent integer underflow that is triggered by large increases to pg_num/pgp_num

This fixes a scenario where mgrs continually crash while attempting to apply large increases to pg_num/pgp_num. The max step size (estmax) for each incremental update to the pgp_num is calculated as a percentage of the pg_num, which permits the possibility for the max step size (estmax) to be greater than the current pgp_num when the increase is large; this causes an integer underflow when the max step size is subtracted from the pgp_num in order to calculate the next step size with std::clamp. The integer underflow causes hi < lo in args passed to std::clamp, which causes a failed assertion, SIGABRT, and ultimately crashing mgr.

Fixes: https://tracker.ceph.com/issues/47738
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit b4316d257e928b3789b818054927c2e98bb3c0d6)

qa: test nowsync option in kernel client workflows

Fixes: https://tracker.ceph.com/issues/49341
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 84ae38594db0e8ac39bfd3a025dae277fe1ad44c)

qa: deep merge top level overrides for fuse/kclient

This allows for array/dict configs like mntopts to accumulate changes
from multiple yaml fragments.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 88f74dbfa634b904253fc14ab4787e51a7a4f9c4)

qa: update RHEL to 8.4

Fixes: https://tracker.ceph.com/issues/51082
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b9bf490974872e9172b9b562907011b10ab7e18d)

Merge pull request #41634 from rhcs-dashboard/wip-51038-pacific

pacific: mgr/dashboard: fix base-href

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

.github/labeler: add api-change label

To flag PRs changing the Ceph REST API. It might also work for another
APIs.

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 756d4b18aa9cb8590d2edb92de803b8f589247df)

doc/dev/cephadm: cephadm bootstrap --shared_ceph_folder

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 5f1aa05563fe3a2fc54ef02d39ad279f573da914)

mgr/cephadm: allow monitoring stack services to bind to network and port

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit adecb2d2dad5732d610d53181e41d195819bdbb8)

doc/cephadm: enriching "setting a limit"

This PR improves the flow and syntax of the
sentences in the "Setting a Limit" section of the
"Service Management" chapter of the cephadm documentation.
(This section is about setting limits to the number of
daemons created, and about limiting the creation of daemons
to a specified number of hosts.)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 8db4a8458f4fbaad2b556ec9c2313d370467e5d3)

cephadm: add `--allow-fqdn-hostname` test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0f210b0578cddd5cf6cd21d85d72c21b75209bea)

cephadm: add `--config` test

follow-up test for:
https://github.com/ceph/ceph/pull/41351

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9bfdf31166ceadb3f9452a5f84116162eb252c55)

cephadm: add `bootstrap --mon-ip` test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b3e2c4393bbf390c99090469166b31f4445b3686)

cephadm: add `bootstrap --skip-mon-network` test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 849d00b1a5645363f1f37fb19c54b86214cf91d2)

cephadm: add basic `bootstrap` test

bootstrap requires --mon-ip or --mon-addrv

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit c61f80560bac367a339210bebfd3d3676b956964)

cephadm: move podman/docker test mock

to use as a default value in the fixtures

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3060962926bc69f03e11352f637d3586143d4ac6)

Conflicts:
src/cephadm/tests/test_cephadm.py

cephadm: add cephadm ContextManager

to mock the CephadmContext during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3e714ef1dcd4d30816932fdb35e8abcde773dca8)

cephadm: add pyfakefs fixture

to mock the cephadm filesystem

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d5eac27833ea830f35fb0d75bc205cf85e4256e4)

cephadm: clean-up imports

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8fb0a5019c8ba7bf031eed7020bce10afff988e1)

cephadm: rework mismatched release check

allow for `--allow-mismatched-release` to be passed during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 969eccffe92f337f8111347043063c665c67db94)

cephadm: move `json_loads_retry` func

move inner func `json_loads_retry` so it can be mocked during unit tests

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit dc8b7db7729cbb24b350de3c8bf2db34e73cd789)

cephadm: always require a CephadmContext

it's not possible for the CephadmContext to be a NoneType

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 054f555afb6c0081f7b37a23932ff51d901092c7)

doc/cephadm: rewrite "deploy. mon. w/cephadm" 2/2

This is the second half of PR#41241.

This PR creates a sub-subsection that explains
a configuration step that is sometimes necessary
when configuring monitoring in Ceph clusters. (The
configuration step involves DNS zones.)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 808c91233c005ca7df8a7b43279915d6382ea26b)

doc/cephadm: rewrite "deploy. mon. w/cephadm"

This PR corrects various minor usage errors in
the subsection "Deploying Monitoring with cephadm"
of the "monitoring" section of the cephadm guide.

It also adds prompts, and cleans up the list rst a
bit.

This is the first of two PRs planned for this section.
The second PR will create a sub-subsection that explains
an additional installation step that is necessary when
a Ceph cluster and a user accessing that cluster are in
different DNS zones. But that's another story, for another
PR.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit e8419b53fbfd143c37ae80b0eeb441c26c5316f1)

Merge pull request #41086 from smithfarm/wip-50358-pacific

pacific: make-dist: refuse to run if script path contains a colon

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

Merge PR #41596 into pacific

* refs/pull/41596/head:
mds: do not infinitely recursively print a metric
mds: do not assert when receiving a unknow metric type

Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #41685 from batrick/i51085

pacific: mds: scrub error on inode 0x1

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

Merge pull request #41659 from batrick/i51070

pacific: qa: test_ephemeral_pin_distribution failure

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

qa: fetch stdout from rados calls

This test no longer exist in master so the changes were misapplied
during backport.

Fixes: https://tracker.ceph.com/issues/51170
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #41044 from leseb/bkp-40157

pacific: mgr/pybind/snap_schedule: do not fail when no fs snapshots are available

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #41577 from rhcs-dashboard/wip-50664-pacific

pacific: mgr/dashboard:include compression stats on pool dashboard

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #41769 from ivancich/wip-51138-pacific

pacific: rgw: completion of multipart upload leaves delete marker

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

Merge pull request #41777 from rhcs-dashboard/wip-51135-pacific

pacific: mgr/dashboard: simplify object locking fields in 'Bucket Creation' form

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #41549 from rhcs-dashboard/pacific-npm-revert

Revert "pacific: mgr/dashboard: Generate NPM dependencies manifest"

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: simplify object locking fields in 'Bucket Creation' form

- UI: The object locking retention period must be expressed in days.
  Years value from API (as API keeps param parity with RGW API) are converted to days.
- API: add more validation and increase test coverage.

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

mon: load stashed map before mkfs monmap

After mkfs the store may not yet contain monmap:last_committed but
might be respawning after setting mon_sync:temp_newer_monmap.
Load that stashed map before falling back to the mkfs:monmap.

Fixes: https://tracker.ceph.com/issues/50230
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit cc0b4c77753962717da8a280a585990f7eec3c7b)

rgw: completion of multipart upload leaves delete marker

The multipart upload meta object is deleted when the multipart upload
is completed. When the bucket is versioned, it needs to be deleted
from the bucket index rather than go through versioning delete process
that adds a delete marker to the bucket index rather than simply
removing it from the bucket index.

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

Conflicts:
  src/rgw/rgw_op.cc        : adapted to significant Zipper mods
  src/rgw/rgw_rados.cc     : adapted to significant Zipper mods
  src/rgw/rgw_rados.h      : adapted to significant Zipper mods
  src/rgw/rgw_sal.h        : adapted to significant Zipper mods
  src/rgw/rgw_sal_rados.cc : adapted to significant Zipper mods
  src/rgw/rgw_sal_rados.h  : adapted to significant Zipper mods

Merge pull request #41675 from aaSharma14/wip-51037-pacific

pacific: mgr/dashboard: API Version changes do not apply to pre-defined methods (list, create etc.)

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #41475 from vshankar/wip-cephfs-mirror-pacific-backports

pacific: cephfs-mirror backports

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

Merge pull request #41576 from adamemerson/wip-50982-pacific

rgw: Simplify log shard probing and err on the side of omap

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