Merge pull request #51686 from lxbsz/wip-61346

pacific: mds: wait reintegrate to finish when unlinking

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

Merge pull request #51699 from dparmar18/wip-61202-pacific

pacific: MDS imported_inodes metric is not updated.

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

Merge pull request #51687 from vshankar/tr-59725

pacific: mds: allow unlink from lost+found directory

Reviewed-by: Xiubo Li <xiubli@redhat.com>

Merge pull request #51610 from vshankar/tr-59721

pacific: qa: run scrub post file system recovery

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

Merge pull request #51609 from vshankar/tr-61235

pacific: mds: rdlock_path_xlock_dentry supports returning auth target inode

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

Merge pull request #51353 from joscollin/wip-59482-pacific

pacific: cephfs-top: check the minimum compatible python version

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

Merge pull request #51247 from k0ste/wip-52442-pacific

pacific: client: do not dump mds twice in Inode::dump()

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

Merge pull request #51246 from mchangir/wip-59017-pacific

pacific: mgr/snap_schedule: add debug log for paths failing snapshot creation

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

Merge pull request #50737 from joscollin/wip-58984-pacific

pacific: cephfs-top: navigate to home screen when no fs

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

Merge pull request #52323 from batrick/wip-61900-pacific

pacific: pybind: drop GIL during library callouts

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

Merge pull request #52287 from idryomov/wip-59641-pacific

pacific: librbd/managed_lock/GetLockerRequest: Fix no valid lockers case

Reviewed-by: Christopher Hoffman <choffman@redhat.com>

Merge pull request #52285 from idryomov/wip-61616-pacific

pacific: librbd: avoid object map corruption in snapshots taken under I/O

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #52063 from guits/wip-61154-pacific

pacific: ceph-volume: fix a bug in `get_lvm_fast_allocs()` (batch)

Merge pull request #52080 from guits/wip-61698-pacific

pacific: ceph-volume: set lvm membership for mpath type devices

Merge pull request #52477 from rhcs-dashboard/fedora-url-pacific

pacific: mgr/dashboard: Fix broken Fedora image URL

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: zmc <NOT@FOUND>

mgr/dashboard: Fix broken Fedora image URL

This mirror apparently stopped working, breaking jobs that use this
script.

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 3f32ab0fb3a54174a8a57681243cd944056c6ffb)

Merge pull request #52389 from rhcs-dashboard/cleanup-script-pacific

pacific: mgr/dashboard: move cephadm e2e cleanup to jenkins job config

Reviewed-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #50321 from ifed01/wip-ifed-log-before-assert-in-avl-pac

pacific: os/bluestore: allocator's cumulative backport

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>

Merge pull request #51510 from Matan-B/wip-61149-pacific

pacific: OSD: Fix check_past_interval_bounds()

Reviewed-by: Samuel Just <sjust@redhat.com>

mgr/dashboard: move cephadm e2e cleanup to jenkins job config

Follows: https://github.com/ceph/ceph-build/pull/2145

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit a407f0b7834585c087001059d6cec613e524538b)

Merge pull request #52117 from cbodley/wip-61730-pacific

pacific: librados: aio operate functions can set times

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

Merge pull request #51803 from NitzanMordhai/wip-61448-pacific

pacific: test: correct osd pool default size

Reviewed-by: Matan Breizman <Matan.Brz@gmail.com>

Merge pull request #51799 from NitzanMordhai/wip-61450-pacific

pacific: test: monitor thrasher wait until quorum

Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>

Merge pull request #51604 from Svelar/pacific-vstart-mgr-status

pacific: vstart: check mgr status after starting mgr

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

Merge pull request #51316 from rosinL/wip-backport-42082-to-pacific

pacific: common: Use double instead of long double to improve performance

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #51315 from rosinL/wip-backport-41393-to-pacific

pacific: common/crc32c_aarch64: fix crc32c unittest failed on aarch64

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #51254 from k0ste/wip-52892-pacific

pacific: tools/ceph-kvstore-tool: fix segfaults when repair the rocksdb

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

Merge pull request #50980 from batrick/i59296

