]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
13 months agoMerge pull request #58017 from Matan-B/wip-57262-squid
Matan Breizman [Sun, 16 Jun 2024 10:04:00 +0000 (13:04 +0300)]
Merge pull request #58017 from Matan-B/wip-57262-squid

squid: crimson/os/seastore/lba_manager: don't increase intermediate mappings' refcount if LBAManager::clone_mapping() is called to remap mappings

Reviewed-by: Samuel Just <sjust@redhat.com>
13 months agoMerge pull request #58014 from Matan-B/wip-55735-squid
Matan Breizman [Sun, 16 Jun 2024 09:56:54 +0000 (12:56 +0300)]
Merge pull request #58014 from Matan-B/wip-55735-squid

squid: crimson/common/errorator: disallow void-returning error handlers

Reviewed-by: Samuel Just <sjust@redhat.com>
13 months agoMerge pull request #58012 from Matan-B/wip-57476-squid
Matan Breizman [Sun, 16 Jun 2024 09:54:55 +0000 (12:54 +0300)]
Merge pull request #58012 from Matan-B/wip-57476-squid

squid: crimson/os/seastore/transaction_manager: drop unused code

Reviewed-by: Samuel Just <sjust@redhat.com>
13 months agoMerge pull request #58010 from Matan-B/wip-57434-squid
Matan Breizman [Sun, 16 Jun 2024 09:53:53 +0000 (12:53 +0300)]
Merge pull request #58010 from Matan-B/wip-57434-squid

squid: crimson/os/seastore/record_scanner: replace [=] capturing

Reviewed-by: Samuel Just <sjust@redhat.com>
13 months agoMerge pull request #58008 from Matan-B/wip-57102-squid
Matan Breizman [Sun, 16 Jun 2024 09:52:34 +0000 (12:52 +0300)]
Merge pull request #58008 from Matan-B/wip-57102-squid

squid: crimson/osd/osdop_params:Unify OpsExecuter::user_modify and osd_op_params_t::user_modify

Reviewed-by: Samuel Just <sjust@redhat.com>
13 months agoMerge pull request #58059 from zdover23/wip-doc-2024-06-16-backport-58057-to-squid
Anthony D'Atri [Sun, 16 Jun 2024 06:16:22 +0000 (02:16 -0400)]
Merge pull request #58059 from zdover23/wip-doc-2024-06-16-backport-58057-to-squid

squid: doc/rados: explain replaceable parts of command

13 months agodoc/rados: explain replaceable parts of command 58059/head
Zac Dover [Sat, 15 Jun 2024 11:55:18 +0000 (21:55 +1000)]
doc/rados: explain replaceable parts of command

Add an explanation that directs the reader to replace the "X" part of
the command "ceph tell mon.X mon_status" with the value specific to the
reader's Ceph cluster (which is (probably) not "X").

In the future, such replaceable strings in commands may be bounded by
angle brackets ("<" and ">").

This improvement to the documentation was suggested on the [ceph-users]
email list by Joel Davidow. This email, an absolute model of user
engagement with an upstream project, can be reviewed here:
https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/message/KF67F5TXFSSTPXV7EKL6JKLA5KZQDLDQ/

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

13 months agoMerge pull request #57998 from ljflores/wip-tracker-66460
Laura Flores [Fri, 14 Jun 2024 17:52:42 +0000 (12:52 -0500)]
Merge pull request #57998 from ljflores/wip-tracker-66460

squid: qa/suites/rados/thrash-old-clients: update supported releases and distro

13 months agoMerge pull request #58049 from zdover23/wip-doc-2024-06-14-backport-58007-to-squid
Anthony D'Atri [Fri, 14 Jun 2024 15:14:23 +0000 (11:14 -0400)]
Merge pull request #58049 from zdover23/wip-doc-2024-06-14-backport-58007-to-squid

squid: doc/rados: add pg-states and pg-concepts to tree

13 months agoMerge pull request #57525 from batrick/wip-66044-squid
Jos Collin [Fri, 14 Jun 2024 11:33:46 +0000 (17:03 +0530)]
Merge pull request #57525 from batrick/wip-66044-squid

squid: qa: unmount clients before damaging the fs

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57762 from joscollin/wip-66270-squid
Jos Collin [Fri, 14 Jun 2024 11:20:23 +0000 (16:50 +0530)]
Merge pull request #57762 from joscollin/wip-66270-squid

squid: pybind/mgr/mirroring: Fix KeyError: 'directory_count' in daemon status

Reviewed-by: Venky Shankar <vshankar@redhat.com>
13 months agoMerge pull request #57760 from joscollin/wip-66277-squid
Jos Collin [Fri, 14 Jun 2024 11:19:09 +0000 (16:49 +0530)]
Merge pull request #57760 from joscollin/wip-66277-squid

squid: cephfs-journal-tool: Add preventive measures to avoid fs corruption

Reviewed-by: Venky Shankar <vshankar@redhat.com>
13 months agoMerge pull request #57795 from rishabh-d-dave/wip-65920-squid
Jos Collin [Fri, 14 Jun 2024 11:12:26 +0000 (16:42 +0530)]
Merge pull request #57795 from rishabh-d-dave/wip-65920-squid

