]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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.

3 years agomgr/cephadm: set docstring for shim() methods
Kefu Chai [Sun, 6 Mar 2022 06:05:07 +0000 (14:05 +0800)]
mgr/cephadm: set docstring for shim() methods

this allows the "rpc"ized methods of OrchestratorClientMixin to
have the docstring defined by the original methods.

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

 Conflicts:
src/pybind/mgr/orchestrator/_interface.py
- Removed some typing imports that were not present
  in Octopus

3 years agoadmin/doc-requirements: bump sphinx to 4.4.0
Kefu Chai [Sat, 5 Mar 2022 17:44:30 +0000 (01:44 +0800)]
admin/doc-requirements: bump sphinx to 4.4.0

bump sphinx to latest stable. to address following build failure

ERROR: sphinx-autodoc-typehints 1.17.0 has requirement Sphinx>=4, but you'll have sphinx 3.5.4 which is incompatible.
ERROR: sphinx-substitution-extensions 2022.2.16 has requirement sphinx>=4.0.0, but you'll have sphinx 3.5.4 which is incompatible.

also bump bump sphinx-rtd-theme, otherwise we'd have following
build failure:

ERROR: sphinx-rtd-theme 0.5.2 has requirement docutils<0.17, but you'll have docutils 0.17.1 which is incompatible.

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

 Conflicts:
admin/doc-requirements.txt
- `sphinx_rtd_theme` was not present in Octopus

3 years agoMerge pull request #44960 from BenoitKnecht/wip-54233-octopus
Yuri Weinstein [Fri, 25 Mar 2022 15:08:40 +0000 (08:08 -0700)]
Merge pull request #44960 from BenoitKnecht/wip-54233-octopus

octopus: mon: Abort device health when device not found

Reviewed-by: Yaarit Hatuka <yaarit@redhat.com>
3 years agoMerge pull request #44546 from cfsnyder/wip-53719-octopus
Yuri Weinstein [Fri, 25 Mar 2022 15:08:03 +0000 (08:08 -0700)]
Merge pull request #44546 from cfsnyder/wip-53719-octopus

octopus: osd/OSDMapMapping: fix spurious threadpool timeout errors

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
3 years agoMerge pull request #43224 from kotreshhr/wip-52629-octopus
Yuri Weinstein [Fri, 25 Mar 2022 15:07:04 +0000 (08:07 -0700)]
Merge pull request #43224 from kotreshhr/wip-52629-octopus

octopus: mgr/volumes: Fix permission during subvol creation with mode

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #45613 from rhcs-dashboard/octopus-null-injection-fix
Ernesto Puerta [Thu, 24 Mar 2022 10:05:19 +0000 (11:05 +0100)]
Merge pull request #45613 from rhcs-dashboard/octopus-null-injection-fix

octopus: mgr/dashboard: fix "NullInjectorError: No provider for I18n

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
3 years agomgr/dashboard: fix "NullInjectorError: No provider for I18n 45613/head
Nizamudeen A [Thu, 24 Mar 2022 08:01:18 +0000 (13:31 +0530)]
mgr/dashboard: fix "NullInjectorError: No provider for I18n

Although I am not sure what's the root cause of this but this seems to
fix the test failure. I don't know if this is caused by the differnce in
angular versions between master and octopus but I still don't understand
why it didn't catch in the recent PR to this file (https://github.com/ceph/ceph/pull/44763)

Fixes: https://tracker.ceph.com/issues/55011
Signed-off-by: Nizamudeen A <nia@redhat.com>
3 years agodoc: rgw: document S3 bucket replication support 45485/head
Matt Benjamin [Tue, 5 Jan 2021 20:30:23 +0000 (15:30 -0500)]
doc: rgw: document S3 bucket replication support

Support was added at Octopus.

Fixes: https://tracker.ceph.com/issues/48755
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 774a247b2b854538b679490581e6950372142797)

3 years agorgw:When KMS encryption is used and the key does not exist, we should not throw ERR_... 45462/head
wangyingbin [Wed, 16 Sep 2020 07:15:45 +0000 (15:15 +0800)]
rgw:When KMS encryption is used and the key does not exist, we should not throw ERR_ INVALID_ ACCESS_ Key error code.

When kms encryption is used, the key_id is null or the actual_key size is wrong, we should not throw "ERR_INVALID_ACCESS_KEY " error code, instead of "EINVAL"error code, is used to indicate parameter error.

Signed-off-by: wangyingbin <wangyingbin@inspur.com>
(cherry picked from commit 40dbc29984d67a3f4946a0b30d53f3db19952bf0)

3 years agosrc/rgw: Fix for malformed url 45460/head
Kalpesh Pandya [Wed, 13 Oct 2021 19:59:06 +0000 (01:29 +0530)]
src/rgw: Fix for malformed url

