]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
3 years agooctopus: rgwlc: fix segfault resharding during lc 46745/head
Mark Kogan [Tue, 15 Mar 2022 13:06:56 +0000 (15:06 +0200)]
octopus: rgwlc: fix segfault resharding during lc

Fixes: https://tracker.ceph.com/issues/54363
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 7d2e72a9d0451e36141282d6456a4c23d753b592)

3 years agoMerge pull request #46392 from ljflores/wip-55743-octopus
Laura Flores [Wed, 8 Jun 2022 14:37:42 +0000 (09:37 -0500)]
Merge pull request #46392 from ljflores/wip-55743-octopus

octopus: qa/suites/rados/thrash-erasure-code-big/thrashers: add `osd max backfills` setting to mapgap and pggrow

3 years agoMerge pull request #46451 from zdover23/wip-doc-2022-05-31-backport-46430-octopus
zdover23 [Wed, 8 Jun 2022 13:54:07 +0000 (23:54 +1000)]
Merge pull request #46451 from zdover23/wip-doc-2022-05-31-backport-46430-octopus

octopus: doc/start: update "memory" in hardware-recs.rst

Reviewed-by: Mark Nelson <mnelson@redhat.com>
3 years agodoc/start: update "memory" in hardware-recs.rst 46451/head
Zac Dover [Mon, 30 May 2022 13:32:06 +0000 (23:32 +1000)]
doc/start: update "memory" in hardware-recs.rst

This PR corrects some usage errors in the "Memory" section
of the hardware-recommendations.rst file. It also closes
some opened but never closed parentheses.

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

doc: (squash) removing confvals

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #45891 from nkshirsagar/wip-55298-octopus
Yuri Weinstein [Tue, 7 Jun 2022 14:01:48 +0000 (07:01 -0700)]
Merge pull request #45891 from nkshirsagar/wip-55298-octopus

octopus: Catch exception if thrown by __generate_command_map()

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #45726 from rhcs-dashboard/wip-54997-octopus
Ernesto Puerta [Thu, 2 Jun 2022 17:17:10 +0000 (19:17 +0200)]
Merge pull request #45726 from rhcs-dashboard/wip-54997-octopus

octopus: mgr/dashboard: Table columns hiding fix

Reviewed-by: Sarthak Gupta <sarthak.dev.0702@gmail.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: kalaspuffar <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoMerge pull request #46253 from rzarzynski/wip-45529-octopus
Yuri Weinstein [Wed, 1 Jun 2022 23:14:56 +0000 (16:14 -0700)]
Merge pull request #46253 from rzarzynski/wip-45529-octopus

octopus: osd/PGLog.cc: Trim duplicates by number of entries

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
3 years agoMerge pull request #45161 from dvanders/wip-51933-octopus
Yuri Weinstein [Wed, 1 Jun 2022 23:12:40 +0000 (16:12 -0700)]
Merge pull request #45161 from dvanders/wip-51933-octopus

octopus: mds: check rejoin_ack_gather before enter rejoin_gather_finish

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #45158 from dvanders/wip-51202-octopus
Yuri Weinstein [Wed, 1 Jun 2022 23:12:08 +0000 (16:12 -0700)]
Merge pull request #45158 from dvanders/wip-51202-octopus

octopus: mds: progress the recover queue immediately after the inode is enqueued

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
3 years agoMerge pull request #45055 from Vicente-Cheng/wip-54219-octopus
Yuri Weinstein [Wed, 1 Jun 2022 23:11:14 +0000 (16:11 -0700)]
Merge pull request #45055 from Vicente-Cheng/wip-54219-octopus

octopus: mds: fix seg fault in expire_recursive

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #46489 from ceph/octopus-nobranch
David Galloway [Wed, 1 Jun 2022 20:19:15 +0000 (16:19 -0400)]
Merge pull request #46489 from ceph/octopus-nobranch

octopus: qa: remove .teuthology_branch file

3 years agoqa: remove .teuthology_branch file 46489/head
Jeff Layton [Wed, 1 Jun 2022 18:26:33 +0000 (14:26 -0400)]
qa: remove .teuthology_branch file

This was originally added to help support the py2 -> py3 conversion.
That's long since complete so we should be able to just remove this file
now.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 81430de9b70be16a439bf2445f3345b83035a861)

3 years agoMerge pull request #45015 from Vicente-Cheng/wip-54195-octopus
Yuri Weinstein [Tue, 31 May 2022 18:08:28 +0000 (11:08 -0700)]
Merge pull request #45015 from Vicente-Cheng/wip-54195-octopus

octopus: mds: mds_oft_prefetch_dirfrags default to false

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #46216 from rzarzynski/wip-tests-bl-fix-rebuild-octopus
Yuri Weinstein [Tue, 31 May 2022 18:07:44 +0000 (11:07 -0700)]
Merge pull request #46216 from rzarzynski/wip-tests-bl-fix-rebuild-octopus

octopus: test/bufferlist: ensure rebuild_aligned_size_and_memory() always rebuilds.

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #45633 from joscollin/wip-55054-octopus
Yuri Weinstein [Tue, 31 May 2022 18:06:20 +0000 (11:06 -0700)]
Merge pull request #45633 from joscollin/wip-55054-octopus

octopus: qa: check mounts attribute in ctx

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
3 years agoMerge pull request #45621 from s0nea/wip-55035-octopus
Yuri Weinstein [Tue, 31 May 2022 17:24:12 +0000 (10:24 -0700)]
Merge pull request #45621 from s0nea/wip-55035-octopus