squid: mds: don't add counters in warning for standby-replay MDS

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57945 from ceph/wip-lusov-qdb-exclude-or-cancel-squid
Jos Collin [Fri, 14 Jun 2024 11:00:51 +0000 (16:30 +0530)]
Merge pull request #57945 from ceph/wip-lusov-qdb-exclude-or-cancel-squid

squid: mds: QuiesceDbRequest: update the internal encoding of ops

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agodoc/rados: add pg-states and pg-concepts to tree 58049/head
Zac Dover [Thu, 13 Jun 2024 11:29:47 +0000 (21:29 +1000)]
doc/rados: add pg-states and pg-concepts to tree

Add "pg-states" and "pg-concepts" to the left tree pane on
docs.ceph.com.

This commit has been made in response to a request from the upstream
made in https://pad.ceph.com/p/Report_Documentation_Bugs.

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

13 months agoqa/suites: add "mon down" log variations to ignorelist 57998/head
Laura Flores [Mon, 1 Apr 2024 17:27:54 +0000 (12:27 -0500)]
qa/suites: add "mon down" log variations to ignorelist

Fixes: https://tracker.ceph.com/issues/64864
Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit d475ac3e6ab86a4913e1d318989c617031978bc2)

Conflicts:
qa/suites/orch/cephadm/smoke/start.yaml
qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml
qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml
qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml
qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml

The log-only-match entry was backported to squid before the ignorelist changes,
        but in main it was introduced after the ignorelist changes.
        See https://github.com/ceph/ceph/commit/b4522dd332d40a54b9e0be58bd96aeaa345f8977.

13 months agocrimson/os/seastore/lba_manager: hide incref_extent(t, addr, delta) 58017/head
Xuehan Xu [Mon, 20 May 2024 02:45:25 +0000 (10:45 +0800)]
crimson/os/seastore/lba_manager: hide incref_extent(t, addr, delta)

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 4b4d04bef29f82d07f667570f758f7993e429dd3)

13 months agocrimson/os/seastore: add comments to highlight necessary invariants
Xuehan Xu [Thu, 16 May 2024 06:56:20 +0000 (14:56 +0800)]
crimson/os/seastore: add comments to highlight necessary invariants

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit ac4981160e790368cbb49b469937bee83edd26fb)

13 months agocrimson/os/seastore/cache: add a TODO comment to recommand dropping
Xuehan Xu [Mon, 13 May 2024 03:48:28 +0000 (11:48 +0800)]
crimson/os/seastore/cache: add a TODO comment to recommand dropping
`Cache::retire_extent_addr` in the future

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit cf49ef60755e3201b9126e46c4f0208416acc41c)

13 months agocrimson/os/seastore/object_data_handler: minor bug fix
Xuehan Xu [Fri, 10 May 2024 08:34:02 +0000 (16:34 +0800)]
crimson/os/seastore/object_data_handler: minor bug fix

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit ab312f3e2b5db784afc4427c0511afbebb8838f8)

13 months agocrimson/os/seastore/lba_manager: clean up LBAManager::decref_extent()
Xuehan Xu [Wed, 8 May 2024 03:14:33 +0000 (11:14 +0800)]
crimson/os/seastore/lba_manager: clean up LBAManager::decref_extent()
interface

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 502d922bdd45b6177080a6da8466420c8de563ec)

13 months agocrimson/os/seastore/transaction_manager: refactor extent remapping
Xuehan Xu [Thu, 9 May 2024 12:02:07 +0000 (20:02 +0800)]
crimson/os/seastore/transaction_manager: refactor extent remapping

dec_ref/alloc/clone/inc_ref of lba mappings caused by extent remappings
are now integrated into a single LBAManager::remap_lba_mappings()
interface

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit a2e244388c4822d81474bf0e45caada6c97e6e24)

13 months agocrimson/os/seastore/transaction_manager: add get_extent_if_linked() interface
Xuehan Xu [Thu, 9 May 2024 11:59:19 +0000 (19:59 +0800)]
crimson/os/seastore/transaction_manager: add get_extent_if_linked() interface

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit a6f90bc27ec62c6595028aa97524abffd682dcf3)

13 months agocrimson/os/seastore/cache: add retire_absent_extent_addr() interface
Xuehan Xu [Thu, 9 May 2024 12:01:29 +0000 (20:01 +0800)]
crimson/os/seastore/cache: add retire_absent_extent_addr() interface

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 6e583ccf458c740d6da86a19722b3e484aaf285c)

13 months agocrimson/os/seastore/lba_manager: don't increase intermediate mappings'
Xuehan Xu [Sat, 4 May 2024 04:21:13 +0000 (12:21 +0800)]
crimson/os/seastore/lba_manager: don't increase intermediate mappings'
refcount if LBAManager::clone_mapping() is called to remap mappings

TransactionManager::remap_pin() will increase the refcount itself

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 0cac72adc175404a013e86e450c58e9fb3f94af4)

13 months agocrimson/common/errorator: drop discard_all 58014/head
Xuehan Xu [Tue, 27 Feb 2024 04:49:41 +0000 (12:49 +0800)]
crimson/common/errorator: drop discard_all

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 0043fa92ab2435b4237d0d79112ab397730a8e91)

13 months agocrimson: adjust all void-returning handlers to either return values or
Xuehan Xu [Mon, 26 Feb 2024 02:27:55 +0000 (10:27 +0800)]
crimson: adjust all void-returning handlers to either return values or
switch to errorator::asserts

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 2f2b4f6170dbbd24c404d2bf58170e0818df8c80)