This PR solves: https://tracker.ceph.com/issues/52738
It is solved by making changes to rgw_url.cc
A test is also added to check it's working.

Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
(cherry picked from commit 2916f2439eb2f62bc08c3e283b13391302b3e497)

3 years agorgw: document rgw_lc_debug_interval configuration option 45454/head
J. Eric Ivancich [Tue, 5 Oct 2021 23:27:27 +0000 (19:27 -0400)]
rgw: document rgw_lc_debug_interval configuration option

Updates the yaml describing this config option with a "desc" and a
"long_desc".

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

Conflicts:
src/common/options/rgw.yaml.in

Cherry-pick notes:
- Octopus options are not defined in yaml

3 years agoradosgw-admin: 'reshard list' doesn't log ENOENT errors 45452/head
Casey Bodley [Mon, 11 Oct 2021 18:25:37 +0000 (14:25 -0400)]
radosgw-admin: 'reshard list' doesn't log ENOENT errors

ENOENT errors are expected, especially in fresh clusters, before we've
written any entries to the reshard list shards. avoid logging these
non-fatal ERROR messages:

> -1 ERROR: failed to list reshard log entries, oid=reshard.0000000000 marker= (2) No such file or directory

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

Conflicts:
src/rgw/rgw_reshard.cc

Cherry-pick notes:
- Octopus using lderr vs ldpp_dout

3 years agoMerge pull request #45334 from idryomov/wip-client-upgrade-octopus-pacific-cleanup
Ilya Dryomov [Fri, 11 Mar 2022 11:47:57 +0000 (12:47 +0100)]
Merge pull request #45334 from idryomov/wip-client-upgrade-octopus-pacific-cleanup

qa/suites: clean up client-upgrade-octopus-pacific test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
3 years agoMerge pull request #44763 from votdev/wip-53928-octopus
Ernesto Puerta [Thu, 10 Mar 2022 18:08:47 +0000 (19:08 +0100)]
Merge pull request #44763 from votdev/wip-53928-octopus

octopus: mgr/dashboard: Notification banners at the top of the UI have fixed height

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
3 years agoMerge pull request #44924 from p-se/wip-53883-octopus
Ernesto Puerta [Thu, 10 Mar 2022 18:06:44 +0000 (19:06 +0100)]
Merge pull request #44924 from p-se/wip-53883-octopus

octopus: mgr/dashboard: fix Grafana OSD/host panels

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
3 years agoqa/suites: clean up client-upgrade-octopus-pacific test 45334/head
Ilya Dryomov [Thu, 10 Mar 2022 11:40:34 +0000 (12:40 +0100)]
qa/suites: clean up client-upgrade-octopus-pacific test

- fix .qa symlinks
- rename nautilus-client-x.yaml to octopus-client-x.yaml
- fix typos and remove stale comment
- remove 2-features permutation (it doesn't do anything useful as the
  workunit is run with RBD_FEATURES environment variable set and those
  features are explicitly passed to RBD.create and RBD.clone calls;
  the net effect is that the exact same job is run twice)

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
3 years agoMerge pull request #45282 from ceph/wip-yuri-octopus-clients
Ilya Dryomov [Thu, 10 Mar 2022 10:34:10 +0000 (11:34 +0100)]
Merge pull request #45282 from ceph/wip-yuri-octopus-clients

qa/tests: added upgrade-clients/client-upgrade-octopus-quincy tests

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
3 years agorgw: fix bucket index listing count bug 45088/head
J. Eric Ivancich [Wed, 25 Aug 2021 13:50:29 +0000 (09:50 -0400)]
rgw: fix bucket index listing count bug

Fix bugs surrounding calculation of number of entries returned and
whether the end of a listing range has been reached.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
3 years agoqa/tests: added upgrade-clients/client-upgrade-octopus-quincy tests 45282/head
Yuri Weinstein [Mon, 7 Mar 2022 16:33:39 +0000 (08:33 -0800)]
qa/tests: added upgrade-clients/client-upgrade-octopus-quincy tests

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
3 years agorgw: fix leak of RGWBucketList memory (octopus only) 45283/head
Casey Bodley [Mon, 7 Mar 2022 19:22:21 +0000 (14:22 -0500)]
rgw: fix leak of RGWBucketList memory (octopus only)

this updates an earlier octopus-only fix,
0de02a88be0972c89ed2bb10dc438d080137bd18, to also free the RGWBucket*
in each map entry

this issue only exists on octopus, so this fix targets octopus directly
instead of cherry-picking from master

Fixes: https://tracker.ceph.com/issues/54482
Signed-off-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45261 from idryomov/wip-cmake-disable-dpdk-warnings-octopus
Kefu Chai [Sat, 5 Mar 2022 18:40:56 +0000 (02:40 +0800)]
Merge pull request #45261 from idryomov/wip-cmake-disable-dpdk-warnings-octopus