pacific: MgrMonitor: batch commit OSDMap and MgrMap mutations

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

Merge pull request #52133 from rzarzynski/wip-61740-pacific

pacific: mon/MonClient: before complete auth with error, reopen session

Reviewed-by: Laura Flores <lflores@redhat.com>

pybind/rbd: drop GIL when calling into librbd

This was missing for rbd_mirror_peer_site_add() and
rbd_get_data_pool_id().

While at it, add a test for data_pool_id().

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

Conflicts:
src/test/pybind/test_rbd.py: trivial import conflict

pybind/cephfs: drop gil during cephfs callouts

This has disastorous consequences including the possibility of deadlock.
In the best case, you have the rmdir holding the GIL until the MDS
responds!

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

test/librbd: add empty cookie and blank address tests

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

librbd/managed_lock/GetLockerRequest: Fix no valid lockers case

See:
`m_locker->address = iter->second.addr.get_legacy_str();`

In the case where `iter->second.addr` is an empty address,
m_locker->address string is assigned with "0)/0" and therfore
will never result in an empty string.

Use `is_blank_ip()` before `get_legacy_str()`

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 7482beeea9b1bc8c3cbdac425e7afb8ebdc9f270)

qa/workunits/rbd: make continuous export-diff test actually work

The current version is pretty useless:

- "rbd bench" writes the same byte (0xff) over and over again, so
  almost all checksumming is in vain
- snapshots are taken in a steady state (i.e. not under I/O), so no
  race conditions can get exposed
- even with these caveats, it's not wired up into the suite

Redo this workunit to be a reliable reproducer for the issue fixed
in the previous commit and wire it up for both krbd and rbd-nbd.

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

librbd: stop passing IOContext to image dispatch write methods

This is a major footgun since any value passed e.g. at the API layer
may be stale by the time we get to object dispatch.  All callers are
passing the IOContext returned by get_data_io_context() for their
ImageCtx anyway, highlighting that the parameter is fictitious.

Only the read method can meaningfully take IOContext.

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

Conflicts:
src/librbd/api/Io.cc [ commit 37057ba2f6bb ("librbd: pass
  image_extents to create_{discard,write_same}()") and ImageArea
  support not in pacific ]
src/librbd/cache/ImageWriteback.cc [ ditto ]
src/librbd/io/ImageDispatchSpec.h [ ditto ]
src/librbd/crypto/luks/FormatRequest.cc [ ImageArea support not
  in pacific ]
src/test/librbd/io/test_mock_ImageRequest.cc [ ditto ]
src/test/librbd/journal/test_mock_Replay.cc [ ditto ]
src/librbd/crypto/luks/FlattenRequest.cc [ commit 84601d68a74f
  ("librbd/crypto: add format-specific flattening operation")
  not in pacific ]

librbd: use an up-to-date snap context when owning the exclusive lock

By effectively moving capturing of the snap context to the API layer,
commit 1d0a3b17f590 ("librbd: pass IOContext to image-extent IO
dispatch methods") introduced a nasty regression.  The snap context can
be captured only after exclusive lock is safely held for the duration
of dealing with the image request and even then must be refreshed if
a snapshot creation request is accepted from a peer.  This is needed to
ensure correctness of the object map in general and fast-diff states in
particular (OBJECT_EXISTS vs OBJECT_EXISTS_CLEAN) and object deltas
computed based off of them.  Otherwise the object map that is forked
for the snapshot isn't guaranteed to accurately reflect the contents of
the snapshot when the snapshot is taken under I/O (as in disabling the
object map may lead to different results being returned for reads).

The regression affects mainly differential backup and snapshot-based
mirroring use cases with object-map and/or fast-diff enabled: since
some object deltas may be incomplete, the destination image may get
corrupted.

This commit represents a reasonable minimal fix: IOContext passed
through to ImageDispatch is effected only for reads and just gets
ignored for writes.  The next commit cleans up further by undoing the
passing of IOContext through the image dispatch layers for writes.

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

Conflicts:
src/librbd/io/ImageDispatch.cc [ ImageArea support not in
  pacific ]
src/librbd/io/ImageRequest.cc [ ditto ]
src/librbd/io/ImageRequest.h [ ditto ]
src/librbd/journal/Replay.cc [ ditto ]

test/librados: test ability to set mtimes with aio_operate

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit ec2923453766ddfee2b3dd330610179022b7d3cb)

Conflicts:
src/test/librados/aio.cc:
  removed test case for rados_aio_write_op_operate2()
which wasn't backported
  test case for rados_aio_write_op_operate() uses rados_stat()
instead of rados_stat2() which doesn't exist on pacific
  no test_data.m_oid, used "foo" for oids

Merge pull request #51950 from rhcs-dashboard/wip-61280-pacific

pacific: mgr/dashboard: SSO error: AttributeError: 'str' object has no attribute 'decode'

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #52048 from trociny/wip-61301-pacific

pacific: qa/rgw: add POOL_APP_NOT_ENABLED to log-ignorelist

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #51836 from cbodley/wip-61513

pacific: radosgw-admin: try reshard even if bucket is resharding

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

mon/MonClient: before complete auth with error, reopen session
When monClient try to authenticate and fail with -EAGAIN there is
a possibility that we no longer hunting and not have active_con.
that will result of disconnecting the monClient and ticks will continue
without having open session.
the solution is to check at the end of auth, that we don't have -EAGAIN
error, and if we do, reopen the session and on the next tick try auth again

Fixes: https://tracker.ceph.com/issues/58379
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit f8dad00f07f52d58d8ec67083e8bf568deec3277)