13 months agocrimson/common/errorator: make assert_all() interfaces accept functors
Xuehan Xu [Sat, 2 Mar 2024 07:33:55 +0000 (15:33 +0800)]
crimson/common/errorator: make assert_all() interfaces accept functors

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit a543db27108003fa4ace41a559efc5fb35555d23)

13 months agocrimson/common/errorator: disallow void-returning error handlers
Xuehan Xu [Sun, 25 Feb 2024 04:06:18 +0000 (12:06 +0800)]
crimson/common/errorator: disallow void-returning error handlers

Fixes: https://tracker.ceph.com/issues/64556
Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
(cherry picked from commit 513257cdd67ec126539f617256d73e4e8c65cf31)

13 months agocrimson/os/seastore/transaction_manager: drop unused code 58012/head
Yingxin Cheng [Wed, 15 May 2024 07:59:04 +0000 (15:59 +0800)]
crimson/os/seastore/transaction_manager: drop unused code

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
(cherry picked from commit ab5bc65ce38a0408bb6d74776f4396e0ef1bbffc)

13 months agocrimson/os/seastore/record_scanner: replace [=] capturing 58010/head
Yingxin Cheng [Mon, 13 May 2024 07:14:40 +0000 (15:14 +0800)]
crimson/os/seastore/record_scanner: replace [=] capturing

Capturing with = is error prone and causes compile warning.

And it is wrong:
* cursor should be captured by reference
* mutable keyword is unnecessary

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
(cherry picked from commit 116c5b4894193124cde485091b9627ccf3cf73a0)

13 months agocrimson/osd/osdop_params:Unify OpsExecuter::user_modify and osd_op_params_t::user_modify 58008/head
Xuehan Xu [Fri, 26 Apr 2024 10:12:15 +0000 (18:12 +0800)]
crimson/osd/osdop_params:Unify OpsExecuter::user_modify and osd_op_params_t::user_modify

Before this change OpsExecuter::user_modify was maintained in OpsExecuter::do_write_op.
However, osd_op_params->user_modify was not updated when used in OpsExecuter::prepare_transaction

Fixes: https://tracker.ceph.com/issues/65672
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit 1e3356278c1bf2e6226369b957efd92e2f877edd)

13 months agoMerge pull request #57436 from joscollin/wip-65978-squid
Jos Collin [Thu, 13 Jun 2024 08:55:10 +0000 (14:25 +0530)]
Merge pull request #57436 from joscollin/wip-65978-squid

squid: cephfs_mirror: increment sync_failures when sync_perms() and sync_snaps() fails

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
13 months agoMerge pull request #57440 from joscollin/wip-65982-squid
Jos Collin [Thu, 13 Jun 2024 08:52:51 +0000 (14:22 +0530)]
Merge pull request #57440 from joscollin/wip-65982-squid

squid: mgr/stats: initialize mx_last_updated in FSPerfStats

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
13 months agoMerge pull request #57449 from joscollin/wip-65989-squid
Jos Collin [Thu, 13 Jun 2024 06:23:20 +0000 (11:53 +0530)]
Merge pull request #57449 from joscollin/wip-65989-squid

squid: cephfs_mirror: fix crash in update_fs_mirrors()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
13 months agoMerge pull request #57117 from lxbsz/wip-65361
Jos Collin [Thu, 13 Jun 2024 06:13:52 +0000 (11:43 +0530)]
Merge pull request #57117 from lxbsz/wip-65361

squid: qa/cephfs: fix root_squash check failure bug

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57341 from batrick/wip-65844-squid
Jos Collin [Thu, 13 Jun 2024 06:03:11 +0000 (11:33 +0530)]
Merge pull request #57341 from batrick/wip-65844-squid

squid: qa: ignore variation of PG_DEGRADED health warning

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57447 from mchangir/wip-65899-squid
Jos Collin [Thu, 13 Jun 2024 05:11:44 +0000 (10:41 +0530)]
Merge pull request #57447 from mchangir/wip-65899-squid

squid: mgr/snap_schedule: restore yearly spec to lowercase y

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Anthony D Atri <anthony.datri@gmail.com>
13 months agoMerge pull request #57523 from batrick/wip-66042-squid
Jos Collin [Thu, 13 Jun 2024 04:51:07 +0000 (10:21 +0530)]
Merge pull request #57523 from batrick/wip-66042-squid

squid: mds: remove superfluous debug message

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57556 from lxbsz/wip-66054
Jos Collin [Thu, 13 Jun 2024 04:47:24 +0000 (10:17 +0530)]
Merge pull request #57556 from lxbsz/wip-66054

squid: qa/fsx: use a specified sha1 to build the xfstest-dev

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
13 months agoMerge pull request #57566 from dparmar18/wip-66060-squid
Jos Collin [Thu, 13 Jun 2024 04:42:36 +0000 (10:12 +0530)]
Merge pull request #57566 from dparmar18/wip-66060-squid

squid: qa: add a YAML to ignore MGR_DOWN warning

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoqa/suites/rados/thrash-old-clients: update supported releases and distro
Laura Flores [Wed, 12 Jun 2024 20:21:09 +0000 (15:21 -0500)]
qa/suites/rados/thrash-old-clients: update supported releases and distro