octopus: cmake: pass RTE_DEVEL_BUILD=n when building dpdk

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agocmake: pass RTE_DEVEL_BUILD=n when building dpdk 45261/head
Kefu Chai [Sat, 5 Mar 2022 04:49:57 +0000 (12:49 +0800)]
cmake: pass RTE_DEVEL_BUILD=n when building dpdk

ceph is still using the Makefile based building system for building
DPDK. and DPDK enables -Werror if RTE_DEVEL_BUILD is 'y' which is
enabled by default when the dpdk is built from a git repo.

but newer GCC is more picky than the older versions, to prevent
the possible FTBFS when we switch to newer GCC for building old
branches whose dpdk submodule might be include the changes addressing
those warnings. let's just disable this option.

the only effect of this option is to add -Werror to CFLAGS. but
the building warnings from DPDK is not our focus when developing
Ceph in the most cases. so it should be fine.

see also
https://github.com/ceph/dpdk/blob/eac901ce29be559b1bb5c5da33fe2bf5c0b4bfd6/doc/build-sdk-quick.txt#L18

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

Conflicts:
cmake/modules/BuildDPDK.cmake [ commit d3c315703ae6 ("cmake:
  pass -Wunused-but-set-variable when building dpdk") not in
  octopus ]

3 years agoMerge pull request #45169 from pponnuvel/wip-54382-octopus
Yuri Weinstein [Fri, 4 Mar 2022 16:13:06 +0000 (08:13 -0800)]
Merge pull request #45169 from pponnuvel/wip-54382-octopus

octopus: rbd-mirror: make mirror properly detect pool replayer needs restart

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
3 years agoMerge pull request #45147 from guits/wip-54400-octopus
Guillaume Abrioux [Fri, 4 Mar 2022 12:08:13 +0000 (13:08 +0100)]
Merge pull request #45147 from guits/wip-54400-octopus

octopus: ceph-volume: abort when passed devices have partitions

3 years agoMerge pull request #44800 from kotreshhr/wip-53947-octopus
Yuri Weinstein [Wed, 2 Mar 2022 17:08:39 +0000 (09:08 -0800)]
Merge pull request #44800 from kotreshhr/wip-53947-octopus

octopus: mgr/volumes: A few volumes plugin backport

Reviewed-by: Venky Shankar vshankar@redhat.com
3 years agoMerge pull request #44624 from lxbsz/wip-53865
Yuri Weinstein [Wed, 2 Mar 2022 16:42:09 +0000 (08:42 -0800)]
Merge pull request #44624 from lxbsz/wip-53865

octopus: mds: directly return just after responding the link request

Reviewed-by: Jeff Layton <jlayton@redhat.com>
3 years agoMerge pull request #44976 from vshankar/wip-54242
Yuri Weinstein [Wed, 2 Mar 2022 15:50:50 +0000 (07:50 -0800)]
Merge pull request #44976 from vshankar/wip-54242

octopus: mds: ignore unknown client op when tracking op latency

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
3 years agoMerge pull request #45206 from idryomov/wip-rbd-qemu-iotests-8stream-octopus
Ilya Dryomov [Wed, 2 Mar 2022 10:49:16 +0000 (11:49 +0100)]
Merge pull request #45206 from idryomov/wip-rbd-qemu-iotests-8stream-octopus

octopus: backport qemu-iotests fixup for centos stream 8

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #44883 from guits/wip-54126-octopus
Guillaume Abrioux [Wed, 2 Mar 2022 09:18:29 +0000 (10:18 +0100)]
Merge pull request #44883 from guits/wip-54126-octopus

octopus: ceph-volume: fix error 'KeyError' with inventory

3 years agoMerge pull request #44768 from guits/wip-54008-octopus
Guillaume Abrioux [Wed, 2 Mar 2022 08:38:05 +0000 (09:38 +0100)]
Merge pull request #44768 from guits/wip-54008-octopus

octopus: ceph-volume: fix tags dict output in `lvm list`

3 years agoceph-volume: abort when passed devices have partitions 45147/head
Guillaume Abrioux [Wed, 23 Feb 2022 08:36:29 +0000 (09:36 +0100)]
ceph-volume: abort when passed devices have partitions

ceph-volume doesn't prevent from using db and/or wal devices
with existing partitions on them.
This can lead to a data loss situation.

Fixes: https://tracker.ceph.com/issues/54376
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 75c91a8c6f37a38d69d5da8b1e7d49d9c636230b)

3 years agoMerge pull request #44806 from mkogan1/wip-52900-octopus
Yuri Weinstein [Tue, 1 Mar 2022 20:01:22 +0000 (12:01 -0800)]
Merge pull request #44806 from mkogan1/wip-52900-octopus