Merge pull request #51876 from idryomov/wip-61382-pacific

pacific: osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile

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

Merge pull request #52017 from ljflores/wip-61604-pacific

pacific: qa/suites/rados: remove rook coverage from the rados suite

librados: rados_write_op_operate() uses ObjectOperationImpl for mtime

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b888821da72de1b02e06693b3e693aab7bc90ad7)

librados: rados_aio_write_op_operate() propagates mtime

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0bfb144ee64fe9ecd3f27cf94fca832e3ab3b39b)

librados: use ObjectOperationImpl for rados_write_op_t

the c++ api uses ObjectOperationImpl to wrap ObjectOperation with
additional storage for an optional mtime. the c api now reuses
ObjectOperationImpl for its write operations only - the mtime isn't
needed for read ops

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4c8f694741b5d4ba38e934f90e91ff269da96e2a)

librados: aio_operate() supports ObjectWriteOperation::mtime2()

copy the optional mtime logic from operate(), so that mtimes set on the
ObjectOperation are propagated through aio_operate() as well

Fixes: https://tracker.ceph.com/issues/61349
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit cdf54ff1ca5ab95ee0559329b0820a1686d21c54)

Merge pull request #51431 from chrisphoffman/wip-59710-pacific

pacific: librbd: localize snap_remove op for mirror snapshots

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

librbd: localize snap_remove op for mirror snapshots

A client may attempt a lock request not quickly enough to
obtain exclusive lock for operations when another competing
client responds quicker. This can happen when a peer site has
different performance characteristics or latency. Instead of
relying on this unpredictable behavior, localize operation to
primary cluster.

Fixes: https://tracker.ceph.com/issues/59393
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit ac552c9b4d65198db8038d397a3060d5a030917d)