thrash-old-clients tests should only support N-3 releases. To fix this for
main, I have removed all releases < quincy and have added squid.

Also, we are fully switching to centos.9_stream packages/containers after
the centos.8_stream end of life, so I changed the distro from centos.8_stream
to centos.9_stream.

*** Note: If this commit is backported, it should be done in such a way that
only releases >= quincy reference centos.9_stream. For instance, if backporting to squid,
a reef/squid thrash test is okay to make references to centos.9_stream since both reef and
squid support this, but a pacific/squid test will have to take a different approach
since pacific does not support centos.9_stream.

Fixes: https://tracker.ceph.com/issues/66398
Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit 820e4004f3fd17a5daee955f7a1443b1501caaad)

Modifications:
- For this squid backport, I kept pacific since that fits into N-3 where
  N is squid.
- Pacific does not build c9 packages, so I picked an alternative distro
  that is shared among all represented releases: ubuntu 20.04.

13 months agoMerge pull request #56700 from joscollin/wip-65318-squid
Jos Collin [Wed, 12 Jun 2024 14:52:00 +0000 (20:22 +0530)]
Merge pull request #56700 from joscollin/wip-65318-squid

squid: cephfs-mirror: use monotonic clock

Reviewed-by: Venky Shankar <vshankar@redhat.com>
13 months agoMerge pull request #56910 from neesingh-rh/wip-65347-squid
Jos Collin [Wed, 12 Jun 2024 14:42:33 +0000 (20:12 +0530)]
Merge pull request #56910 from neesingh-rh/wip-65347-squid

squid: qa: fixing tests in test_cephfs_shell.TestShellOpts

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #56896 from chrisphoffman/wip-65489-squid
Jos Collin [Wed, 12 Jun 2024 14:31:01 +0000 (20:01 +0530)]
Merge pull request #56896 from chrisphoffman/wip-65489-squid

squid: mds: Add fragment to scrub

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #56950 from batrick/wip-65519-squid
Jos Collin [Wed, 12 Jun 2024 14:24:45 +0000 (19:54 +0530)]
Merge pull request #56950 from batrick/wip-65519-squid

squid: qa: ignore human-friendly POOL_APP_NOT_ENABLED in clog

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #56952 from batrick/wip-65366-squid
Jos Collin [Wed, 12 Jun 2024 14:21:51 +0000 (19:51 +0530)]
Merge pull request #56952 from batrick/wip-65366-squid

squid: qa: test test_kill_mdstable for all mount types

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57116 from lxbsz/wip-65675
Jos Collin [Wed, 12 Jun 2024 14:19:18 +0000 (19:49 +0530)]
Merge pull request #57116 from lxbsz/wip-65675

squid: mds: fix the description for inotable testing only options

Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
Reviewed-by: Anthony D Atri <anthony.datri@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agoMerge pull request #57982 from zdover23/wip-doc-2024-06-12-backport-57976-to-squid
Anthony D'Atri [Wed, 12 Jun 2024 13:06:28 +0000 (09:06 -0400)]
Merge pull request #57982 from zdover23/wip-doc-2024-06-12-backport-57976-to-squid

squid: doc/glossary: Add "S3"

13 months agoMerge pull request #57173 from batrick/wip-65708-squid
Jos Collin [Wed, 12 Jun 2024 13:01:15 +0000 (18:31 +0530)]
Merge pull request #57173 from batrick/wip-65708-squid

squid: client: clear resend_mds only after sending request

Reviewed-by: Jos Collin <jcollin@redhat.com>
13 months agodoc/glossary: Add "S3" 57982/head
Zac Dover [Tue, 11 Jun 2024 23:11:35 +0000 (09:11 +1000)]
doc/glossary: Add "S3"

Add "S3" entry to the glossary.

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

13 months agoMerge pull request #57489 from ljflores/wip-66041-squid
Laura Flores [Tue, 11 Jun 2024 15:35:40 +0000 (10:35 -0500)]
Merge pull request #57489 from ljflores/wip-66041-squid

squid: qa/suites/rados/singleton: add POOL_APP_NOT_ENABLED to ignorelist

13 months agoMerge pull request #57958 from zdover23/wip-doc-2024-06-11-backport-57957-to-squid
Anthony D'Atri [Tue, 11 Jun 2024 01:39:58 +0000 (21:39 -0400)]
Merge pull request #57958 from zdover23/wip-doc-2024-06-11-backport-57957-to-squid

squid: doc/rados: improve leader/peon monitor explanation

13 months agodoc/rados: improve leader/peon monitor explanation 57958/head
Zac Dover [Mon, 10 Jun 2024 22:00:00 +0000 (08:00 +1000)]
doc/rados: improve leader/peon monitor explanation

Add an explanation of leader-peon conditions that obtain when the
cluster is in the "HEALTH_OK" state. Previously, the text discussed
these two monitor states only in the context of a health detail entry.

This improvement to the documentation was suggested on the [ceph-users]
email list by Joel Davidow. This email, an absolute model of user
engagement with an upstream project, can be reviewed here: https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/message/KF67F5TXFSSTPXV7EKL6JKLA5KZQDLDQ/

I will list Joel Davidow here as the co-author for the sake of more
expediently getting this change into the documentation, but though he is
listed as the co-author, he is the true author.