octopus: mgr/cephadm: try to get FQDN for configuration files

Reviewed-by: Adam King adking@redhat.com
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
3 years agoMerge pull request #45356 from mgfritch/backport-45347-octopus
Yuri Weinstein [Tue, 31 May 2022 17:22:34 +0000 (10:22 -0700)]
Merge pull request #45356 from mgfritch/backport-45347-octopus

octopus: cephadm: preserve `authorized_keys` file during upgrade

Reviewed-by: Adam King adking@redhat.com
3 years agoMerge pull request #45162 from dvanders/wip-52443-octopus
Yuri Weinstein [Tue, 31 May 2022 17:21:44 +0000 (10:21 -0700)]
Merge pull request #45162 from dvanders/wip-52443-octopus

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

Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #45156 from dvanders/wip-50847-octopus
Yuri Weinstein [Tue, 31 May 2022 17:21:11 +0000 (10:21 -0700)]
Merge pull request #45156 from dvanders/wip-50847-octopus

octopus: mds: fix possible mds_lock not locked assert

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
3 years agoMerge pull request #45155 from dvanders/wip-50631-octopus
Yuri Weinstein [Tue, 31 May 2022 17:20:04 +0000 (10:20 -0700)]
Merge pull request #45155 from dvanders/wip-50631-octopus

octopus: mds: reset the return value for heap command

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
3 years agoqa/suites/rados/thrash-erasure-code-big/thrashers: add `osd max backfills` setting... 46392/head
Laura Flores [Mon, 16 May 2022 22:59:42 +0000 (17:59 -0500)]
qa/suites/rados/thrash-erasure-code-big/thrashers: add `osd max backfills` setting to mapgap and pggrow

All `rados/thrash-erasure-code-big` tests that die due to the “wait_for_recovery” timeout have one thing in common: They contain either `thrashers/pggrow` or `thrashers/mapgap`.

The difference between pggrow and mapgap vs. all other non-offending thrashers (default, careful, fastread, and morepggrow) is that they lack an override setting for `osd max backfills`. `osd max backfills` is the max number of backfill operations allowed to/from an OSD. The higher the number, the quicker the recovery. By default, this value is 1. On all of the non-offending thrashers (default, careful, fastread, and morepggrow), the default 1 value gets overridden in their .yaml files with a value > 1. This is not the case for pggrow and mapgap, however, as they lack an `osd max backfills` override setting.

The mclock op scheduler is known to override `osd max backfills` with a high value, but all of the thrash-erasure-code-big thrashers have their op queue set to “debug_random”, which chooses randomly between op queues (the debug_random op queue is set to override the default mclock_scheduler in qa/config/rados.yaml). So, coupled with the “debug_random” op queue, the low `osd max backfill` setting is causing some tests to time out in recovery.

WITHOUT `osd max backfills`, as they are now, “mapgap” and “pggrow” tests die due to timed-out recovery about 17/100 times, as seen here with a pggrow test: http://pulpito.front.sepia.ceph.com/lflores-2022-05-18_14:24:29-rados:thrash-erasure-code-big-master-distro-default-smithi/

WITH `osd max backfills` specified, as I have suggested in this PR, 99/100 tests passed, with one test failing for a different reason:
http://pulpito.front.sepia.ceph.com/lflores-2022-05-17_22:40:27-rados:thrash-erasure-code-big-master-distro-default-smithi/

I also scheduled 145 tests WITH `osd max backfills` that are a mix of pggrow and mapgap thrashers. 144/145 tests passed, with one test failing for a different reason. http://pulpito.front.sepia.ceph.com/lflores-2022-05-17_15:27:54-rados:thrash-erasure-code-big-master-distro-default-smithi/

Fixes: https://tracker.ceph.com/issues/51076
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 40062676c2ceed49b9fa147127ffa83ba6118e2a)

3 years agoMerge pull request #46308 from zdover23/wip-doc-tracker-55676-backport-octopus-3rd...
zdover23 [Sun, 22 May 2022 19:55:47 +0000 (05:55 +1000)]
Merge pull request #46308 from zdover23/wip-doc-tracker-55676-backport-octopus-3rd-attempt

octopus: doc/dev: update basic-workflow.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/dev: update basic-workflow.rst 46308/head
Zac Dover [Wed, 13 Apr 2022 14:09:38 +0000 (00:09 +1000)]
doc/dev: update basic-workflow.rst

This PR updates the basic-workflow.rst file
to serve the needs of people in 2022 who were not
present at jump street.

The text has been refined up to the section called
"Integration Tests" (non-inclusive).

I'm adding an extra underscore to attempt to suppress the
"Duplicate explicit target name errors" error message.

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

(squash) linking issue tracker correctly

This PR links issue tracker by label, and not
by file. This method was proposed by Kefu Chai
in 40f9e1cee054bb568dfa3267982467c99b4ce5c5
on 05 Sep 2020 and was never before incorporated
into Octopus. This was noticed by Neha Ojha in
May 2020.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) more link fixes

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) see last commit

Signed-off-by: Zac Dover <zac.dover@gmail.com>
ibid

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) ibid

Working on fixing links.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) more tedious testing

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) fixing make check link

This fixes the make-check link in
tests-integration-tests.rst

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) fix integration tests links

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) cleaning links

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) same as all the others

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) ibid

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) fix broken link (again)