octopus rgw: under fips, set flag to allow md5 in select rgw ops

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
3 years agoMerge pull request #43656 from poulpreben/backport-object-lock-retain-date-iso8601
Yuri Weinstein [Tue, 1 Mar 2022 19:58:25 +0000 (11:58 -0800)]
Merge pull request #43656 from poulpreben/backport-object-lock-retain-date-iso8601

octopus: rgw: Dump Object Lock Retain Date as ISO 8601

Reviewed-by: Casey Bodley <cbodley@redhat.com>
3 years agoMerge pull request #45110 from ljflores/wip-54351-octopus
Laura Flores [Tue, 1 Mar 2022 19:44:47 +0000 (13:44 -0600)]
Merge pull request #45110 from ljflores/wip-54351-octopus

octopus: mgr/dashboard: dashboard turns telemetry off when configuring report

3 years agoMerge pull request #45076 from chrisphoffman/wip-54297-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:32:05 +0000 (11:32 -0800)]
Merge pull request #45076 from chrisphoffman/wip-54297-octopus

octopus: cls/rbd: GroupSnapshotNamespace comparator violates ordering rules

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #45071 from idryomov/wip-qemu-task-rbd-package-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:31:36 +0000 (11:31 -0800)]
Merge pull request #45071 from idryomov/wip-qemu-task-rbd-package-octopus

octopus: qa/tasks/qemu: make sure block-rbd.so is installed

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #45019 from trociny/wip-47427-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:31:07 +0000 (11:31 -0800)]
Merge pull request #45019 from trociny/wip-47427-octopus

octopus: librbd: track complete async operation requests

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #45006 from sunnyku/wip-54169-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:30:34 +0000 (11:30 -0800)]
Merge pull request #45006 from sunnyku/wip-54169-octopus

octopus: mgr/rbd_support: fix schedule remove

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoMerge pull request #45009 from idryomov/wip-rbd-help-positional-optional-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:30:06 +0000 (11:30 -0800)]
Merge pull request #45009 from idryomov/wip-rbd-help-positional-optional-octopus

octopus: rbd: mark optional positional arguments as such in help output

Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #45004 from idryomov/wip-54128-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:29:03 +0000 (11:29 -0800)]
Merge pull request #45004 from idryomov/wip-54128-octopus

octopus: krbd: return error when no initial monitor address found

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #45001 from idryomov/wip-krbd-rxbounce-option-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:28:38 +0000 (11:28 -0800)]
Merge pull request #45001 from idryomov/wip-krbd-rxbounce-option-octopus

octopus: rbd: recognize rxbounce map option

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
3 years agoMerge pull request #45000 from idryomov/wip-52522-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:28:07 +0000 (11:28 -0800)]
Merge pull request #45000 from idryomov/wip-52522-octopus

octopus: librbd: fix use-after-free on ictx in list_descendants()

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
3 years agoMerge pull request #44992 from idryomov/wip-writesame-fua-octopus
Yuri Weinstein [Tue, 1 Mar 2022 19:22:26 +0000 (11:22 -0800)]
Merge pull request #44992 from idryomov/wip-writesame-fua-octopus

octopus: librbd: honor FUA op flag for write_same() in write-around cache

Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
3 years agotest/rgw: fix and add to rgw/cls bi_list tests
J. Eric Ivancich [Tue, 17 Aug 2021 21:35:19 +0000 (17:35 -0400)]
test/rgw: fix and add to rgw/cls bi_list tests

Make sure marker is cleared. Put end-of-list check inside the
conditional with the rest of the test. Add some additional testing.

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

3 years ago15.2.16 v15.2.16
Jenkins Build Slave User [Tue, 1 Mar 2022 06:44:29 +0000 (06:44 +0000)]
15.2.16

3 years agoworkunits/rbd: remove lsb_release 45206/head
Ken Dreyer [Thu, 12 Aug 2021 14:44:48 +0000 (10:44 -0400)]
workunits/rbd: remove lsb_release

The lsb_release utility brings in a lot of other dependencies. Remove
it from the RBD workunit script.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 65f4d6eb3664a4cc6120031679b8368cbc02a4a5)

3 years agoqa/workunits/rbd: use xenial version of qemu-iotests for centos stream 8
Ilya Dryomov [Tue, 3 Aug 2021 07:44:18 +0000 (09:44 +0200)]
qa/workunits/rbd: use xenial version of qemu-iotests for centos stream 8

It is already used for centos 8(.3) and rhel 8(.4).

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

3 years agomgr/volumes: Fix clone uid/gid mismatch 44800/head
Kotresh HR [Thu, 10 Feb 2022 05:34:41 +0000 (11:04 +0530)]
mgr/volumes: Fix clone uid/gid mismatch

This is the regression caused by commit 18b85c53a.
The 'set_attrs' function sets the uid/gid of the
group to the subvolume if uid/gid is not passed.
The attrs of the clone should match the source
snapshot. Hence, don't use the 'set_attrs'
function to set only the quota attrs for the
clone.