Co-authored-by: Joel Davidow <jdavidow@nso.edu>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 6fb9a5ef817eda5184d51ebcb425a6091ca82299)

13 months agoMerge PR #57358 into squid
Patrick Donnelly [Mon, 10 Jun 2024 14:03:44 +0000 (10:03 -0400)]
Merge PR #57358 into squid

* refs/pull/57358/head:
ceph.spec.in: remove command-with-macro line

Reviewed-by: John Mulligan <jmulligan@redhat.com>
13 months agoMerge pull request #57747 from rhcs-dashboard/wip-66247-squid
Nizamudeen A [Mon, 10 Jun 2024 06:31:20 +0000 (12:01 +0530)]
Merge pull request #57747 from rhcs-dashboard/wip-66247-squid

squid: mgr/dashboard: fix readonly landingpage

Reviewed-by: Nizamudeen A <nia@redhat.com>
13 months agoMerge pull request #57948 from zdover23/wip-doc-2024-06-10-backport-57947-to-squid
Zac Dover [Sun, 9 Jun 2024 22:09:33 +0000 (08:09 +1000)]
Merge pull request #57948 from zdover23/wip-doc-2024-06-10-backport-57947-to-squid

squid: doc/start: remove "intro.rst"

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
13 months agodoc/start: remove "intro.rst" 57948/head
Zac Dover [Sun, 9 Jun 2024 18:55:13 +0000 (04:55 +1000)]
doc/start: remove "intro.rst"

Remove "start/intro.rst", which has been renamed "start/index.rst" in
order to follow the conventions followed elsewhere in the documentation.

Follows https://github.com/ceph/ceph/pull/57900.

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

13 months agoMerge pull request #57941 from zdover23/wip-doc-2024-06-09-backport-57939-to-squid
Zac Dover [Sun, 9 Jun 2024 18:21:39 +0000 (04:21 +1000)]
Merge pull request #57941 from zdover23/wip-doc-2024-06-09-backport-57939-to-squid

squid: doc/glossary.rst: add "OpenStack Swift" and "Swift"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
13 months agosquid: mds: QuiesceDbRequest: update the internal encoding of ops 57945/head
Leonid Usov [Thu, 6 Jun 2024 11:48:56 +0000 (14:48 +0300)]
squid: mds: QuiesceDbRequest: update the internal encoding of ops

Excluding the last root from a set will automatically mark it as QS_CANCELED.
Hence, it makes more sense if `exclude` and `cancel` share the same op code,
rather than `exclude` and `release`.

Fixes: https://tracker.ceph.com/issues/66400
Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
Fixes: https://tracker.ceph.com/issues/66383
(cherry picked from commit dad52497817c372fd7c61a88a210b5a3613cb807)

13 months agodoc/glossary.rst: add "OpenStack Swift" and "Swift" 57941/head
Zac Dover [Sat, 8 Jun 2024 20:24:43 +0000 (06:24 +1000)]
doc/glossary.rst: add "OpenStack Swift" and "Swift"

Add "OpenStack Swift" and "Swift" entries to the glossary.

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

13 months agoMerge pull request #57915 from zdover23/wip-doc-2024-06-07-backport-57887-to-squid
Zac Dover [Thu, 6 Jun 2024 20:13:19 +0000 (06:13 +1000)]
Merge pull request #57915 from zdover23/wip-doc-2024-06-07-backport-57887-to-squid

squid: doc/rados: add options to network config ref

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
13 months agoMerge pull request #57883 from zdover23/wip-doc-2024-06-05-backport-57868-to-squid
Zac Dover [Thu, 6 Jun 2024 20:12:44 +0000 (06:12 +1000)]
Merge pull request #57883 from zdover23/wip-doc-2024-06-05-backport-57868-to-squid

squid: doc: correct typo

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
13 months agoMerge pull request #57913 from zdover23/wip-doc-2024-06-07-backport-57886-to-squid
Ilya Dryomov [Thu, 6 Jun 2024 17:42:17 +0000 (19:42 +0200)]
Merge pull request #57913 from zdover23/wip-doc-2024-06-07-backport-57886-to-squid

squid: doc/dev: origin of Labeled Perf Counters

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
13 months agodoc/rados: add options to network config ref 57915/head
Zac Dover [Wed, 5 Jun 2024 04:30:01 +0000 (14:30 +1000)]
doc/rados: add options to network config ref

Add the following options to
doc/rados/configuration/network-config-ref.rst:

- public_network_interface
- cluster_network_interface

These additions were made in response to a request from Blaine Gardner.

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

13 months agodoc/dev: origin of Labeled Perf Counters 57913/head
Zac Dover [Wed, 5 Jun 2024 01:18:46 +0000 (11:18 +1000)]
doc/dev: origin of Labeled Perf Counters

Note that Labeled Perf Counters were introduced in Reef.

Fixes: https://github.com/ceph/ceph/pull/57753#discussion_r1626483732
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 36e09fb6894dcec56224d483d36a7315b8d19d60)

13 months agoMerge pull request #57902 from zdover23/wip-doc-2024-06-06-backport-57900-to-squid
Zac Dover [Wed, 5 Jun 2024 22:25:06 +0000 (08:25 +1000)]
Merge pull request #57902 from zdover23/wip-doc-2024-06-06-backport-57900-to-squid