This corrects the error "Mismatch: both
interpreted text role prefix and reference suffix", which
presented because I treated the link to an external URL as
though it were a :ref:-style link to a location inside the
Ceph documentation suite.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(squash) ibid - malformed external link

Signed-off-by: Zac Dover <zac.dover@gmail.com>
3 years agoMerge pull request #45423 from cfsnyder/wip-50802-octopus
Yuri Weinstein [Thu, 19 May 2022 21:20:31 +0000 (14:20 -0700)]
Merge pull request #45423 from cfsnyder/wip-50802-octopus

octopus: radosgw-admin: skip GC init on read-only admin ops

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45456 from cfsnyder/wip-52991-octopus
Yuri Weinstein [Thu, 19 May 2022 15:12:38 +0000 (08:12 -0700)]
Merge pull request #45456 from cfsnyder/wip-52991-octopus

octopus: rgw: have "bucket check --fix" fix pool ids correctly

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #46328 from zdover23/wip-pr-46315-backport-to-octopus
zdover23 [Wed, 18 May 2022 23:22:46 +0000 (09:22 +1000)]
Merge pull request #46328 from zdover23/wip-pr-46315-backport-to-octopus

octopus: doc/start: s/3/three/ in intro.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
3 years agodoc/start: s/3/three/ in intro.rst 46328/head
Zac Dover [Wed, 18 May 2022 10:36:53 +0000 (20:36 +1000)]
doc/start: s/3/three/ in intro.rst

I'm changing "3" to "three" for two reasons:

1. It's correct.
2. This allows me to test backports into Octopus, Pacific, and Quincy.
   I am particularly interested to see what happens when I attempt
   the backport into Octopus, because backports into Octopus have
   failed. This will provide me with another unit of data.

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

3 years agoMerge pull request #44668 from Vicente-Cheng/wip-53715-octopus
Yuri Weinstein [Mon, 16 May 2022 21:58:52 +0000 (14:58 -0700)]
Merge pull request #44668 from Vicente-Cheng/wip-53715-octopus

octopus: mds: skip directory size checks for reintegration

Reviewed-by: Ramana Raja <rraja@redhat.com>
3 years agoMerge pull request #45560 from idryomov/wip-readv-writev-overflow-octopus
Yuri Weinstein [Mon, 16 May 2022 17:16:26 +0000 (10:16 -0700)]
Merge pull request #45560 from idryomov/wip-readv-writev-overflow-octopus

octopus: librbd: readv/writev fix iovecs length computation overflow

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
3 years agoMerge pull request #45554 from idryomov/wip-rbd-du-validate-octopus
Yuri Weinstein [Mon, 16 May 2022 17:15:33 +0000 (10:15 -0700)]
Merge pull request #45554 from idryomov/wip-rbd-du-validate-octopus

octopus: test/librbd: add test to verify diff_iterate size

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #45530 from idryomov/wip-fix-schedule-status-octopus
Yuri Weinstein [Mon, 16 May 2022 17:14:29 +0000 (10:14 -0700)]
Merge pull request #45530 from idryomov/wip-fix-schedule-status-octopus

octopus: mgr/rbd_support: cast pool_id from int to str when collecting LevelSpec

Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
3 years agorgw: during "bucket check --fix" set index entry pool id correctly 45456/head
J. Eric Ivancich [Mon, 11 Oct 2021 20:17:46 +0000 (16:17 -0400)]
rgw: during "bucket check --fix" set index entry pool id correctly

The current code sets the pool id of bucket index entries to the
bucket index pool rather than the data pool. This fixes that.

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

Conflicts:
src/rgw/rgw_rados.cc

Cherry-pick notes:
- Conflict due to braces around if condition after change that weren't on Octopus
- Octopus using dout vs. ldpp_dout

3 years agoradosgw-admin: skip GC init on read-only admin ops 45423/head
Mark Kogan [Mon, 26 Apr 2021 09:15:11 +0000 (12:15 +0300)]
radosgw-admin: skip GC init on read-only admin ops

Fixes: https://tracker.ceph.com/issues/50520
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 9ac1991fc798af7e0ba0fac18209b71b5ae3f02b)

Conflicts:
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.h
src/rgw/rgw_sal.cc
src/rgw/rgw_sal.h

Cherry-pick notes:
- src/rgw/rgw_admin.cc: conflicts due to differences in op lists
- src/rgw/rgw_rados.h: conflicts due to changes to unrelated  method signatures
- src/rgw/rgw_sal.cc: conflicts due to octopus missing a couple of methods from later releases
- src/rgw/rgw_sal.h: conflicts due to changes to unrelated method seignatures
- src/rgw/rgw_rados.cc: use of ldpp_dout vs. ldout

3 years agoMerge pull request #45465 from cfsnyder/wip-53470-octopus
Yuri Weinstein [Fri, 13 May 2022 14:08:21 +0000 (07:08 -0700)]
Merge pull request #45465 from cfsnyder/wip-53470-octopus

octopus: common: avoid pthread_mutex_unlock twice

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoosd/PGLog.cc: Trim duplicates by number of entries 46253/head
NitzanMordhai [Mon, 21 Mar 2022 11:34:34 +0000 (11:34 +0000)]
osd/PGLog.cc: Trim duplicates by number of entries
PGLog needs to trim duplicates by the number of entries rather than the versions. That way, we prevent unbounded duplicate growth.