Fixes: https://tracker.ceph.com/issues/54066
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit b3c9e6b50cf4264538e4c41d19e7ebb8b2900c3a)

3 years agoqa: Add tests snapshot clone failure with quota
Kotresh HR [Wed, 12 Jan 2022 09:37:13 +0000 (15:07 +0530)]
qa: Add tests snapshot clone failure with quota

Fixes: https://tracker.ceph.com/issues/53848
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 7c0d31e52cea90e65152996024cabfa8a8fd299f)

Conflicts:
  qa/tasks/cephfs/test_volumes.py: The commit 103c7bdc70ca is
   not backported

3 years agomgr/volumes: Fix subvoume snapshot clone failure
Kotresh HR [Wed, 12 Jan 2022 09:31:53 +0000 (15:01 +0530)]
mgr/volumes: Fix subvoume snapshot clone failure

Problem:
The subvolume snapshot clone fails if the quota on the source
has exceeded. Since the quota is not strictly enforced at the
byte range, this is a possibility.

Cause:
The quota on the clone is set prior to copying the data
from the source. Hence the quota mostly get enforced before
copying the entire data from the source resulting in the
clone failure.

Solution:
Enforce quota on the clone after the data is copied.

Fixes: https://tracker.ceph.com/issues/53848
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 18b85c53af36d89a8c53b40cfc44fe06816a9733)

3 years agomgr/volumes: Improve debugging, add clone failure logs
Kotresh HR [Wed, 12 Jan 2022 05:43:20 +0000 (11:13 +0530)]
mgr/volumes: Improve debugging, add clone failure logs

Fixes: https://tracker.ceph.com/issues/53848
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 29ad638773715c92a0c77f10731bd69167e4ce80)

3 years agomgr/volumes: use dedicated libcephfs handles for subvolume calls and async jobs
Venky Shankar [Fri, 18 Jun 2021 07:13:01 +0000 (03:13 -0400)]
mgr/volumes: use dedicated libcephfs handles for subvolume calls and async jobs

Fixes: http://tracker.ceph.com/issues/51271
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit cb2883feac1a5c141a3d72120c2320f7a8ffdea8)

Conflicts:
  src/pybind/mgr/volumes/fs/async_cloner.py: The commit cf2a1ad65120 is
not backported
  src/pybind/mgr/volumes/fs/async_job.py: The commit cf2a1ad65120 is not
backported

3 years agomgr/volumes: Add config to insert delay at the beginning of the clone
Kotresh HR [Mon, 28 Feb 2022 10:53:39 +0000 (16:23 +0530)]
mgr/volumes: Add config to insert delay at the beginning of the clone

Added the config 'delay_snapshot_clone' to insert delay at the beginning
of the clone to avoid races in tests. The default value is set to 0.

Fixes: https://tracker.ceph.com/issues/48231
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 7588f985054282d2cff7f3582e995584b1fd20f8)

Conflicts:
 qa/tasks/cephfs/test_volumes.py: Conflicts due to tests ordering
 src/pybind/mgr/volumes/fs/volume.py: The commit e308bf898955 is not
backported
 src/pybind/mgr/volumes/module.py: The commit f002c6ce4033 is not
backported

3 years agomgr_util: move is_stopping from VolumeClient to CephfsClient
Jan Fajerski [Thu, 12 Mar 2020 12:25:43 +0000 (13:25 +0100)]
mgr_util: move is_stopping from VolumeClient to CephfsClient

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8c94c21d098ac31708dda66cd35ccb0da5d1fd75)

3 years agomgr_util: rename ConnectionPool -> CephfsConnectionPool
Jan Fajerski [Thu, 12 Mar 2020 09:34:56 +0000 (10:34 +0100)]
mgr_util: rename ConnectionPool -> CephfsConnectionPool

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 51f6f64c123533bd2d33e3ec768af63a757a1d2a)

3 years agomgr_util: add CephfsClient implementation
Jan Fajerski [Wed, 18 Dec 2019 10:35:40 +0000 (11:35 +0100)]
mgr_util: add CephfsClient implementation

This pulls parts of the VolumesClient implementation into mgr_util to
make the CephFS specific pieces available to other mgr modules. To
reduce code duplication the VolumeClient now extends the CephfsClient
class to add the volume specific methods.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a44de38b61d598fb0512ea48da0de4179d39b804)

src/pybind/mgr/mgr_util.py
src/pybind/mgr/tox.ini
src/pybind/mgr/volumes/fs/operations/volume.py
src/pybind/mgr/volumes/fs/volume.py
  Trivial conflicts because ofthe order of backports to octopus

3 years agorbd-mirror: make mirror properly detect pool replayer needs restart 45169/head
Mykola Golub [Fri, 18 Feb 2022 10:42:23 +0000 (10:42 +0000)]
rbd-mirror: make mirror properly detect pool replayer needs restart