squid: doc/start: s/intro.rst/index.rst/

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
13 months agodoc/start: s/intro.rst/index.rst/ 57902/head
Zac Dover [Wed, 5 Jun 2024 16:43:15 +0000 (02:43 +1000)]
doc/start: s/intro.rst/index.rst/

Change the filename "doc/start/intro.rst" to "doc/start/index.rst" so
that Sphinx finds the root filename for the "/start" directory in the
default location.

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

13 months agoMerge pull request #57870 from zdover23/wip-doc-2024-06-05-backport-57867-to-squid
Zac Dover [Wed, 5 Jun 2024 01:11:05 +0000 (11:11 +1000)]
Merge pull request #57870 from zdover23/wip-doc-2024-06-05-backport-57867-to-squid

squid: doc/start: s/http/https/ in links

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
13 months agodoc: correct typo 57883/head
Matthew Vernon [Tue, 4 Jun 2024 13:46:57 +0000 (14:46 +0100)]
doc: correct typo

Signed-off-by: Matthew Vernon <mvernon@wikimedia.org>
(cherry picked from commit 4769493887e9f99f990122135d7cab6caee27f71)

13 months agodoc/start: s/http/https/ in links 57870/head
Zac Dover [Tue, 4 Jun 2024 13:37:27 +0000 (23:37 +1000)]
doc/start: s/http/https/ in links

Replace "http" with "https" in doc/start/get-involved.rst.

This commit is, in a way, a repeat of
https://github.com/ceph/ceph/pull/57213/
(1c5383b91bd7dbfa9670c6485fcc5ff28b79f40d), which targeted the Reef
branch instead of the main branch. When this commit has been merged and
backported, I will close https://github.com/ceph/ceph/pull/57213/.

I am listing Casey Cain here as the co-author, but he is in fact the
true author of this change.

Co-authored-by: Casey Cain <ccain@linuxfoundation.org>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 922f23f0f30da856a661376527f413dc9424382d)

13 months agoMerge pull request #57850 from zdover23/wip-doc-2024-06-04-backport-57824-to-squid
Anthony D'Atri [Mon, 3 Jun 2024 19:58:09 +0000 (15:58 -0400)]
Merge pull request #57850 from zdover23/wip-doc-2024-06-04-backport-57824-to-squid

squid: doc/rados: add stop monitor command

13 months agodoc/rados: add stop monitor command 57850/head
Zac Dover [Mon, 3 Jun 2024 00:23:43 +0000 (10:23 +1000)]
doc/rados: add stop monitor command

Add the command for stopping a monitor to the procedure that explains
how to inject a monmap into a monitor.

Zac of the future: cf. 05 Aug 2023.

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

13 months agoMerge pull request #57844 from zdover23/wip-doc-2024-06-04-backport-57839-to-squid
Anthony D'Atri [Mon, 3 Jun 2024 15:54:27 +0000 (11:54 -0400)]
Merge pull request #57844 from zdover23/wip-doc-2024-06-04-backport-57839-to-squid

squid: doc/start: Edit Beginner's Guide

13 months agodoc/start: Edit Beginner's Guide 57844/head
Zac Dover [Mon, 3 Jun 2024 13:43:47 +0000 (23:43 +1000)]
doc/start: Edit Beginner's Guide

Make some improvements to the basic text of the Beginner's Guide.

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

13 months agoMerge pull request #57821 from zdover23/wip-doc-2024-06-02-backport-57820-to-squid
Zac Dover [Sun, 2 Jun 2024 23:27:09 +0000 (09:27 +1000)]
Merge pull request #57821 from zdover23/wip-doc-2024-06-02-backport-57820-to-squid

squid: doc/start: Add Beginner's Guide

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
13 months agodoc/start: Add Beginner's Guide 57821/head
Zac Dover [Sun, 2 Jun 2024 11:06:25 +0000 (21:06 +1000)]
doc/start: Add Beginner's Guide

Add a Beginner's Guide to docs.ceph.com.

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

13 months agoMerge pull request #57814 from zdover23/wip-doc-2024-06-01-backport-57804-to-squid
Anthony D'Atri [Sun, 2 Jun 2024 00:02:34 +0000 (20:02 -0400)]
Merge pull request #57814 from zdover23/wip-doc-2024-06-01-backport-57804-to-squid

squid: doc/cephfs: edit vstart warning text

13 months agodoc/cephfs: edit vstart warning text 57814/head
Zac Dover [Fri, 31 May 2024 12:19:59 +0000 (22:19 +1000)]
doc/cephfs: edit vstart warning text

Improve the English in the vstart warning in doc/cephfs/mantle.rst.

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

13 months agoMerge pull request #57803 from petrutlucian94/wip-66312-squid
Ilya Dryomov [Fri, 31 May 2024 14:51:45 +0000 (16:51 +0200)]
Merge pull request #57803 from petrutlucian94/wip-66312-squid

squid: rbd-wnbd: wait for the disk cleanup to complete

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
13 months agorbd-wnbd: wait for the disk cleanup to complete 57803/head
Lucian Petrut [Fri, 24 May 2024 10:03:11 +0000 (10:03 +0000)]
rbd-wnbd: wait for the disk cleanup to complete

The WNBD disk removal workflow is asynchronous, which is why we'll
need to wait for the cleanup to complete when stopping the service.