Fixed: https://tracker.ceph.com/issues/53729
Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit 0d253bcc09a5540fa6c724f6128fb7436ded5ec1)

3 years agotools/ceph_objectstore_took: Add duplicate entry trimming
NitzanMordhai [Wed, 23 Mar 2022 18:52:45 +0000 (18:52 +0000)]
tools/ceph_objectstore_took: Add duplicate entry trimming

Adding duplicate entries trimming to trim-pg-log opertion, we will use the exist
PGLog trim function to find out the set of entries\dup entries that we suppose to
trim. to use it we need to build the PGLog from disk.

Fixed: https://tracker.ceph.com/issues/53729
Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>
(cherry picked from commit 9fb7ec61ba10896ce01d5970375f1ce1dd993874)

 Conflicts:
src/osd/PGLog.h -- octopus does not have the commit
   877798028386fbd833e8955cb89ce3f1ee47fbeb
   which cleans the `std` namespace depedency
   in headers.
src/tools/ceph_objectstore_tool.cc -- octopus lacks the commit
   7d73fa6a309dca4c5381596c5e92813e2e11ed3b
   which puts the buffer's error hierarchy on
   `system_error`.

3 years agoMerge pull request #45570 from mgfritch/backport-45420-octopus
Yuri Weinstein [Thu, 12 May 2022 22:59:15 +0000 (15:59 -0700)]
Merge pull request #45570 from mgfritch/backport-45420-octopus

octopus: cephadm: infer the default container image during pull

Reviewed-by: Adam King adking@redhat.com
3 years agoMerge pull request #45437 from cfsnyder/wip-51782-octopus
Yuri Weinstein [Thu, 12 May 2022 22:57:34 +0000 (15:57 -0700)]
Merge pull request #45437 from cfsnyder/wip-51782-octopus

octopus: qa/rgw: add failing tempest test to blocklist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45320 from ljflores/wip-52077-octopus
Yuri Weinstein [Thu, 12 May 2022 22:56:45 +0000 (15:56 -0700)]
Merge pull request #45320 from ljflores/wip-52077-octopus

octopus: test: fix wrong alarm (HitSetWrite)

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
3 years agoMerge pull request #45238 from k0ste/wip-54450-octopus
Yuri Weinstein [Thu, 12 May 2022 22:55:44 +0000 (15:55 -0700)]
Merge pull request #45238 from k0ste/wip-54450-octopus

octopus: mgr/prometheus: Added `avail_raw` field for Pools DF Prometheus mgr module

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoqa: check mounts attribute in ctx 45633/head
Jos Collin [Mon, 29 Mar 2021 11:35:04 +0000 (17:05 +0530)]
qa: check mounts attribute in ctx

check mounts attribute in ctx before unmounting in bark()

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

3 years agoMerge pull request #45398 from kamoltat/wip-ksirivad-octopus-backport-45078
Yuri Weinstein [Wed, 11 May 2022 20:59:31 +0000 (13:59 -0700)]
Merge pull request #45398 from kamoltat/wip-ksirivad-octopus-backport-45078

octopus: mon/MonCommands.h: fix target_size_ratio range

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45433 from cfsnyder/wip-51702-octopus
Yuri Weinstein [Wed, 11 May 2022 20:48:30 +0000 (13:48 -0700)]
Merge pull request #45433 from cfsnyder/wip-51702-octopus

octopus: rgw: fix md5 not match for RGWBulkUploadOp upload when enable rgw com…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45587 from idryomov/wip-pool-reverse-lookup-osdmap-octopus
Yuri Weinstein [Wed, 11 May 2022 20:46:18 +0000 (13:46 -0700)]
Merge pull request #45587 from idryomov/wip-pool-reverse-lookup-osdmap-octopus

octopus: librados: check latest osdmap on ENOENT in pool_reverse_lookup()

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #45479 from cfsnyder/wip-53640-octopus
Yuri Weinstein [Wed, 11 May 2022 20:13:24 +0000 (13:13 -0700)]
Merge pull request #45479 from cfsnyder/wip-53640-octopus

octopus: rgw/amqp: add default case to silence compiler warning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #44260 from sseshasa/wip-53550-octopus
Yuri Weinstein [Wed, 11 May 2022 20:12:06 +0000 (13:12 -0700)]
Merge pull request #44260 from sseshasa/wip-53550-octopus

octopus: osd/OSDMap: Add health warning if 'require-osd-release' != current release

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #46230 from ceph/octopus-gtest2
Yuri Weinstein [Wed, 11 May 2022 19:51:00 +0000 (12:51 -0700)]
Merge pull request #46230 from ceph/octopus-gtest2

octopus: Fixes for make check

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45177 from pponnuvel/wip-54377-octopus
Ilya Dryomov [Wed, 11 May 2022 17:54:57 +0000 (19:54 +0200)]
Merge pull request #45177 from pponnuvel/wip-54377-octopus

octopus: rbd-mirror: synchronize with in-flight stop in ImageReplayer::stop()

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoinclude/denc: use pair<const K,V> in range-based for loop 46230/head
Kefu Chai [Mon, 21 Dec 2020 17:07:37 +0000 (01:07 +0800)]
include/denc: use pair<const K,V> in range-based for loop

map<K,V>::value_type is pair<const K, V>, so if we use range-based for
loop when iterating through a map, we should use pair<const K,V> instead
of pair<K,V>, the latter also compiles, but it might create a temporary
object of pair<K,V> from pair<const K,V>. GCC-11 complains at seeing
this:

../src/include/denc.h:1002:21: warning: loop variable ‘e’ of type ‘const T&’ {aka ‘const std::pair<OSDPerfMetricQuery, OSDPerfMetricReport>&’} binds to a tem\
porary constructed from type ‘const std::pair<const OSDPerfMetricQuery, OSDPerfMetricReport>’ [-Wrange-loop-constru
ct]
 1002 |       for (const T& e : s) {
      |                     ^

this change

* use the value_type of container in `maplike_details<Container>`,
  so we can avoid the overhead of creating temporay objects when
  encoding a map
* define denc_traits for std::pair<const A, B> as well, so the elements
  of a map can be encoded using denc facility

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

3 years agotest/test_rbd_replay: move operator<<(..rbd_loc& name) to rbd_replay
Kefu Chai [Fri, 8 Jan 2021 05:42:18 +0000 (13:42 +0800)]
test/test_rbd_replay: move operator<<(..rbd_loc& name) to rbd_replay

so gtest can print out rbd_loc when printing out diagnostic information
when test fails. after moving operator<<(ostream&, const rbd_loc&) to
the `rbd_replay` namespace, ADL is able to find it. for more details on
the lookup rules, see https://en.cppreference.com/w/cpp/language/adl

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

3 years agocommon/ceph_time: Don't define public things in time_detail
Adam C. Emerson [Tue, 15 Sep 2020 17:58:30 +0000 (13:58 -0400)]
common/ceph_time: Don't define public things in time_detail

Defining things in a detail section and then using them outside turned
out to not be the best idea.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 01f706ca0ffd39680dbfacf348750c9c0f851578)

Conflicts:
src/rgw/rgw_sync_error_repo.h not present in octopus

3 years agocommon/ceph_time: add operator<< for signedspan
Kefu Chai [Thu, 7 Jan 2021 03:56:25 +0000 (11:56 +0800)]
common/ceph_time: add operator<< for signedspan

* templatize operator<<(ostream&, duration<>), so it works for more
  duration<> classes with minimal efforts -- we just need to explicitly
  instantiate these template operators
* explicitly instantiate operator<< for timespan, signedspan, seconds
  and milliseconds. they are most likely to be used in Ceph. we can add
  more of them when necessary.

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

3 years agocommon/ceph_time: move operator<<(ostream&, timespan&) into std namespace
Kefu Chai [Thu, 7 Jan 2021 07:17:45 +0000 (15:17 +0800)]
common/ceph_time: move operator<<(ostream&, timespan&) into std namespace

otherwise compiler is not able to find it as the "timespan" here is
actually a class defined in std namespace, even it has an alias defined
in ceph namespace like:

typedef std::chrono::duration<rep, std::nano> timespan;

but this does not make it a member of "ceph" namespace. for more details
on the lookup rules, see https://en.cppreference.com/w/cpp/language/adl

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

3 years agoMerge pull request #45287 from yaarith/wip-52327-octopus
Yuri Weinstein [Wed, 11 May 2022 16:16:31 +0000 (09:16 -0700)]
Merge pull request #45287 from yaarith/wip-52327-octopus

octopus: mgr/devicehealth: fix missing timezone from time delta calculation

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #45324 from ljflores/wip-54468-octopus
Yuri Weinstein [Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)]
Merge pull request #45324 from ljflores/wip-54468-octopus

octopus: osd: require osd_pg_max_concurrent_snap_trims > 0

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Dan van der Ster <daniel.vanderster@cern.ch>
3 years agoMerge pull request #45593 from vumrao/wip-vumrao-55019
Yuri Weinstein [Wed, 11 May 2022 16:14:27 +0000 (09:14 -0700)]
Merge pull request #45593 from vumrao/wip-vumrao-55019

octopus: osd/PrimaryLogPG.cc: CEPH_OSD_OP_OMAPRMKEYRANGE should mark omap dirty

Reviewed-by: Neha Ojha <nojha@redhat.com>
3 years agoMerge pull request #45655 from ljflores/wip-55074-octopus
Yuri Weinstein [Wed, 11 May 2022 16:13:48 +0000 (09:13 -0700)]
Merge pull request #45655 from ljflores/wip-55074-octopus

octopus: osd/OSD: osd_fast_shutdown_notify_mon not quite right

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
3 years agoMerge pull request #45772 from ljflores/wip-53606-octopus
Yuri Weinstein [Wed, 11 May 2022 16:12:47 +0000 (09:12 -0700)]
Merge pull request #45772 from ljflores/wip-53606-octopus

octopus: mgr/telemetry: fix waiting for mgr to warm up

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
3 years agoMerge pull request #45182 from ideepika/wip-54323-octopus
Yuri Weinstein [Wed, 11 May 2022 14:41:05 +0000 (07:41 -0700)]
Merge pull request #45182 from ideepika/wip-54323-octopus

octopus: tools/rbd: expand where option rbd_default_map_options can be set

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #45180 from ideepika/wip-54380-octopus
Yuri Weinstein [Wed, 11 May 2022 14:39:29 +0000 (07:39 -0700)]
Merge pull request #45180 from ideepika/wip-54380-octopus

octopus: common: replace BitVector::NoInitAllocator with wrapper struct

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #45441 from cfsnyder/wip-52072-octopus
Yuri Weinstein [Wed, 11 May 2022 14:28:46 +0000 (07:28 -0700)]
Merge pull request #45441 from cfsnyder/wip-52072-octopus