When a PoolReplayer detects remote pool metadata change it
sets "stopping" flag expecting the Mirror will restart it.

Although setting "stopping" flag makes the PoolReplayer::run
thread to terminate, the thread's is_started function will still
return true until join is called (and reset the thread id).

This made impossible for the Mirror to detect (by calling
PoolReplayer::is_running) that the PoolReplayer needed restart.

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

3 years agomgr/dashboard: Contact Info should be visible only when Ident channel is checked 45110/head
Sarthak0702 [Wed, 16 Feb 2022 12:45:35 +0000 (18:15 +0530)]
mgr/dashboard: Contact Info should be visible only when Ident channel is checked

Fixes:https://tracker.ceph.com/issues/54133
Signed-off-by: Sarthak0702 <sarthak.0702@gmail.com>
(cherry picked from commit 15211a6378a6fee9316f79ba0b27821891527c38)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
- `this.loading` used in Octopus instead of `this.loadingReady()`

3 years agomgr/dashboard: telemetry activate: show ident fields when checked
Aaryan Porwal [Sun, 6 Jun 2021 22:08:37 +0000 (03:38 +0530)]
mgr/dashboard: telemetry activate: show ident fields when checked

Signed-off-by: Aaryan Porwal <aaryanporwal2233@gmail.com>
(cherry picked from commit ad5b3f200529fc0bc511ce99eed338afcaef6a62)

3 years agomgr/dashboard: dashboard turns telemetry off when configuring report
Sarthak0702 [Thu, 10 Feb 2022 19:50:42 +0000 (01:20 +0530)]
mgr/dashboard: dashboard turns telemetry off when configuring report

Signed-off-by: Sarthak0702 <sarthak.0702@gmail.com>
(cherry picked from commit 97c57adf8565756dbf24f3c46ed3916303903fb7)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
- `this.i18n()` was used in Octopus instead of `$localize`

3 years agorgw: fix bucket index list minor calculation bug
J. Eric Ivancich [Wed, 12 Jan 2022 18:41:42 +0000 (13:41 -0500)]
rgw: fix bucket index list minor calculation bug

When "bucket index list" traverses the different regions in the bucket
index assembling the output, it miscalculates how many entries to ask
for at one point. This fixes that.

This fixes previous "rgw: bucket index list can produce I/O errors".

Credit for finding this bug goes to Soumya Koduri <skoduri@redhat.com>.

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

3 years agorgw: allow ordered bucket listing to work when many filtered out entries
J. Eric Ivancich [Mon, 19 Jul 2021 18:24:11 +0000 (14:24 -0400)]
rgw: allow ordered bucket listing to work when many filtered out entries

A previous PR moved the much of the filtering that's part of bucket
listing to the CLS layer. One unanticipated result was that it is now
possible for a call to return 0 entries. In such a case we want to
retry the call with the marker moved forward (i.e., advanced),
repeatedly if necessary, in order to either retrieve some entries or
to hit the end of the entries. This PR adds that functionality.

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

Conflicts:
src/cls/rgw/cls_rgw_ops.h
s/ceph::buffer::list/bufferlist/g

3 years agorgw: allow CLSRGWConcurrentIO to handle "advancing" retries
J. Eric Ivancich [Mon, 19 Jul 2021 18:23:42 +0000 (14:23 -0400)]
rgw: allow CLSRGWConcurrentIO to handle "advancing" retries

When doing an asynchronous/concurrent bucket index operation against
multiple bucket index shards, a special error code is set aside to
indicate that an "advancing" retry of a/some shard(s) is necessary. In
that case another asynchronous call is made on the indicated shard(s)
from the client (i.e., CLSRGWConcurrentIO).  It is up to the subclass
of CLSRGWConcurrentIO to handle the retry such that it "advances" and
simply doesn't get stuck, looping forever.

The retry functionality only works when the "need_multiple_rounds"
functionality is not in use.

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

Conflicts:
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h

Resolved by taking the patch version -- all cases of auto type and std::

3 years agorgw: de-conflate shard_id and request_id in CLSRGWConcurrentIO
J. Eric Ivancich [Fri, 16 Jul 2021 19:31:35 +0000 (15:31 -0400)]
rgw: de-conflate shard_id and request_id in CLSRGWConcurrentIO

When using asynchronous (concurrent) IO for bucket index requests,
there are two int ids that are used that need to be kept separate --
shard id and request id. In many cases they're the same -- shard 0
gets request 0, and so forth.

But in preparation for re-requests, those ids can diverge, where
request 13 maps to shard 2. The existing code maintained the OIDs that
went with each request. This PR also maintains the shard id as
well. Documentation has been beefed up to help future developers
navigate this.

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

Conflicts:
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h

In all cases I took the patch code, not mangling anything.
These were all cases of std:: or auto type.