The "disconnect_all_mappings" function is moved to
RbdMappingDispatcher::stop, allowing us to access the mapping list
more easily and reject new mappings after a stop has been requested.

While at it, we'll log service stop requests.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit 9136cbdecb520def4fdfbbf696e1802037cac510)

13 months agoMerge pull request #57791 from zdover23/wip-doc-2024-05-30-backport-57790-to-squid
Anthony D'Atri [Fri, 31 May 2024 01:24:31 +0000 (21:24 -0400)]
Merge pull request #57791 from zdover23/wip-doc-2024-05-30-backport-57790-to-squid

squid: doc/cephfs: edit front matter in mantle.rst

13 months agoqa/cephfs: test that counters are not printed for SR MDS 57795/head
Rishabh Dave [Tue, 26 Mar 2024 06:04:23 +0000 (11:34 +0530)]
qa/cephfs: test that counters are not printed for SR MDS

- Add tests to verify that inode and stray counters are not
  replayed/included in the health warnings printed for the
  standby-replay MDS.

- Add "MDS_CACHE_OVERSIZED" health warning to ignorelist to
  failover.yaml.

- Add a helper method to qa.tasks.cephfs.filesystem.Filesystem to get
  MDS name of standby-replay MDS.

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

13 months agomds: add no counters in warning for standby-replay MDS
Rishabh Dave [Fri, 8 Mar 2024 15:31:51 +0000 (21:01 +0530)]
mds: add no counters in warning for standby-replay MDS

Don't include inode and stray counters in the health warnings printed
for standby-replay MDSs. Since these counters are present in the health
warnings only due to replay, it can confuse users, and therefore, do not
include them.

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

13 months agoMerge pull request #57466 from soumyakoduri/wip-skoduri-squid
Casey Bodley [Thu, 30 May 2024 13:55:08 +0000 (14:55 +0100)]
Merge pull request #57466 from soumyakoduri/wip-skoduri-squid

[Squid]rgw/cloud-transition: fix the crash with publish_commit

Reviewed-by: Casey Bodley <cbodley@redhat.com>
13 months agoMerge pull request #57376 from cbodley/wip-65888-squid
Casey Bodley [Thu, 30 May 2024 13:54:51 +0000 (14:54 +0100)]
Merge pull request #57376 from cbodley/wip-65888-squid

squid: rgw/beast: fix crash observed in SSL stream.async_shutdown()

Reviewed-by: Mark Kogan <mkogan@redhat.com>
13 months agoMerge pull request #57470 from yuvalif/wip-65996-squid
Casey Bodley [Thu, 30 May 2024 13:54:17 +0000 (14:54 +0100)]
Merge pull request #57470 from yuvalif/wip-65996-squid

squid: rgw/notification: start/stop endpoint managers in notification manager

Reviewed-by: Casey Bodley <cbodley@redhat.com>
13 months agodoc/cephfs: edit front matter in mantle.rst 57791/head
Zac Dover [Thu, 30 May 2024 13:28:56 +0000 (23:28 +1000)]
doc/cephfs: edit front matter in mantle.rst

Improve the structure and grammar of the front matter in the
doc/cephfs/mantle.rst file.

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

13 months agoMerge PR #57730 into squid
Patrick Donnelly [Thu, 30 May 2024 13:08:04 +0000 (09:08 -0400)]
Merge PR #57730 into squid

* refs/pull/57730/head:
squid: mds: remove unnecssary quiesce finisher variable
squid: mds: attach quiesce_path mdr to finisher at creation not dispatch
squid: mds/quiesce: disable quiesce root debug parameters by default
squid: mds/quiesce-agt: never send a synchronous ack
squid: mds/quiesce-agt: add test for a rapid async ack
squid: mds/quiesce: always abort fragmenting asynchronously to prevent reentrancy
squid: mds/quiesce: overdrive an export if it hasn't frozen the tree yet
squid: mds/quiesce: quiesce_inode should not hold on to remote auth pins
squid: qa/cephfs: check that a completed quiesce doesn't hold remote auth pins
squid: mds: add `--lifetime` parameter to the `lock path` asok command
squid: mds/quiesce: accept a regular file as the quiesce root
squid: mds: command_quiesce_path: rename `--wait` to `--await` for consistency
squid: mds: command_quiesce_path: do not block the asok thread and return an adequate rc
squid: mds/quiesce: drop remote authpins before waiting for the quiesce lock
squid: qa/cephfs/test_quiesce: test proper handling of remote authpins
squid: mds: don't clear `AUTHPIN_FROZEN` until `FROZEN` in rename_prep
squid: mds: enhance the `lock path` asok command
squid: mds/quiesce: overdrive fragmenting that's still freezing
squid: revert: mds: provide a mechanism to authpin while freezing
squid: qa/cephfs/test_quiesce: enhance the fragmentation test
squid: mds/queisce-db: collect acks while bootstrapping
squid: mds/quiesce-db: optimize peer updates
squid: mds/quiesce-db: track db epoch separately from the membership epoch
squid: mds/quiesce-db: test that a peer on a newer membership epoch can ack a root
squid: mds: don't stall the asok thread for flush commands
squid: qa/quiescer: relax some timing requirements in the quiescer
squid: qa/tasks/quiescer: dump ops in parallel
squid: qa/suites/fs: add quiescer to the fs suite
squid: qa/tasks: the quiescer task and a waiter task to test it
squid: qa/tasks/cephfs: don't create a new CephManager if there is one in the context
squid: qa/tasks: vstart_runner: introduce --config-mode
squid: qa/tasks: introduce ThrasherGreenlet
squid: qa: update quiesce tests to expect ipolicy lock
squid: mds: add missing policylock to test F_QUIESCE_BLOCK

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
13 months agoMerge pull request #57657 from rhcs-dashboard/wip-65994-squid
Avan [Thu, 30 May 2024 10:00:07 +0000 (15:30 +0530)]
Merge pull request #57657 from rhcs-dashboard/wip-65994-squid