octopus: rgw: add the condition of lock mode conversion to PutObjRentention

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agotest/rbd_mirror: grab timer lock before calling add_event_after() 45177/head
Ilya Dryomov [Wed, 13 Apr 2022 13:24:04 +0000 (15:24 +0200)]
test/rbd_mirror: grab timer lock before calling add_event_after()

add_event_after() expects an externally provided mutex to be held
for the call.  This was missed in commit 8965a0f2a6f7 ("rbd-mirror:
synchronize with in-flight stop in ImageReplayer::stop()").

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

3 years agorbd-mirror: synchronize with in-flight stop in ImageReplayer::stop()
Ilya Dryomov [Sun, 20 Feb 2022 16:33:08 +0000 (17:33 +0100)]
rbd-mirror: synchronize with in-flight stop in ImageReplayer::stop()

Complete on_finish right away only if the replayer is stopped (meaning
that it is legible to be restarted immediately, possibly from on_finish
itself).  This is the behaviour pretty much anyone would assume and
also what ImageReplayer::restart() relies on.

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

3 years agorbd-mirror: turn m_on_stop_finish into a list of Contexts
Ilya Dryomov [Sun, 20 Feb 2022 16:11:28 +0000 (17:11 +0100)]
rbd-mirror: turn m_on_stop_finish into a list of Contexts

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

3 years agorbd-mirror: manual stop should take precedence over regular stop
Ilya Dryomov [Sun, 20 Feb 2022 12:11:02 +0000 (13:11 +0100)]
rbd-mirror: manual stop should take precedence over regular stop

Somewhat similar to commit 0a3794e56256 ("rbd-mirror: make stop
properly cancel restart"), make it so that a) if a manual stop is
joined to regular stop, the stop becomes manual and b) if a regular
stop is joined to a manual stop, the stop stays manual.

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

3 years agorbd-mirror: straighten ImageReplayer::stop() a bit
Ilya Dryomov [Sat, 19 Feb 2022 15:43:04 +0000 (16:43 +0100)]
rbd-mirror: straighten ImageReplayer::stop() a bit

- don't default on_finish parameter
- m_restart_requested is set in ImageReplayer::restart() which is the
  only restart=true call site, so setting m_restart_requested here is
  redundant
- is_stopped_() can't be true in is_running_() branch
- on_finish->complete(0) in the end is unreachable

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

3 years agoMerge pull request #45458 from cfsnyder/wip-53037-octopus
Yuri Weinstein [Tue, 10 May 2022 23:25:02 +0000 (16:25 -0700)]
Merge pull request #45458 from cfsnyder/wip-53037-octopus

octopus: rgw: cls_bucket_list_unordered() might return one redundent entry every time is_truncated is true

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45481 from cfsnyder/wip-53653-octopus
Yuri Weinstein [Tue, 10 May 2022 23:24:33 +0000 (16:24 -0700)]
Merge pull request #45481 from cfsnyder/wip-53653-octopus

octopus: rgw: init bucket index only if putting bucket instance info succeeds

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45492 from cfsnyder/wip-54075-octopus
Yuri Weinstein [Tue, 10 May 2022 23:24:07 +0000 (16:24 -0700)]
Merge pull request #45492 from cfsnyder/wip-54075-octopus

octopus: rgw: bucket chown bad memory usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45496 from cfsnyder/wip-54085-octopus
Yuri Weinstein [Tue, 10 May 2022 23:23:41 +0000 (16:23 -0700)]
Merge pull request #45496 from cfsnyder/wip-54085-octopus

octopus: librgw: make rgw file handle versioned

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45503 from cfsnyder/wip-54149-octopus
Yuri Weinstein [Tue, 10 May 2022 23:23:13 +0000 (16:23 -0700)]
Merge pull request #45503 from cfsnyder/wip-54149-octopus

octopus: rgw: RGWPostObj::execute() may lost data.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45902 from ivancich/wip-55045-octopus
Yuri Weinstein [Tue, 10 May 2022 23:22:38 +0000 (16:22 -0700)]
Merge pull request #45902 from ivancich/wip-55045-octopus

octopus: cls/rgw: rgw_dir_suggest_changes detects race with completion

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45449 from cfsnyder/wip-52349-octopus
Yuri Weinstein [Tue, 10 May 2022 23:22:08 +0000 (16:22 -0700)]
Merge pull request #45449 from cfsnyder/wip-52349-octopus

octopus: rgw: change order of xml elements in ListRoles response

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agogoogletest submodule: pick up change to silence error=maybe-uninitialized warning 46223/head
Kefu Chai [Wed, 6 Jan 2021 08:18:17 +0000 (16:18 +0800)]
googletest submodule: pick up change to silence error=maybe-uninitialized warning

to include the fix of https://github.com/google/googletest/pull/3024

otherwise GCC-11 fails to compile the tests with following warning:

In file included from ../src/googletest/googletest/src/gtest-all.cc:42:
../src/googletest/googletest/src/gtest-death-test.cc: In function ‘bool testing::internal::StackGrowsDown()’:
../src/googletest/googletest/src/gtest-death-test.cc:1301:24: error: ‘dummy’ may be used uninitialized [-Werror=maybe-uninitialized]
 1301 |   StackLowerThanAddress(&dummy, &result);
      |   ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
../src/googletest/googletest/src/gtest-death-test.cc:1290:13: note: by argument 1 of type ‘const void*’ to ‘void testing::internal::StackLowerThanAddress(const void*, bool*)’ declared here
 1290 | static void StackLowerThanAddress(const void* ptr, bool* result) {
      |             ^~~~~~~~~~~~~~~~~~~~~
../src/googletest/googletest/src/gtest-death-test.cc:1299:7: note: ‘dummy’ declared here
 1299 |   int dummy;
      |       ^~~~~
cc1plus: all warnings being treated as errors

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

3 years agoMerge pull request #46219 from zdover23/wip-doc-45512-backport-to-octopus
zdover23 [Tue, 10 May 2022 17:06:30 +0000 (03:06 +1000)]
Merge pull request #46219 from zdover23/wip-doc-45512-backport-to-octopus

octopus: ceph/admin: s/master/main

Reviewed-by: Laura Flores <lflores@redhat.com>
3 years agoceph/admin: s/master/main 46219/head
Zac Dover [Thu, 17 Mar 2022 23:05:45 +0000 (09:05 +1000)]
ceph/admin: s/master/main

This PR changes the name "master" to "main" so
that builds (and, I assume, a great many other
things) will not fail.

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

3 years agoMerge pull request #45446 from cfsnyder/wip-52114-octopus
Yuri Weinstein [Tue, 10 May 2022 14:40:47 +0000 (07:40 -0700)]
Merge pull request #45446 from cfsnyder/wip-52114-octopus

octopus: qa/rgw: update apache-maven mirror for rgw/hadoop-s3a

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45443 from cfsnyder/wip-52108-octopus
Yuri Weinstein [Tue, 10 May 2022 14:40:12 +0000 (07:40 -0700)]
Merge pull request #45443 from cfsnyder/wip-52108-octopus

octopus: radosgw-admin: 'sync status' is not behind if there are no mdlog entries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45431 from cfsnyder/wip-51700-octopus
Yuri Weinstein [Tue, 10 May 2022 14:39:07 +0000 (07:39 -0700)]
Merge pull request #45431 from cfsnyder/wip-51700-octopus

octopus: rgw: url_decode before parsing copysource in copyobject

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45412 from cfsnyder/wip-54495-octopus
Yuri Weinstein [Tue, 10 May 2022 14:38:27 +0000 (07:38 -0700)]
Merge pull request #45412 from cfsnyder/wip-54495-octopus

octopus: rgw: fix segfault in UserAsyncRefreshHandler::init_fetch

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #46042 from cbodley/wip-55459
Yuri Weinstein [Tue, 10 May 2022 14:34:37 +0000 (07:34 -0700)]
Merge pull request #46042 from cbodley/wip-55459

octopus: rgw: RGWCoroutine::set_sleeping() checks for null stack

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45523 from cbodley/wip-54622
Yuri Weinstein [Tue, 10 May 2022 14:32:34 +0000 (07:32 -0700)]
Merge pull request #45523 from cbodley/wip-54622

octopus: rgw: parse tenant name out of rgwx-bucket-instance

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
3 years agoMerge pull request #45488 from cfsnyder/wip-53867-octopus
Yuri Weinstein [Tue, 10 May 2022 14:24:42 +0000 (07:24 -0700)]
Merge pull request #45488 from cfsnyder/wip-53867-octopus

octopus: rgw: return OK on consecutive complete-multipart reqs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45485 from cfsnyder/wip-53836-octopus
Yuri Weinstein [Tue, 10 May 2022 14:23:59 +0000 (07:23 -0700)]
Merge pull request #45485 from cfsnyder/wip-53836-octopus

octopus: rgw: document S3 bucket replication support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45462 from cfsnyder/wip-53157-octopus
Yuri Weinstein [Tue, 10 May 2022 14:21:33 +0000 (07:21 -0700)]
Merge pull request #45462 from cfsnyder/wip-53157-octopus

octopus: rgw:When KMS encryption is used and the key does not exist, we should…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45460 from cfsnyder/wip-53078-octopus
Yuri Weinstein [Tue, 10 May 2022 14:20:48 +0000 (07:20 -0700)]
Merge pull request #45460 from cfsnyder/wip-53078-octopus

octopus: src/rgw: Fix for malformed url

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45454 from cfsnyder/wip-52989-octopus
Yuri Weinstein [Tue, 10 May 2022 14:18:58 +0000 (07:18 -0700)]
Merge pull request #45454 from cfsnyder/wip-52989-octopus

octopus: rgw: document rgw_lc_debug_interval configuration option

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45452 from cfsnyder/wip-52957-octopus
Yuri Weinstein [Tue, 10 May 2022 14:18:13 +0000 (07:18 -0700)]
Merge pull request #45452 from cfsnyder/wip-52957-octopus

octopus: radosgw-admin: 'reshard list' doesn't log ENOENT errors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agotest/bufferlist: ensure rebuild_aligned_size_and_memory() always rebuilds. 46216/head
Radoslaw Zarzynski [Fri, 21 Jan 2022 01:50:22 +0000 (01:50 +0000)]
test/bufferlist: ensure rebuild_aligned_size_and_memory() always rebuilds.

Before the patch the test case was showing an unreliable behaviour
dependent on the underlying memory allocator. It was because
the bufferlist rebuild can be skipped, resulting in unchanged number
of buffers, if all of them begin at aligned addresses.

The commit fixes that by allocating a 4 KiB-aligned buffer and
offsetting it by a small constant (42) to ensure the memory added
to the bufferlist begins at non-4 KiB address.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 88176acd27b0d495abf9396c7ae2c6ec3fa46b1b)

3 years agotest/bufferlist: assert the rebuild in rebuild_aligned_size_and_memory() actually...
Radoslaw Zarzynski [Wed, 19 Jan 2022 21:56:05 +0000 (21:56 +0000)]
test/bufferlist: assert the rebuild in rebuild_aligned_size_and_memory() actually happens.

For the investigation of failures like the following one:

```
[ RUN      ] BufferList.rebuild_aligned_size_and_memory
../src/test/bufferlist.cc:1865: Failure
Expected equality of these values:
  bl.get_num_buffers()
    Which is: 2
  1
[  FAILED  ] BufferList.rebuild_aligned_size_and_memory (0 ms)
```

The test case assumes the rebuild before the failed clause **always**
happens while `bufferlist::rebuild_aligned_size_and_memory()` skips it
if buffers are already aligned.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 2de5f17647437d8f67adfe79becbb0e280f7f26f)