3 years agorgw: bucket index list produces incorrect result when non-ascii entries
J. Eric Ivancich [Tue, 13 Jul 2021 19:36:53 +0000 (15:36 -0400)]
rgw: bucket index list produces incorrect result when non-ascii entries

A recent PR that helped address the issue of non-ascii plain entries
didn't cover all the bases, allowing I/O errors to be produced in some
circumstances during a bucket index list (i.e., `radosgw-admin bi list
...`).

This fixes those issue and does some additional clean-up.

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

3 years agocls/rbd: GroupSnapshotNamespace comparator violates ordering rules 45076/head
Ilya Dryomov [Mon, 14 Feb 2022 12:04:00 +0000 (13:04 +0100)]
cls/rbd: GroupSnapshotNamespace comparator violates ordering rules

For

  GroupSnapshotNamespace a(1, "group-1", "snap-2");
  GroupSnapshotNamespace b(1, "group-2", "snap-1");

both a < b and b < a evaluate to true.  This violates STL strict weak
ordering requirements which is a problem because GroupSnapshotNamespace
is used as a key in std::map (ictx->snap_ids at least), etc.

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

3 years agoqa/suites/rbd: make sure block-rbd.so is installed 45071/head
Ilya Dryomov [Wed, 16 Feb 2022 09:32:26 +0000 (10:32 +0100)]
qa/suites/rbd: make sure block-rbd.so is installed

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

3 years agoqa/tasks/qemu: make sure block-rbd.so is installed
Ilya Dryomov [Tue, 15 Feb 2022 13:57:51 +0000 (14:57 +0100)]
qa/tasks/qemu: make sure block-rbd.so is installed

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

3 years agoceph-volume: fix error 'KeyError' with inventory 44883/head
Guillaume Abrioux [Mon, 6 Dec 2021 09:24:46 +0000 (10:24 +0100)]
ceph-volume: fix error 'KeyError' with inventory

The tag ceph.cluster_name is always set at the end.
The only way it could be absent was if the osd prepare
has been interrupted between [1] and [2].

[1] https://github.com/ceph/ceph/blob/v14.2.11/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py#L355-L387
[2] https://github.com/ceph/ceph/blob/v14.2.11/src/ceph-volume/ceph_volume/devices/lvm/prepare.py

Although the code received tremendous changes meantime
and this error shouldn't show up again, we need to handle
the case where this tag wouldn't have been set.

Fixes: https://tracker.ceph.com/issues/44356
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 691660c42eaa568a754670e093c512aa041d1479)

3 years agoMerge pull request #44986 from badone/wip-octopus-ceph-ansible-move-to-stream
Brad Hubbard [Wed, 16 Feb 2022 03:26:57 +0000 (13:26 +1000)]
Merge pull request #44986 from badone/wip-octopus-ceph-ansible-move-to-stream

octopus: qa/ceph-ansible: Move to Centos Stream

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agolibrbd: reset complete async request expiration time 45019/head
Mykola Golub [Tue, 29 Sep 2020 09:07:56 +0000 (10:07 +0100)]
librbd: reset complete async request expiration time

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

Conflicts:
src/librbd/ImageWatcher.cc (no quiesce requests in octopus,
            AsyncRequestId == operator is not supported, use !=)

3 years agoMerge pull request #44791 from guits/wip-54023-octopus
Yuri Weinstein [Mon, 14 Feb 2022 20:08:50 +0000 (12:08 -0800)]
Merge pull request #44791 from guits/wip-54023-octopus

octopus: ceph-volume: improve mpath devices support

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
3 years agoceph-volume: fix typo in tests 44791/head
Guillaume Abrioux [Tue, 14 Dec 2021 10:08:48 +0000 (11:08 +0100)]
ceph-volume: fix typo in tests

This fixes 2 typo in ceph-volume tests.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit b07bd3e0e17021e0cf9773f916fad954f12254ed)

3 years agodoc/ceph-volume: fix a typo
Guillaume Abrioux [Tue, 14 Dec 2021 09:42:09 +0000 (10:42 +0100)]
doc/ceph-volume: fix a typo

This fixes a typo in ceph-volume documentation.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 5d0a3cee5d7021dafd1e166e17946689b4bb90b7)

3 years agoceph-volume: add a test `test_mpath_device_is_device`
Guillaume Abrioux [Tue, 14 Dec 2021 09:40:35 +0000 (10:40 +0100)]
ceph-volume: add a test `test_mpath_device_is_device`

This test checks that Device.is_device() returns True for a mpath device.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 0280ff6df09bc26107bc97446e9d5c18fbc582e9)

3 years agoceph-volume: improve mpath devices support
Guillaume Abrioux [Tue, 14 Dec 2021 08:57:10 +0000 (09:57 +0100)]
ceph-volume: improve mpath devices support