squid: exporter: fix regex for rgw sync metrics

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
13 months agoMerge pull request #57757 from zdover23/wip-doc-2024-05-29-backport-57753-to-squid
Zac Dover [Wed, 29 May 2024 13:49:50 +0000 (23:49 +1000)]
Merge pull request #57757 from zdover23/wip-doc-2024-05-29-backport-57753-to-squid

squid: doc/dev: add note about intro of perf counters

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
13 months agopybind/mgr/mirroring: Fix KeyError: 'directory_count' in daemon status 57762/head
Jos Collin [Mon, 6 May 2024 12:47:29 +0000 (18:17 +0530)]
pybind/mgr/mirroring: Fix KeyError: 'directory_count' in daemon status

The directory_count key is missing in self.mgr.get_daemon_status() output json,
intermittently when there is a delay caused by m_listener.handle_mirroring_enabled() to update the
directory_count, which results in ServiceDaemon::update_status() creates a json with out 'directory_count' key/value.
But the mgr/mirroring -> daemon_status() always expects the 'directory_count' key to be present in the json returned by
self.mgr.get_daemon_status().

This issue occurs intermittently when we enable/disable mirroring and check the 'daemon status' in between.
This patch fixes this issue by setting a default value 0 for 'directory_count' in doemon_status().

Fixes: https://tracker.ceph.com/issues/65795
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit b78baa23e562742b8bdc5a75f82e3b6fbf55a8a5)

13 months agodoc: update 'journal reset' command with --yes-i-really-really-mean-it 57760/head
Jos Collin [Tue, 27 Feb 2024 08:45:26 +0000 (14:15 +0530)]
doc: update 'journal reset' command with --yes-i-really-really-mean-it

Fixes: https://tracker.ceph.com/issues/62925
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 42953ece97b1b082400443b44bab46b1118fb1f8)

13 months agoqa: fix cephfs-journal-tool command options and make fs inactive
Jos Collin [Wed, 28 Feb 2024 06:15:25 +0000 (11:45 +0530)]
qa: fix cephfs-journal-tool command options and make fs inactive

Fixes: https://tracker.ceph.com/issues/62925
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 0820b31d5b1f1542636c56611ec27636afc23b68)

13 months agocephfs-journal-tool: Add warning messages during 'journal reset' and prevent executio...
Jos Collin [Thu, 22 Feb 2024 14:51:00 +0000 (20:21 +0530)]
cephfs-journal-tool: Add warning messages during 'journal reset' and prevent execution on active fs

Fixes: https://tracker.ceph.com/issues/62925
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 57f7d8b70f6989dee09a2adf5ff99b2917589488)

13 months agosquid: mds: remove unnecssary quiesce finisher variable 57730/head
Patrick Donnelly [Wed, 27 Mar 2024 16:05:44 +0000 (12:05 -0400)]
squid: mds: remove unnecssary quiesce finisher variable

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

13 months agosquid: mds: attach quiesce_path mdr to finisher at creation not dispatch
Patrick Donnelly [Wed, 27 Mar 2024 16:04:57 +0000 (12:04 -0400)]
squid: mds: attach quiesce_path mdr to finisher at creation not dispatch

No functional difference but this is cleaner.

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

13 months agodoc/dev: add note about intro of perf counters 57757/head
Zac Dover [Tue, 28 May 2024 16:27:53 +0000 (02:27 +1000)]
doc/dev: add note about intro of perf counters

Add a note to the "perf counter" section of doc/dev/perf_counters.rst
that explains that this feature was introduced in the Reef release of
Ceph. This note will prevent us from accidentally backporting
perf-counter-related PRs to Quincy.

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

14 months agosquid: mds/quiesce: disable quiesce root debug parameters by default
Leonid Usov [Sun, 26 May 2024 11:33:55 +0000 (14:33 +0300)]
squid: mds/quiesce: disable quiesce root debug parameters by default

Fixes: https://tracker.ceph.com/issues/66225
Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
(cherry picked from commit a9cb3a581a309a99b72997ae5ddb88084f5484c9)
Fixes: https://tracker.ceph.com/issues/66255
14 months agosquid: mds/quiesce-agt: never send a synchronous ack
Leonid Usov [Sun, 26 May 2024 08:16:48 +0000 (11:16 +0300)]
squid: mds/quiesce-agt: never send a synchronous ack

Defer to the agent thread to perform all acking.
This avoids race conditions between the updating thread
and the acking thread.

Fixes: https://tracker.ceph.com/issues/66219
Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
(cherry picked from commit 9a4c5853d1c2a353f72cd6358bbdedd93c4cc209)
Fixes: https://tracker.ceph.com/issues/66256