]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Ilya Dryomov [Thu, 20 Jun 2024 19:13:56 +0000 (21:13 +0200)]
librbd: make diff-iterate in fast-diff mode aware of encryption
diff-iterate wasn't updated when librbd was being prepared to support
encryption in commit
8d6a47933269 ("librbd: add crypto image dispatch
layer"). This is even noted in [1]:
> The two places I skipped for now are DiffIterate and TrimRequest.
CryptoImageDispatch has since been removed, but diff-iterate in
fast-diff mode is still unaware of encryption and just assumes that all
offsets are raw. This means that the callback gets invoked with
incorrect image offsets when encryption is loaded. For example, for
a LUKS1-formatted image with some data at offsets 0 and
20971520 ,
diff-iterate with encryption loaded reports
0~
4194304
4194304 ~
4194304
25165824 ~
4194304
instead of
0~
4194304
20971520 ~
4194304
as "exists". For any piece of code that is using diff-iterate to
optimize block-by-block processing (e.g. copy an encrypted source image
to a differently-encrypted destination image), this is fatal: it would
skip processing block
20971520 which has data and instead process block
25165824 which doesn't have any data and was to be skipped, producing
a corrupted destination image.
[1] https://github.com/ceph/ceph/pull/37935#issue-
735278403
Fixes: https://tracker.ceph.com/issues/66570
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
cdeb0efce3f9f857ad6d5b7ff3965f3292cb571a )
Conflicts:
src/librbd/api/DiffIterate.cc [ ImageArea support not in
quincy ]
src/test/librbd/test_librbd.cc [ commit
4a5a0a5dd82b ("librbd:
add cloned images encryption API") not in quincy
Ilya Dryomov [Fri, 21 Jun 2024 13:56:27 +0000 (15:56 +0200)]
test/librbd: extend DiffIterateTest.DiffIterateDeterministic{,PP}
Currently we are laying data only at the beginning of an object.
Extend the skeletons to write to three different offsets in the middle
and also at the end of the object.
Separately, make C and C++ API test variants slightly different in
terms of offsets being targeted to not go through exactly the same
scenario twice.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
da69d1fdbf69cf37ba8b75ea9a230634bb25ae76 )
Ilya Dryomov [Fri, 21 Jun 2024 13:53:05 +0000 (15:53 +0200)]
test/librbd: refactor DiffIterateTest.DiffIterateDeterministic{,PP}
In preparation for extending coverage, extract test logic into a couple
of parametrized helpers.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
1df87998dc30be6e3b4c90f5833539c7ccc70911 )
Yuri Weinstein [Fri, 12 Jul 2024 20:06:54 +0000 (13:06 -0700)]
Merge pull request #58210 from idryomov/wip-66418-quincy
quincy: librbd: diff-iterate shouldn't crash on an empty byte range
Reviewed-by: Mykola Golub <mgolub@suse.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:06:13 +0000 (13:06 -0700)]
Merge pull request #57764 from idryomov/wip-66232-quincy
quincy: qa/suites/rbd: override extra_system_packages directly on install task
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:05:29 +0000 (13:05 -0700)]
Merge pull request #57604 from ajarr/wip-66115-quincy
quincy: librbd: create rbd_trash object during pool initialization and namespace creation
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:04:51 +0000 (13:04 -0700)]
Merge pull request #57569 from idryomov/wip-65813-quincy
quincy: librbd: don't crash on a zero-length read if buffer is NULL
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:04:20 +0000 (13:04 -0700)]
Merge pull request #57308 from idryomov/wip-65624-quincy
quincy: pybind/rbd: expose CLONE_FORMAT and FLATTEN image options
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:03:48 +0000 (13:03 -0700)]
Merge pull request #57305 from idryomov/wip-65487-quincy
quincy: rbd-mirror: clean up stale pool replayers and callouts better
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:03:17 +0000 (13:03 -0700)]
Merge pull request #57090 from idryomov/wip-65573-quincy
quincy: librbd: make group and group snapshot IDs more random
Reviewed-by: Mykola Golub <mgolub@suse.com>
Yuri Weinstein [Fri, 12 Jul 2024 20:02:22 +0000 (13:02 -0700)]
Merge pull request #56366 from Svelar/wip-65031-quincy
quincy: ceph.spec.in: add support for openEuler OS
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Casey Bodley [Fri, 12 Jul 2024 19:20:16 +0000 (20:20 +0100)]
Merge pull request #58523 from cbodley/wip-66898-quincy
quincy: install-deps.sh, do_cmake.sh: almalinux is another el flavour
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Reviewed-by: Dan van der Ster <dan.vanderster@clyso.com>
Ilya Dryomov [Fri, 12 Jul 2024 16:16:12 +0000 (18:16 +0200)]
Merge pull request #58548 from idryomov/wip-test-cookie-quincy
quincy: test/librbd: clean up unused TEST_COOKIE variable
Reviewed-by: Ramana Raja <rraja@redhat.com>
Rongqi Sun [Tue, 9 Jul 2024 02:55:27 +0000 (02:55 +0000)]
test/ librbd: clean up unused 'TEST_COOKIE'
Clean them up because
```
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/test/librbd/exclusive_lock/test_mock_PreAcquireRequest.cc:47:26: error: unused variable 'TEST_COOKIE' [-Werror,-Wunused-const-variable]
static const std::string TEST_COOKIE("auto 123");
^
1 error generated.
```
Ref: https://jenkins.ceph.com/job/ceph-pull-requests-arm64/59242/consoleFull#-
5120798632a811ea2 -3e7b-466b-84b4-
d13df7e35809
Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
(cherry picked from commit
49869222c816023f696ff2a42898e2d9f3f54215 )
Dan van der Ster [Thu, 5 Oct 2023 16:50:36 +0000 (09:50 -0700)]
install-deps.sh, do_cmake.sh: almalinux is another el flavour
Signed-off-by: Dan van der Ster <dan.vanderster@clyso.com>
(cherry picked from commit
6e85f76385c3cffd860a8a3054bf14ce85a43b59 )
Conflicts:
do_cmake.sh add rocky too
install-deps.sh add rocky too
Zac Dover [Wed, 10 Jul 2024 00:27:10 +0000 (10:27 +1000)]
Merge pull request #58490 from zdover23/wip-doc-2024-07-10-backport-58484-to-quincy
quincy: doc: Correct link to "Device management"
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Matthew Vernon [Tue, 9 Jul 2024 16:02:31 +0000 (17:02 +0100)]
doc: Correct link to "Device management"
The current link goes to `cephadm/services/rados/operations/devices` which is a 404, it instead needs to be `rados/operations/devices/`.
Signed-off-by: Matthew Vernon <mvernon@wikimedia.org>
(cherry picked from commit
d1a7cc4978adacd4e11df2d3e0886b191b118cc1 )
Yuri Weinstein [Tue, 9 Jul 2024 13:17:54 +0000 (06:17 -0700)]
Merge pull request #58445 from ceph/wip-yuriw-quincy-client-x
qa/tests: added client-upgrade-quincy-squid tests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 5 Jul 2024 17:33:23 +0000 (10:33 -0700)]
qa/tests: added client-upgrade-quincy-squid tests
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Anthony D'Atri [Thu, 4 Jul 2024 20:31:41 +0000 (16:31 -0400)]
Merge pull request #58433 from zdover23/wip-doc-2024-07-05-backport-58368-to-quincy
quincy: doc/rados: document manually passing search domain
Zac Dover [Thu, 4 Jul 2024 18:29:59 +0000 (04:29 +1000)]
Merge pull request #58309 from zdover23/wip-doc-2024-06-27-backport-58287-to-quincy
quincy: doc/rados: update how to install c++ header files
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Zac Dover [Mon, 1 Jul 2024 06:36:02 +0000 (16:36 +1000)]
doc/rados: document manually passing search domain
Document how to manually pass the search domain to "mon_dns_srv_name" in
doc/rados/configuration/mon-lookup-dns.rst.
This commit is made in response to a request by Lander Duncan that was made on the [ceph-users] mailing list, and can be seen here: https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/F7V4CWLIYCAJ4JXI2JLNY6QPCFPR4SLA/
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
98938a0312dd0c8e0b293ed9aa2e0760cc9619fa )
Zac Dover [Wed, 3 Jul 2024 10:17:08 +0000 (20:17 +1000)]
Merge pull request #58391 from zdover23/wip-doc-2024-07-02-backport-58092-to-quincy
quincy: doc/start: remove mention of Centos 8 support
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Zac Dover [Mon, 17 Jun 2024 15:09:44 +0000 (01:09 +1000)]
doc/start: remove mention of Centos 8 support
Remove information so that it is clear that Centos 8 will no longer be
supported by Ceph.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
6b149e4f6ab2ac716e73f42b0d6c67482a768da9 )
Anthony D'Atri [Mon, 1 Jul 2024 15:24:51 +0000 (11:24 -0400)]
Merge pull request #58372 from zdover23/wip-doc-2024-07-01-backport-58366-to-quincy
quincy: doc/cephfs: update cephfs-shell link
Anthony D'Atri [Mon, 1 Jul 2024 13:11:44 +0000 (09:11 -0400)]
Merge pull request #58365 from zdover23/wip-doc-2024-07-01-backport-55577-to-quincy
quincy: doc/start: fix wording & syntax
Zac Dover [Mon, 1 Jul 2024 05:57:40 +0000 (15:57 +1000)]
doc/cephfs: update cephfs-shell link
Repair the link to cephfs-shell.rst in doc/cephfs/cephfs-shell.rst that
was broken in https://github.com/ceph/ceph/pull/41165/ when
doc/cephfs/cephfs-shell.rst was moved to doc/man/8/cephfs-shell.rst.
This commit is made in response to a request by Lander Duncan that was
made on the [ceph-users] mailing list, and can be seen here: https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/F7V4CWLIYCAJ4JXI2JLNY6QPCFPR4SLA/
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
4f8903cf80a94596a1b17b4a07affb874f21ae76 )
Piotr Parczewski [Wed, 14 Feb 2024 10:15:09 +0000 (11:15 +0100)]
doc/start: fix wording & syntax
Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit
a8b27af84910d324023a37e616f42d6d3faa4ecf )
Anthony D'Atri [Sat, 29 Jun 2024 19:23:42 +0000 (15:23 -0400)]
Merge pull request #58361 from zdover23/wip-doc-2024-06-30-backport-58358-to-quincy
quincy: doc/cephfs: take Anthony's suggestion
Zac Dover [Sat, 29 Jun 2024 12:11:55 +0000 (22:11 +1000)]
doc/cephfs: take Anthony's suggestion
Incorporate Anthony's suggestion in
https://github.com/ceph/ceph/pull/57567#discussion_r1607016050 into
doc/cephfs/fs-volumes.rst.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
7a78dda0a92339db27359f91f0cb081703e2e7f9 )
Anthony D'Atri [Thu, 27 Jun 2024 14:17:55 +0000 (10:17 -0400)]
Merge pull request #58306 from zdover23/wip-doc-2024-06-27-backport-58299-to-quincy
quincy: doc/dev: Fix typos in encoding.rst
Pere Diaz Bou [Wed, 26 Jun 2024 13:57:47 +0000 (15:57 +0200)]
doc/rados: update how to install c++ header files
In this example librados2-devel only install C header files on fedora 40,
therefore I added libradospp-devel to the command to include C++ header files.
Signed-off-by: Pere Diaz Bou <pere-altea@hotmail.com>
(cherry picked from commit
7e87441601db2379488fab62e900cd834086f26d )
N Balachandran [Thu, 27 Jun 2024 07:22:09 +0000 (12:52 +0530)]
doc/dev: Fix typos in encoding.rst
Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit
9f43c67a639958a13fef198ffe62cf5241f1f53c )
Venky Shankar [Wed, 26 Jun 2024 13:00:26 +0000 (18:30 +0530)]
Merge pull request #58227 from vshankar/wip-quincy-override-client-features
quincy: override client features
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Anthony D'Atri [Wed, 26 Jun 2024 12:33:17 +0000 (08:33 -0400)]
Merge pull request #58273 from zdover23/wip-doc-2024-06-26-backport-58226-to-quincy
quincy: doc/rados: edit troubleshooting-osd.rst
Zac Dover [Mon, 24 Jun 2024 10:32:30 +0000 (20:32 +1000)]
doc/rados: edit troubleshooting-osd.rst
Make minor changes to the "Debugging Slow Requests" section of
doc/rados/troubleshooting/troubleshooting-osd.rst in preparation
for an expansion of this section in response to a reqeust from Joel
Davidow.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8b211b9c7f9b173bb12028eb7108d13867883d6e )
Zac Dover [Wed, 26 Jun 2024 05:52:42 +0000 (15:52 +1000)]
Merge pull request #58259 from zdover23/wip-doc-2024-06-25-backport-58243-to-quincy
quincy: doc/rados: credit Prashant for a procedure
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Tue, 25 Jun 2024 04:49:13 +0000 (14:49 +1000)]
doc/rados: credit Prashant for a procedure
Credit Prashant D for creating the stretch-mode workaround procedure for
retrieving the correct size of datacenters.
Follows: https://github.com/ceph/ceph/pull/58109
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
2e777cb4f8bd682b807b97074f930826aa902db9 )
Patrick Donnelly [Thu, 2 May 2024 00:51:59 +0000 (20:51 -0400)]
client: allow overriding client features
For testing purposes.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
d9239f9375c1ae92a4990950f40078766bd912e8 )
Conflicts:
src/client/Client.h
Resolve a minor conflict involving Client::cap_auths
Zac Dover [Mon, 24 Jun 2024 00:32:08 +0000 (10:32 +1000)]
Merge pull request #58204 from zdover23/wip-doc-2024-06-23-backport-58200-to-quincy
quincy: doc/start: add links to Beginner's Guide
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Ilya Dryomov [Tue, 11 Jun 2024 17:02:23 +0000 (19:02 +0200)]
test/librbd: cover empty and invalid snap id ranges for diff-iterate
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
4f8aca21960088e80c4917ac2bb8df49ea16c28a )
Ilya Dryomov [Tue, 11 Jun 2024 16:10:47 +0000 (18:10 +0200)]
librbd: diff-iterate shouldn't crash on an empty byte range
Commit
0b5ba5fedf70 ("librbd/object_map: add support for ranged
diff-iterate") introduced a regression for the case when whole_object
parameter is set to true. Despite DiffRequest being called into and
another DiffIterate potentially being spawned recursively, an empty
byte range previously happened to make it.
Bail on an empty byte range early just like we have always done on an
empty snap id range (i.e. when start and end versions are the same).
Fixes: https://tracker.ceph.com/issues/66418
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
a3441a701963fef155fdda7d8f949d73bae26b69 )
Ilya Dryomov [Tue, 11 Jun 2024 14:03:22 +0000 (16:03 +0200)]
librbd: assert on m_length in calc_object_diff_range()
A non-empty byte range is required by both last_period_off calculation
and Striper::file_to_extents().
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
6b5f0088d799a72a840fae685b44b0f31eee6be8 )
Zac Dover [Sat, 22 Jun 2024 06:28:12 +0000 (16:28 +1000)]
doc/start: add links to Beginner's Guide
Add two links to Sage Weil's overview talks about Ceph.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
785020f212504cdbf374e0d3ca843fd92309de98 )
Zac Dover [Sat, 22 Jun 2024 06:29:39 +0000 (16:29 +1000)]
Merge pull request #58006 from zdover23/wip-doc-2024-06-13-backport-57650-to-quincy
quincy: ceph-volume: use importlib from stdlib on Python 3.8 and up
Reviewed-by: Kefu Chai <kchai@redhat.com>
Zac Dover [Sat, 22 Jun 2024 06:21:42 +0000 (16:21 +1000)]
Merge pull request #58183 from zdover23/wip-doc-2024-06-21-backport-58109-to-quincy
quincy: doc/rados: add stretch_rule workaround
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Sat, 22 Jun 2024 06:20:42 +0000 (16:20 +1000)]
Merge pull request #58163 from zdover23/wip-doc-2024-06-20-backport-57156-to-quincy
quincy: doc/rados: followup to PR#58057
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Sat, 22 Jun 2024 06:19:28 +0000 (16:19 +1000)]
Merge pull request #58191 from zdover23/wip-doc-2024-06-21-backport-55675-to-quincy
quincy: doc/src: invadvisable is not a word
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Ilya Dryomov [Fri, 21 Jun 2024 15:59:45 +0000 (17:59 +0200)]
Merge pull request #58169 from idryomov/wip-qemu-task-version-quincy
quincy: qa/tasks/qemu: Fix OS version comparison
Reviewed-by: Ramana Raja <rraja@redhat.com>
Doug Whitfield [Tue, 20 Feb 2024 21:13:14 +0000 (15:13 -0600)]
doc/src: invadvisable is not a word
changed to inadvisable on line 4997
Signed-off-by: Doug Whitfield <douglasawh@gmail.com>
(cherry picked from commit
fb4a5d09e11b75a2f38c42c489af7e6f148916a7 )
Zac Dover [Tue, 18 Jun 2024 05:22:41 +0000 (15:22 +1000)]
doc/rados: add stretch_rule workaround
Add a method for defining a CRUSH rule that returns the actual value of
the total available size.
Fixes: https://tracker.ceph.com/issues/56650
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
007385a3ef05bd92e006fc7d6aba3fbb51792ef7 )
Zack Cerza [Fri, 14 Jun 2024 19:37:16 +0000 (13:37 -0600)]
qa/tasks/qemu: Fix OS version comparison
See: https://sentry.ceph.com/share/issue/
21ed88d705854238bdafbf6711e795ee /
They're strings, not floats.
This surfaced as a result of https://github.com/ceph/teuthology/pull/1953
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
260a45a03148ba4d2bbfcac9485bcf9a8743cade )
Zac Dover [Thu, 20 Jun 2024 11:43:53 +0000 (21:43 +1000)]
doc/rados: followup to PR#58057
Incorporate Anthony D'Atri's suggestions in
https://github.com/ceph/ceph/pull/58057
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
2e999a26ef2d3c12d81bd54c187a6225a5fcd7a6 )
Anthony D'Atri [Wed, 19 Jun 2024 14:29:03 +0000 (10:29 -0400)]
Merge pull request #58132 from zdover23/wip-doc-2024-06-19-backport-58123-to-quincy
quincy: doc: clarify availability vs integrity
Ilya Dryomov [Wed, 19 Jun 2024 11:08:04 +0000 (13:08 +0200)]
Merge pull request #58128 from petrutlucian94/wip-66548-quincy
quincy: ceph_test_rados_api_misc: adjust LibRadosMiscConnectFailure.ConnectTimeout timeout
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Gregory O'Neill [Tue, 18 Jun 2024 21:17:00 +0000 (17:17 -0400)]
doc: clarify availability vs integrity
(cherry picked from commit
3888cf77075eceb079b1d5a8ce19092d12fd82bd )
Lucian Petrut [Mon, 17 Jun 2024 18:37:11 +0000 (18:37 +0000)]
ceph_test_rados_api_misc: adjust LibRadosMiscConnectFailure.ConnectTimeout timeout
The test sets a 2 second connection timeout and asserts that the
attempt takes less than 4 seconds.
Under load, the asserted timeout can be exceeded. In particular,
this affects the Windows CI job, which uses a VM with a reduced
amount of resources.
[ RUN ] LibRadosMiscConnectFailure.ConnectTimeout
/home/ubuntu/ceph/src/test/librados/misc.cc:87: Failure
Expected: (dur) < (utime_t(4, 0)), actual: 5.987712 vs 4.000000
We'll adjust the timeouts, using a 5s configured timeout, asserting
that the connection attempt doesn't take more than 15s.
Fixes: https://tracker.ceph.com/issues/66534
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
3a2b4a58898477ae9f62b506bd5be56ff9abacf0 )
Adam King [Tue, 18 Jun 2024 15:43:06 +0000 (11:43 -0400)]
Merge pull request #57995 from ljflores/wip-66451-quincy
quincy: mgr/k8sevents: update V1Events to CoreV1Events
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Anthony D'Atri [Tue, 18 Jun 2024 03:57:11 +0000 (23:57 -0400)]
Merge pull request #58107 from zdover23/wip-doc-2024-06-18-backport-58901-to-quincy
quincy: doc/dev: link to ceph.io leads list
Zac Dover [Mon, 17 Jun 2024 14:39:10 +0000 (00:39 +1000)]
doc/dev: link to ceph.io leads list
Remove the docs.ceph.com list of team leads, and link to the list of
leads on ceph.io.
Fixes: https://tracker.ceph.com/issues/66392
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
5134aeb78bb1d9d956442333ad372e1f397ff7b3 )
Pedro Gonzalez Gomez [Mon, 17 Jun 2024 07:19:40 +0000 (09:19 +0200)]
Merge pull request #58077 from idryomov/wip-cephadm-flake8-fix-quincy
quincy: mgr/cephadm: fix flake8 test failures
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Nizamudeen A [Sun, 16 Jun 2024 09:11:04 +0000 (14:41 +0530)]
mgr/cephadm: fix flake8 test failures
after a recent update on flake8, some tests in cephadm started failing
```
flake8: commands[0]> flake8 --config=tox.ini alerts balancer cephadm cli_api crash devicehealth diskprediction_local hello iostat localpool nfs orchestrator prometheus rbd_support rgw selftest smb
cephadm/configchecks.py:94:6: E204 whitespace after decorator '@'
cephadm/module.py:3017:10: E204 whitespace after decorator '@'
cephadm/module.py:3344:144: E226 missing whitespace around arithmetic operator
cephadm/tests/test_cephadm.py:982:6: E204 whitespace after decorator '@'
3 E204 whitespace after decorator '@'
1 E226 missing whitespace around arithmetic operator
```
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
a9563d91c2ac405ae9101bd4e63fa9b749d54432 )
Anthony D'Atri [Sun, 16 Jun 2024 06:17:11 +0000 (02:17 -0400)]
Merge pull request #58061 from zdover23/wip-doc-2024-06-16-backport-58057-to-quincy
quincy: doc/rados: explain replaceable parts of command
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 )
Guillaume Abrioux [Mon, 3 Jun 2024 12:00:10 +0000 (14:00 +0200)]
ceph-volume: fix regression
This fixes a regression introduced by:
24f8e5c61b19deab7397b0237f8376c6c03a5dcb
`iter_entry_points` from `pkg_resources` takes one argument whereas
`entry_points` from `importlib.metadata` does not.
The call to `entry_points(group=group)` makes ceph-volume fail.
Fixes: https://tracker.ceph.com/issues/66328
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit
6e3b0b93055538cad234018ef8700bfacec03076 )
Anthony D'Atri [Fri, 14 Jun 2024 15:14:11 +0000 (11:14 -0400)]
Merge pull request #58051 from zdover23/wip-doc-2024-06-14-backport-58007-to-quincy
quincy: doc/rados: add pg-states and pg-concepts to tree
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 )
Kefu Chai [Thu, 23 May 2024 04:47:26 +0000 (12:47 +0800)]
ceph-volume: use importlib from stdlib on Python 3.8 and up
since packaging was apparently removed from pkg_resources, let's use
importlib.metadata when it is available and pkg_resources on older
Python versions.
Refs https://tracker.ceph.com/issues/66201
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
24f8e5c61b19deab7397b0237f8376c6c03a5dcb )
Nizamudeen A [Fri, 3 May 2024 08:56:19 +0000 (14:26 +0530)]
mgr/k8sevents: update V1Events to CoreV1Events
centos9 only provides kubernetes 26.1.0 as base dep and hence the
k8sevents code needs to be updated accordingly. the api changes happened
in kuberenetes while 19.0.0 was released
Fixes: https://tracker.ceph.com/issues/65627
Fixes: https://tracker.ceph.com/issues/64981
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
6af964719217d720e6c2fd1ba2a607f6255d2604 )
Anthony D'Atri [Wed, 12 Jun 2024 13:07:09 +0000 (09:07 -0400)]
Merge pull request #57984 from zdover23/wip-doc-2024-06-12-backport-57976-to-quincy
quincy: doc/glossary: Add "S3"
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 )
Anthony D'Atri [Tue, 11 Jun 2024 01:39:20 +0000 (21:39 -0400)]
Merge pull request #57960 from zdover23/wip-doc-2024-06-11-backport-57957-to-quincy
quincy: doc/rados: improve leader/peon monitor explanation
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 )
Zac Dover [Sun, 9 Jun 2024 22:09:57 +0000 (08:09 +1000)]
Merge pull request #57950 from zdover23/wip-doc-2024-06-10-backport-57947-to-quincy
quincy: doc/start: remove "intro.rst"
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
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 )
Anthony D'Atri [Sun, 9 Jun 2024 02:35:56 +0000 (22:35 -0400)]
Merge pull request #57943 from zdover23/wip-doc-2024-06-09-backport-57939-to-quincy
quincy: doc/glossary.rst: add "OpenStack Swift" and "Swift"
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 )
Anthony D'Atri [Sat, 8 Jun 2024 01:54:31 +0000 (21:54 -0400)]
Merge pull request #57938 from zdover23/wip-doc-2024-06-08-backport-57923-to-quincy
quincy: doc/src: add inline literals (``) to variables
Zac Dover [Fri, 7 Jun 2024 01:24:00 +0000 (11:24 +1000)]
doc/src: add inline literals (``) to variables
Add inline-literal RST markup (``) (double backticks) around variable
names in src/common/options/global.yaml.in.
This follows https://github.com/ceph/ceph/pull/57887.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
6cdf9439c777ecac8915189a8e38a718f5013f7a )
Zac Dover [Thu, 6 Jun 2024 20:13:36 +0000 (06:13 +1000)]
Merge pull request #57917 from zdover23/wip-doc-2024-06-07-backport-57887-to-quincy
quincy: doc/rados: add options to network config ref
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
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 )
Zac Dover [Wed, 5 Jun 2024 20:46:00 +0000 (06:46 +1000)]
Merge pull request #57904 from zdover23/wip-doc-2024-06-06-backport-57900-to-quincy
quincy: doc/start: s/intro.rst/index.rst/
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
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 )
Anthony D'Atri [Wed, 5 Jun 2024 06:46:28 +0000 (02:46 -0400)]
Merge pull request #57885 from zdover23/wip-doc-2024-06-05-backport-57868-to-quincy
quincy: doc: correct typo
Zac Dover [Wed, 5 Jun 2024 01:11:29 +0000 (11:11 +1000)]
Merge pull request #57872 from zdover23/wip-doc-2024-06-05-backport-57867-to-quincy
quincy: doc/start: s/http/https/ in links
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
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 )
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 )
Anthony D'Atri [Mon, 3 Jun 2024 19:50:17 +0000 (15:50 -0400)]
Merge pull request #57852 from zdover23/wip-doc-2024-06-04-backport-57824-to-quincy
quincy: doc/rados: add stop monitor command
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 )
Anthony D'Atri [Mon, 3 Jun 2024 15:55:00 +0000 (11:55 -0400)]
Merge pull request #57846 from zdover23/wip-doc-2024-06-04-backport-57839-to-quincy
quincy: doc/start: Edit Beginner's Guide
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 )
Zac Dover [Mon, 3 Jun 2024 13:08:36 +0000 (23:08 +1000)]
Merge pull request #57816 from zdover23/wip-doc-2024-06-01-backport-57804-to-quincy
quincy: doc/cephfs: edit vstart warning text
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Ilya Dryomov [Mon, 6 May 2024 06:16:01 +0000 (08:16 +0200)]
qa/workunits/rbd: wait for replaying status in bootstrap tests
wait_for_replay_complete() doesn't wait for image status to get
updated. This didn't matter previously because these tests are run on
two different pools and nothing else was following.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
d1d848276f0a33b20482321088c8c7470a84d0b3 )
Conflicts:
qa/workunits/rbd/rbd_mirror_bootstrap.sh [ commit
3fd8a0388735
("qa/workunits/rbd: merge journal and snapshot test scripts")
not in quincy ]
Zac Dover [Sun, 2 Jun 2024 23:27:46 +0000 (09:27 +1000)]
Merge pull request #57823 from zdover23/wip-doc-2024-06-02-backport-57820-to-quincy
quincy: doc/start: Add Beginner's Guide
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
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 )
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 )
Anthony D'Atri [Fri, 31 May 2024 01:23:53 +0000 (21:23 -0400)]
Merge pull request #57793 from zdover23/wip-doc-2024-05-30-backport-57790-to-quincy
quincy: doc/cephfs: edit front matter in mantle.rst
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 )
Ilya Dryomov [Mon, 27 May 2024 13:56:26 +0000 (15:56 +0200)]
qa/suites/rbd: override extra_system_packages directly on install task
[1] and [2] added support for applying extra_system_packages overrides
directly on install task, but at the same time broke our long standing
workaround where we sneaked extra_system_packages directive in through
an override on ceph task. This is likely getting addressed in [3], but
it's better to not rely on this odd feature in the first place.
[1] https://github.com/ceph/teuthology/pull/1941
[2] https://github.com/ceph/teuthology/pull/1943
[3] https://github.com/ceph/teuthology/pull/1942
Fixes: https://tracker.ceph.com/issues/66232
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
c61cb16223fa5a93ab660c4287800b0d22f4c079 )
Zac Dover [Tue, 28 May 2024 16:19:55 +0000 (02:19 +1000)]
Merge pull request #57744 from zdover23/wip-doc-2024-05-28-backport-57720-to-quincy
quincy: doc/cephfs: s/subvolumegroups/subvolume groups
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>