ee8887f4c0ff4f91117f31b621b95c8d08019130 was intended for adding
mpath devices support in ceph-volume but it has missed the lvm batch scenario.
This also fixes the zapping of mpath devices prepared with `ceph-volume raw`

Fixes: https://tracker.ceph.com/issues/52908
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 601ff7ed0a3ba5172b6bd886ca8ba2bd4d9e655a)

3 years agoMerge pull request #44974 from guits/wip-54245-octopus
Guillaume Abrioux [Mon, 14 Feb 2022 15:42:47 +0000 (16:42 +0100)]
Merge pull request #44974 from guits/wip-54245-octopus

octopus: ceph-volume: honour osd_dmcrypt_key_size option

3 years agolibrbd: track complete async operation return code
Mykola Golub [Mon, 21 Sep 2020 13:32:17 +0000 (14:32 +0100)]
librbd: track complete async operation return code

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

Conflicts:
src/librbd/ImageWatcher.cc (no quiesce requests in octopus)

3 years agolibrbd: track complete async operation requests
Mykola Golub [Sun, 6 Sep 2020 12:48:53 +0000 (13:48 +0100)]
librbd: track complete async operation requests

to prevent duplicate maintenance operations due to RPC hiccups.

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

Conflicts:
src/librbd/ImageWatcher.cc (no quiesce requests in octopus)

3 years agorbd: mark optional positional arguments as such in help output 45009/head
Ilya Dryomov [Tue, 8 Feb 2022 09:11:49 +0000 (10:11 +0100)]
rbd: mark optional positional arguments as such in help output

Currently at least five commands have optional positional arguments.

Overloading po::value<std::string>()->default_value("") for this
is a bit sneaky but nothing better fits into the existing Shell.cc
framework.

Note that strictly speaking "[<interval>] [<start-time>]" should be
"[<interval> [<start-time>]]" but we aren't doing that here because
"ceph" command doesn't do it either.

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

3 years agorbd: ensure the help printer doesn't print past the end of the line
Jason Dillaman [Wed, 21 Oct 2020 19:15:09 +0000 (15:15 -0400)]
rbd: ensure the help printer doesn't print past the end of the line

When long command names and long optional names are combined,
it's possible for the help text to be printed beyond the 80
character limit.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 51478deab22178d01db7fa8632ba72071b4dfc38)

3 years agoqa/workunits/rbd: improve schedule add/remove cli test 45006/head
Sunny Kumar [Wed, 19 Jan 2022 13:15:52 +0000 (13:15 +0000)]
qa/workunits/rbd: improve schedule add/remove cli test

This patch adds few tests to cover schedule add/remove with invalid
inputs.

Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
(cherry picked from commit a9312d4777a82d8f2d8766a011f10952f84d3f27)

3 years agomgr/rbd_support: fix schedule remove
Sunny Kumar [Fri, 12 Nov 2021 16:27:55 +0000 (16:27 +0000)]
mgr/rbd_support: fix schedule remove

Issue:

If we provide a random string in the schedule remove
command the entire schedule at specified level gets
removed.

Fixes: https://tracker.ceph.com/issues/53250
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
(cherry picked from commit 1b62447071a900b9fa7d856617cb7db9e030f91e)

3 years agokrbd: return error when no initial monitor address found 45004/head
Burt Holzman [Wed, 2 Feb 2022 15:18:52 +0000 (09:18 -0600)]
krbd: return error when no initial monitor address found

Since we filter monitor addresses based on ms_mode, check that at
least one address was found.

Otherwise, we mismatch arguments when calling sysfs/add_single_major
which emits a misleading error message to dmesg:

  libceph: resolve 'name=user1' (ret=-3): failed
  libceph: parse_ips bad ip 'name=user1,key=client.user1'

Fixes: https://tracker.ceph.com/issues/54128
Signed-off-by: Burt Holzman <burt@fnal.gov>
(cherry picked from commit 0076ffc86e043af7aedc127df8661eaf87fc1c58)

3 years agoqa/suites/krbd: add legacy+rxbounce and crc+rxbounce coverage 45001/head
Ilya Dryomov [Mon, 31 Jan 2022 13:08:26 +0000 (14:08 +0100)]
qa/suites/krbd: add legacy+rxbounce and crc+rxbounce coverage

For basic, rbd and rbd-nomount subsuites, replace legacy and crc
facets with "legacy or legacy+rxbounce" and "crc or crc+rxbounce"
facets (chosen at random).

For fsx, singleton and thrash subsuites, add legacy+rxbounce and
crc+rxbounce facets and drop prefer-crc facet.  The expected behaviour
of the latter depends on cluster configuration and should be tested
separately.

The total number of jobs remains the same.

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

3 years agoqa: krbd rxbounce test
Ilya Dryomov [Thu, 27 Jan 2022 16:15:01 +0000 (17:15 +0100)]
qa: krbd rxbounce test

Lives in its own directory since ms_mode doesn't need to be permuted
here.

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