Conflicts:
src/cls/rbd/cls_rbd.cc [ commit 3a93b40 ("librbd:
  s/boost::variant/std::variant/") not in pacific ]
src/librbd/mirror/snapshot/UnlinkPeerRequest.cc [ ditto ]

Merge pull request #51856 from petrutlucian94/wip-61525-pacific

pacific: librbd: avoid decrementing iterator before first element

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

Merge pull request #51778 from idryomov/wip-61368-pacific

pacific: tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Reviewed-by: Christopher Hoffman <choffman@redhat.com>

Merge pull request #51429 from chrisphoffman/wip-59506-pacific

pacific: librbd: remove previous incomplete primary snapshot after successfully creating a new one

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

ceph-volume: set lvm membership for mpath type devices

If any lvs is present, self.lvs should be set accordingly for mpath
type devices as well.
Otherwise, when re-running a command like following:

```
ceph-volume lvm batch --bluestore --no-auto  /dev/mapper/mpatha /dev/mapper/mpathb
```

fails with error : "Device /dev/mapper/mpatha has a filesystem."

where the expected behavior is:

```
--> passed data devices: 2 physical, 0 LVM
--> relative data size: 1.0
--> All data devices are unavailable

Total OSDs: 0

  Type            Path                                                    LV Size         % of device
```

Fixes: https://tracker.ceph.com/issues/61673
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 27e39e172c79e490dec0570b39c84b2354b5266b)

ceph-volume: fix a bug in `get_lvm_fast_allocs()` (batch)

`get_lvm_fast_allocs()` in `devices/lvm/batch.py` calls the property
`Device.used_by_ceph` in order to filter out devices that are already
used by ceph. The issue is that `Device.used_by_ceph()` itself filters
out journal devices (db/wal) given that a db/wal device can be shared
between multiple OSDs. The consequence is that `Device.used_by_ceph()`
always returns False for a db/wal device (even if it is actually
already used by ceph) so `get_lvm_fast_allocs()` always returns the
full list of the passed db/wal devices on the `lvm batch` CLI command.
Finally, the logic in `devices.lvm.batch.get_deployment_layout()`
checks whether the length of the list returned by `get_lvm_fast_allocs()`
is equal to `num_osds` (the number of OSD being created), if not it fails.

Fixes: https://tracker.ceph.com/issues/59640
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 8da98bf2ac8cf223904acd971f3a0342bdbd26f9)

qa/rgw: add POOL_APP_NOT_ENABLED to log-ignorelist

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit f0d53e56f8d05090a5f429c8826ca552e0140798)

Conflicts:
qa/rgw/ignore-pg-availability.yaml (trivial)

qa/suites/rados: remove rook coverage from the rados suite

The rook team relies on a daily CI system to validate
rook changes. It doesn't seem that the teuthology tests
are maintained, so it makes sense to remove them from the
rados suite.

By removing this symlink, rook test coverage will remain
in the orch suite, and coverage will only be removed from the
rados suite.

Workaround for: https://tracker.ceph.com/issues/58585
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit c26674ef4c6cbbdd94c54cafbd66e98704f044d7)

mgr/dashboard: SSO error: AttributeError: 'str' object has no attribute 'decode'

The token is `str` in PyJWT >= 2 and Python3. Check `controllers/auth.py` where the same code is used.

Fixes: https://tracker.ceph.com/issues/59689
References: https://github.com/SUSE/ceph/pull/506

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 0fc6e7637657a96acfb0aa01dde6b3fbd81a136d)

Merge pull request #51882 from adk3798/pacific-no-log-to-journald

pacific: doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"

This reverts commit bdb2241ca5a9758e8c52d47320d8b5ea0766aea9.

This commit https://github.com/ceph/ceph/commit/bdb2241ca5a9758e8c52d47320d8b5ea0766aea9
was updating on logging changes in quincy, but seems to have been
erroneously included in a pacific batch backport https://github.com/ceph/ceph/pull/42736

This stuff doesn't work in pacific. For example,

[ceph: root@vm-00 /]# ceph version
ceph version 16.2.13-257-gd8c5d349 (d8c5d34975dce1c5eb0aa3a7979a4d9b9a99d1ec) pacific (stable)
[ceph: root@vm-00 /]# ceph config set global log_to_journald false
Error EINVAL: unrecognized config option 'log_to_journald'

so we shouldn't have it in the pacific docs

Signed-off-by: Adam King <adking@redhat.com>

osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile

This was missed in commit acc447d5de7b ("osd/OSDCap: rbd profile
permits use of rbd.metadata_list cls method") which adjusted only
"profile rbd" OSD cap.  Listing image metadata is an essential part
of opening the image and "profile rbd-read-only" OSD cap must allow
it too.

While at it, constrain the existing grant for rbd profile from "any
object in the pool" to just "rbd_info object in the global namespace of
the pool" as this is where pool-level image metadata actually lives.

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

librbd: avoid decrementing iterator before first element

While trying to merge delayed requests, SimpleSchedulerObjectDispatch
can end up iterating before the first element.

With llvm, this leads to a crash:
https://paste.opendev.org/raw/bxnQqqDtIrkOfVvRfkZ6/

This change adds a check, ensuring that we won't decrement the iterator
before the first map element.

Fixes: https://tracker.ceph.com/issues/61503
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit ca65e85575f7b35ce679309e92e0c9bee8d6b96a)

Merge pull request #51826 from zdover23/wip-doc-2023-05-30-backport-51798-to-pacific

pacific: doc/rados: edit balancer.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

radosgw-admin: try reshard even if bucket is resharding

allow reshard in case a previous reshard failed. if the reshard is
actually still in progress, we'll fail to get the reshard lock

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 122da8f14a1dae247a5f2f62a3a6e219a9c9de8f)

Conflicts:
src/rgw/rgw_admin.cc  no rgw::current_num_shards()

doc/rados: edit balancer.rst

Edit doc/rados/operations/balancer.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d3660aa20d737729dac708264ceed37560362f91)

test: correct osd pool default size
Using the default pool size of 2 with random eio thrashing can cause
some of the object to mark as lost.
fixing typo from 'osd default pool size: 3' to 'osd pool default size: 3'
so we will have pool size 3 correctly.

Fixes: https://tracker.ceph.com/issues/49888
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit c9d98ec31020cc455ba9e40e1c817c8207019ecf)

test: monitor thrasher wait until quorum
With 1 sec. delay we may sometimes fail to get correct length of
quorum since the monitor didn't updated on time.
With the following fix, we will wait for quorum and check every few
seconds (3) until timeout (30).

Fixes: https://tracker.ceph.com/issues/52316
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit fbd10badbfad71f208de6b48008a20963d375ae9)

Merge pull request #51795 from zdover23/wip-doc-2023-05-28-backport-51587-to-pacific-second-attempt

doc/rados: edit bluestore-config-ref.rst (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/rados: edit bluestore-config-ref.rst (2 of x)

Edit the second part of doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthoy D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1ceeab30ebde767aaf675fe46e79b9b7d28b881a)

Merge pull request #51791 from zdover23/wip-doc-2023-05-27-backport-51771-to-pacific

pacific: doc/rados: edit bluestore-config-ref.rst (1 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/rados: edit bluestore-config-ref.rst (1 of x)

Edit the first part of doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Confval directives have been removed from this backport, because they do
not build in the Pacific release branch.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 3879e4ad417dddef1247521c199925a679d490ac)

Merge pull request #51647 from adk3798/pacific-prom-ret-size

pacific: mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Signed-off-by: Chen Yuanrun <chen-yuanrun@foxmail.com>
Fixes: https://tracker.ceph.com/issues/61368
(cherry picked from commit e10bcb6905b7e4da4b3a04307d3a2b546da6d5b1)

mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option
fixes: https://tracker.ceph.com/issues/57422

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 4da92c59597dcbf0bba4be50db73233e34108ca9)

Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py

Merge pull request #51517 from adk3798/pacific-custom-config

pacific: mgr/cephadm: support for miscellaneous config files for daemons

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #51757 from zdover23/wip-doc-2023-05-25-backport-51754-to-pacific

pacific: doc/rados: fix link in common.rst

doc/rados: fix link in common.rst

Fix a link in doc/rados/configuration/common.rst that was missing its
final letter, causing a 404 error when readers attempted to follow it.

This bug was reported by stalwart friend of the Ceph documentation
project Eugen Block, who is here credited as a co-author. This bug was
reported at https://pad.ceph.com/p/Report_Documentation_Bugs.

Co-authored-by: Eugen Block <eblock@nde.ag>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8128ce20fef3d75c6251691d10af21861c01e155)

Merge pull request #51753 from zdover23/wip-doc-2023-05-25-backport-51745-to-pacific

pacific: doc/rados: edit filestore-config-ref.rst