3 years agoMerge pull request #45283 from cbodley/wip-54482
Yuri Weinstein [Mon, 9 May 2022 21:55:40 +0000 (14:55 -0700)]
Merge pull request #45283 from cbodley/wip-54482

octopus: rgw: fix leak of RGWBucketList memory (octopus only)

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
3 years agoMerge pull request #45088 from dvanders/wip-52076-octopus
Yuri Weinstein [Mon, 9 May 2022 21:54:33 +0000 (14:54 -0700)]
Merge pull request #45088 from dvanders/wip-52076-octopus

octopus: rgw: resolve empty ordered bucket listing results w/ CLS filtering *and* bucket index list produces incorrect result when non-ascii entries

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoMerge pull request #45972 from ljflores/wip-55077-octopus
Laura Flores [Mon, 9 May 2022 18:39:37 +0000 (13:39 -0500)]
Merge pull request #45972 from ljflores/wip-55077-octopus

octopus: admin/doc-requirements: bump sphinx to 4.4.0

3 years agorgw: RGWCoroutine::set_sleeping() checks for null stack 46042/head
Or Friedmann [Tue, 19 Apr 2022 12:00:28 +0000 (12:00 +0000)]
rgw: RGWCoroutine::set_sleeping() checks for null stack

users of the RGWOmapAppend coroutine don't manage the lifetime of its
underlying coroutine stack, so end up making calls on RGWOmapAppend
after its stack goes away. this null check is a band-aid, and there are
still several other calls in RGWCoroutine that don't check for null
stack

Fixes: https://tracker.ceph.com/issues/49302
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3f0f831d66c7d43c9872f5de2aceb68aef4004d8)

3 years agodoc/conf.py: s/add_javascript/add_js_file/ 45972/head
Kefu Chai [Mon, 22 Jun 2020 01:34:53 +0000 (09:34 +0800)]
doc/conf.py: s/add_javascript/add_js_file/

to address following warning:

jenkins-build/build/workspace/ceph-pr-docs/doc/conf.py:102: RemovedInSphinx40Warning: The app.add_javascript() is deprecated. Please use app.add_js_file() instead.

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

3 years agomgr/cephadm: use block quote for "typical use"
Kefu Chai [Sun, 6 Mar 2022 07:28:16 +0000 (15:28 +0800)]
mgr/cephadm: use block quote for "typical use"

otherwise sphinx takes "Typical use" and the following line as a
field. see also

https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#field-lists

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 05798f0cae9afda598f5a154c62fdd24bab9ca30)

3 years agomgr/cephadm: improve the formatting of docstring
Kefu Chai [Sun, 6 Mar 2022 07:20:14 +0000 (15:20 +0800)]
mgr/cephadm: improve the formatting of docstring

add an empty line before a doctest block would help
sphinx to tell where the session starts.

see also https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#doctest-blocks

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 8685fffdf20eeb4e2068c421e351aa02c48ff860)

3 years agomgr/cephadm: document notes using "note::" directive
Kefu Chai [Sun, 6 Mar 2022 07:04:21 +0000 (15:04 +0800)]
mgr/cephadm: document notes using "note::" directive

so it can be rendered by sphinx in a better way.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit ba3ccee01b31ef9e39a5016a0ffda18628ec3bc2)

3 years agodoc/conf.py: silence warnings from breathe
Kefu Chai [Sun, 6 Mar 2022 06:27:50 +0000 (14:27 +0800)]
doc/conf.py: silence warnings from breathe

breathe calls doxygen for extracting/generating docs from code.
while doxygen complains at seeing undocumented fields/func. these
warnings could fail the sphinx-build command, if it takes warnings
as errors.

in this change, these warnings are silenced.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 8891d653198c30f9578499126e1ee9ee67eca04a)

3 years agomgr/cephadm: add empty line after param list in docstring
Kefu Chai [Sun, 6 Mar 2022 06:23:42 +0000 (14:23 +0800)]
mgr/cephadm: add empty line after param list in docstring

this helps to silence the warning from sphinx, like

src/pybind/mgr/orchestrator/_interface.py:docstring of orchestrator._interface.Orchestrator.remove_osds:9: WARNING: Field list ends without a blank line; unexpected unindent.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit d9b8e38e3dfe8e6eec6d56ee934c4632de46fc68)

 Conflicts:
src/pybind/mgr/orchestrator/_interface.py
- `:param zap:` did not exist in Octopus; removed
   this from the param list.