doc/rados: edit filestore-config-ref.rst

Edit doc/rados/configuration/filestore-config-ref.rst.

https://tracker.ceph.com/issues/58485

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1202e4207bc182d83f193adb1557359d52687103)

Merge pull request #51075 from aaSharma14/wip-59446-pacific

pacific: mgr/dashboard: Fix rbd snapshot creation

Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #51113 from rhcs-dashboard/wip-59460-pacific

pacific: mgr/dashboard: expose more grafana configs in service form

Reviewed-by: Pegonzal <NOT@FOUND>

Merge pull request #51741 from zdover23/wip-doc-2023-05-25-backport-50858-to-pacific

pacific: doc/rados/operations: Acting Set question

Merge pull request #51744 from zdover23/wip-doc-2023-05-25-backport-51730-to-pacific

pacific: doc/rados/operations: Fix erasure-code-jerasure.rst fix

doc/rados/operations: Fix erasure-code-jerasure.rst fix

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 2a3177e60d93742d3125f3ef0913dfeb8743e8bf)

doc/rados/operations: Acting Set question

Clear up a paragraph that describes the behavior of the Acting Set.

https://tracker.ceph.com/issues/58485

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 3bc9cfd83b3b836775433c7f1b075fe397b56463)

Merge pull request #51433 from Svelar/wip-59687-pacific

pacific: cephadm: eliminate duplication of sections

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #51346 from mgfritch/wip-59649-pacific

pacific: mgr/cephadm: don't try to write client/os tuning profiles to known offline hosts

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #51727 from zdover23/wip-doc-2023-05-24-backport-51273-to-pacific

pacific: doc: Update jerasure.org references

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc: Update jerasure.org references

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 5e60e0de275f7260aeae9e664ca22ebfdf8fc5f9)

Merge pull request #51722 from zdover23/wip-doc-2023-05-24-backport-51679-to-pacific

pacific: doc/mgr: edit "leaderboard" in telemetry.rst

doc/mgr: edit "leaderboard" in telemetry.rst

Standardize the presentation of commands in the "Leaderboard" section of
doc/mgr/telemetry.rst.

Follow-up to https://github.com/ceph/ceph/pull/50977

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 4935ad8aed2aa796015473de5b38cc973ba85ba1)

Merge pull request #51261 from k0ste/wip-53166-pacific

pacific: ceph_test_rados_api_watch_notify: extend Watch3Timeout test

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

Merge pull request #51330 from trociny/wip-59616-pacific

pacific: rgw/rados: check_quota() uses real bucket owner

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

Merge pull request #51266 from mkogan1/wip-58332-pacific

pacific: rgw: under fips & openssl 3.x allow md5 usage in select rgw ops

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

Merge pull request #50560 from ljflores/wip-59091-pacific

pacific: rgw: LDAP fix resource leak with wrong credentials

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

Merge pull request #48928 from yuvalif/wip-58036-pacific

pacific: tests: remove pubsub tests from multisite

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

Merge pull request #51341 from NitzanMordhai/wip-59628-pacific

pacific: src/valgrind.supp: Adding know leaks unrelated to ceph

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

Merge pull request #51258 from k0ste/wip-56604-pacific

pacific: Monitor: forward report command to leader

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

Merge pull request #51324 from rhcs-dashboard/wip-59622-pacific

pacific: mgr/dashboard: fix the rbd mirroring configure check

Reviewed-by: cloudbehl <NOT@FOUND>

Merge pull request #51695 from zdover23/wip-doc-2023-05-23-backport-51682-to-pacific

pacific: doc/glossary: update bluestore entry

mds: remove inappropriate initialization of num_imported

The variable num_imported is being passed by reference. Additionally,
the decode_import_dir() function is invoked from handle_export_dir(),
where num_imported is initialized and passed by reference.
Therefore, there is no need to initialize it again within
the decode_import_dir() function.

fixes: https://tracker.ceph.com/issues/59107

Signed-off-by: Yongseok Oh <yongseok.oh@linecorp.com>
(cherry picked from commit 01d477eae40cbb543375bed8d955ca07c09ad959)