]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Ilya Dryomov [Fri, 16 Jun 2023 12:01:52 +0000 (14:01 +0200)]
qa/workunits/rbd: make continuous export-diff test actually work
The current version is pretty useless:
- "rbd bench" writes the same byte (0xff) over and over again, so
almost all checksumming is in vain
- snapshots are taken in a steady state (i.e. not under I/O), so no
race conditions can get exposed
- even with these caveats, it's not wired up into the suite
Redo this workunit to be a reliable reproducer for the issue fixed
in the previous commit and wire it up for both krbd and rbd-nbd.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
acb270a3dd07211f06aa11f8792a333f3a1b796d )
Ilya Dryomov [Tue, 13 Jun 2023 11:36:02 +0000 (13:36 +0200)]
librbd: stop passing IOContext to image dispatch write methods
This is a major footgun since any value passed e.g. at the API layer
may be stale by the time we get to object dispatch. All callers are
passing the IOContext returned by get_data_io_context() for their
ImageCtx anyway, highlighting that the parameter is fictitious.
Only the read method can meaningfully take IOContext.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
584f865ae116185087176715ced014b625f04e82 )
Conflicts:
src/librbd/api/Io.cc [ commit
37057ba2f6bb ("librbd: pass
image_extents to create_{discard,write_same}()") and ImageArea
support not in pacific ]
src/librbd/cache/ImageWriteback.cc [ ditto ]
src/librbd/io/ImageDispatchSpec.h [ ditto ]
src/librbd/crypto/luks/FormatRequest.cc [ ImageArea support not
in pacific ]
src/test/librbd/io/test_mock_ImageRequest.cc [ ditto ]
src/test/librbd/journal/test_mock_Replay.cc [ ditto ]
src/librbd/crypto/luks/FlattenRequest.cc [ commit
84601d68a74f
("librbd/crypto: add format-specific flattening operation")
not in pacific ]
Ilya Dryomov [Mon, 12 Jun 2023 19:45:03 +0000 (21:45 +0200)]
librbd: use an up-to-date snap context when owning the exclusive lock
By effectively moving capturing of the snap context to the API layer,
commit
1d0a3b17f590 ("librbd: pass IOContext to image-extent IO
dispatch methods") introduced a nasty regression. The snap context can
be captured only after exclusive lock is safely held for the duration
of dealing with the image request and even then must be refreshed if
a snapshot creation request is accepted from a peer. This is needed to
ensure correctness of the object map in general and fast-diff states in
particular (OBJECT_EXISTS vs OBJECT_EXISTS_CLEAN) and object deltas
computed based off of them. Otherwise the object map that is forked
for the snapshot isn't guaranteed to accurately reflect the contents of
the snapshot when the snapshot is taken under I/O (as in disabling the
object map may lead to different results being returned for reads).
The regression affects mainly differential backup and snapshot-based
mirroring use cases with object-map and/or fast-diff enabled: since
some object deltas may be incomplete, the destination image may get
corrupted.
This commit represents a reasonable minimal fix: IOContext passed
through to ImageDispatch is effected only for reads and just gets
ignored for writes. The next commit cleans up further by undoing the
passing of IOContext through the image dispatch layers for writes.
Fixes: https://tracker.ceph.com/issues/61616
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
e4b1e0466354942c935e9eca2ab2858e75049415 )
Conflicts:
src/librbd/io/ImageDispatch.cc [ ImageArea support not in
pacific ]
src/librbd/io/ImageRequest.cc [ ditto ]
src/librbd/io/ImageRequest.h [ ditto ]
src/librbd/journal/Replay.cc [ ditto ]
Yuri Weinstein [Mon, 19 Jun 2023 20:14:05 +0000 (16:14 -0400)]
Merge pull request #51876 from idryomov/wip-61382-pacific
pacific: osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile
Reviewed-by: Mykola Golub <mgolub@suse.com>
Laura Flores [Mon, 19 Jun 2023 20:01:23 +0000 (15:01 -0500)]
Merge pull request #52017 from ljflores/wip-61604-pacific
pacific: qa/suites/rados: remove rook coverage from the rados suite
Ilya Dryomov [Fri, 16 Jun 2023 09:23:38 +0000 (11:23 +0200)]
Merge pull request #51431 from chrisphoffman/wip-59710-pacific
pacific: librbd: localize snap_remove op for mirror snapshots
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Christopher Hoffman [Wed, 19 Apr 2023 15:26:27 +0000 (15:26 +0000)]
librbd: localize snap_remove op for mirror snapshots
A client may attempt a lock request not quickly enough to
obtain exclusive lock for operations when another competing
client responds quicker. This can happen when a peer site has
different performance characteristics or latency. Instead of
relying on this unpredictable behavior, localize operation to
primary cluster.
Fixes: https://tracker.ceph.com/issues/59393
Signed-off-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit
ac552c9b4d65198db8038d397a3060d5a030917d )
Conflicts:
src/cls/rbd/cls_rbd.cc [ commit
3a93b40 ("librbd:
s/boost::variant/std::variant/") not in pacific ]
src/librbd/mirror/snapshot/UnlinkPeerRequest.cc [ ditto ]
Yuri Weinstein [Thu, 15 Jun 2023 19:38:23 +0000 (15:38 -0400)]
Merge pull request #51856 from petrutlucian94/wip-61525-pacific
pacific: librbd: avoid decrementing iterator before first element
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Thu, 15 Jun 2023 19:37:47 +0000 (15:37 -0400)]
Merge pull request #51778 from idryomov/wip-61368-pacific
pacific: tools/ceph-dencoder: Fix incorrect type define for trash_watcher
Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Yuri Weinstein [Thu, 15 Jun 2023 19:34:46 +0000 (15:34 -0400)]
Merge pull request #51429 from chrisphoffman/wip-59506-pacific
pacific: librbd: remove previous incomplete primary snapshot after successfully creating a new one
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Laura Flores [Mon, 5 Jun 2023 20:23:42 +0000 (15:23 -0500)]
qa/suites/rados: remove rook coverage from the rados suite
The rook team relies on a daily CI system to validate
rook changes. It doesn't seem that the teuthology tests
are maintained, so it makes sense to remove them from the
rados suite.
By removing this symlink, rook test coverage will remain
in the orch suite, and coverage will only be removed from the
rados suite.
Workaround for: https://tracker.ceph.com/issues/58585
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit
c26674ef4c6cbbdd94c54cafbd66e98704f044d7 )
zdover23 [Fri, 2 Jun 2023 03:04:11 +0000 (11:04 +0800)]
Merge pull request #51882 from adk3798/pacific-no-log-to-journald
pacific: doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Adam King [Fri, 2 Jun 2023 00:47:35 +0000 (20:47 -0400)]
doc/cephadm: Revert "doc/cephadm: update about disabling logging to journald for quincy"
This reverts commit
bdb2241ca5a9758e8c52d47320d8b5ea0766aea9 .
This commit https://github.com/ceph/ceph/commit/
bdb2241ca5a9758e8c52d47320d8b5ea0766aea9
was updating on logging changes in quincy, but seems to have been
erroneously included in a pacific batch backport https://github.com/ceph/ceph/pull/42736
This stuff doesn't work in pacific. For example,
[ceph: root@vm-00 /]# ceph version
ceph version
16.2.13-257-gd8c5d349 (
d8c5d34975dce1c5eb0aa3a7979a4d9b9a99d1ec ) pacific (stable)
[ceph: root@vm-00 /]# ceph config set global log_to_journald false
Error EINVAL: unrecognized config option 'log_to_journald'
so we shouldn't have it in the pacific docs
Signed-off-by: Adam King <adking@redhat.com>
Ilya Dryomov [Sat, 27 May 2023 10:28:40 +0000 (12:28 +0200)]
osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile
This was missed in commit
acc447d5de7b ("osd/OSDCap: rbd profile
permits use of rbd.metadata_list cls method") which adjusted only
"profile rbd" OSD cap. Listing image metadata is an essential part
of opening the image and "profile rbd-read-only" OSD cap must allow
it too.
While at it, constrain the existing grant for rbd profile from "any
object in the pool" to just "rbd_info object in the global namespace of
the pool" as this is where pool-level image metadata actually lives.
Fixes: https://tracker.ceph.com/issues/61382
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b580cdad8d42b4e54fd9e4ef9def13d091f719e9 )
Lucian Petrut [Thu, 27 Apr 2023 12:44:51 +0000 (12:44 +0000)]
librbd: avoid decrementing iterator before first element
While trying to merge delayed requests, SimpleSchedulerObjectDispatch
can end up iterating before the first element.
With llvm, this leads to a crash:
https://paste.opendev.org/raw/bxnQqqDtIrkOfVvRfkZ6/
This change adds a check, ensuring that we won't decrement the iterator
before the first map element.
Fixes: https://tracker.ceph.com/issues/61503
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
ca65e85575f7b35ce679309e92e0c9bee8d6b96a )
zdover23 [Tue, 30 May 2023 23:03:34 +0000 (07:03 +0800)]
Merge pull request #51826 from zdover23/wip-doc-2023-05-30-backport-51798-to-pacific
pacific: doc/rados: edit balancer.rst
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Mon, 29 May 2023 01:18:00 +0000 (09:18 +0800)]
doc/rados: edit balancer.rst
Edit doc/rados/operations/balancer.rst.
https://tracker.ceph.com/issues/58485
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
d3660aa20d737729dac708264ceed37560362f91 )
zdover23 [Sun, 28 May 2023 05:11:57 +0000 (13:11 +0800)]
Merge pull request #51795 from zdover23/wip-doc-2023-05-28-backport-51587-to-pacific-second-attempt
doc/rados: edit bluestore-config-ref.rst (2 of x)
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Zac Dover [Fri, 26 May 2023 18:44:18 +0000 (04:44 +1000)]
doc/rados: edit bluestore-config-ref.rst (2 of x)
Edit the second part of doc/rados/configuration/bluestore-config-ref.rst.
https://tracker.ceph.com/issues/58485
Co-authored-by: Anthoy D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
1ceeab30ebde767aaf675fe46e79b9b7d28b881a )
zdover23 [Sun, 28 May 2023 02:23:04 +0000 (12:23 +1000)]
Merge pull request #51791 from zdover23/wip-doc-2023-05-27-backport-51771-to-pacific
pacific: doc/rados: edit bluestore-config-ref.rst (1 of x)
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Fri, 26 May 2023 08:59:36 +0000 (18:59 +1000)]
doc/rados: edit bluestore-config-ref.rst (1 of x)
Edit the first part of doc/rados/configuration/bluestore-config-ref.rst.
https://tracker.ceph.com/issues/58485
Confval directives have been removed from this backport, because they do
not build in the Pacific release branch.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
3879e4ad417dddef1247521c199925a679d490ac )
Adam King [Fri, 26 May 2023 21:07:55 +0000 (17:07 -0400)]
Merge pull request #51647 from adk3798/pacific-prom-ret-size
pacific: mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Chen Yuanrun [Thu, 25 May 2023 08:28:10 +0000 (08:28 +0000)]
tools/ceph-dencoder: Fix incorrect type define for trash_watcher
Signed-off-by: Chen Yuanrun <chen-yuanrun@foxmail.com>
Fixes: https://tracker.ceph.com/issues/61368
(cherry picked from commit
e10bcb6905b7e4da4b3a04307d3a2b546da6d5b1 )
Redouane Kachach [Wed, 7 Sep 2022 12:51:10 +0000 (14:51 +0200)]
mgr/cephadm: Adding --storage.tsdb.retention.size prometheus option
fixes: https://tracker.ceph.com/issues/57422
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
4da92c59597dcbf0bba4be50db73233e34108ca9 )
Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py
Adam King [Thu, 25 May 2023 14:28:57 +0000 (10:28 -0400)]
Merge pull request #51517 from adk3798/pacific-custom-config
pacific: mgr/cephadm: support for miscellaneous config files for daemons
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Anthony D'Atri [Thu, 25 May 2023 11:21:21 +0000 (07:21 -0400)]
Merge pull request #51757 from zdover23/wip-doc-2023-05-25-backport-51754-to-pacific
pacific: doc/rados: fix link in common.rst
Zac Dover [Thu, 25 May 2023 09:01:49 +0000 (19:01 +1000)]
doc/rados: fix link in common.rst
Fix a link in doc/rados/configuration/common.rst that was missing its
final letter, causing a 404 error when readers attempted to follow it.
This bug was reported by stalwart friend of the Ceph documentation
project Eugen Block, who is here credited as a co-author. This bug was
reported at https://pad.ceph.com/p/Report_Documentation_Bugs.
Co-authored-by: Eugen Block <eblock@nde.ag>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8128ce20fef3d75c6251691d10af21861c01e155 )
Anthony D'Atri [Thu, 25 May 2023 10:02:21 +0000 (06:02 -0400)]
Merge pull request #51753 from zdover23/wip-doc-2023-05-25-backport-51745-to-pacific
pacific: doc/rados: edit filestore-config-ref.rst
Zac Dover [Thu, 25 May 2023 00:16:51 +0000 (10:16 +1000)]
doc/rados: edit filestore-config-ref.rst
Edit doc/rados/configuration/filestore-config-ref.rst.
https://tracker.ceph.com/issues/58485
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
1202e4207bc182d83f193adb1557359d52687103 )
Nizamudeen A [Thu, 25 May 2023 07:26:29 +0000 (12:56 +0530)]
Merge pull request #51075 from aaSharma14/wip-59446-pacific
pacific: mgr/dashboard: Fix rbd snapshot creation
Reviewed-by: Nizamudeen A <nia@redhat.com>
Nizamudeen A [Thu, 25 May 2023 05:23:24 +0000 (10:53 +0530)]
Merge pull request #51113 from rhcs-dashboard/wip-59460-pacific
pacific: mgr/dashboard: expose more grafana configs in service form
Reviewed-by: Pegonzal <NOT@FOUND>
Anthony D'Atri [Thu, 25 May 2023 02:14:41 +0000 (22:14 -0400)]
Merge pull request #51741 from zdover23/wip-doc-2023-05-25-backport-50858-to-pacific
pacific: doc/rados/operations: Acting Set question
Anthony D'Atri [Thu, 25 May 2023 02:13:05 +0000 (22:13 -0400)]
Merge pull request #51744 from zdover23/wip-doc-2023-05-25-backport-51730-to-pacific
pacific: doc/rados/operations: Fix erasure-code-jerasure.rst fix
Anthony D'Atri [Wed, 24 May 2023 13:57:42 +0000 (09:57 -0400)]
doc/rados/operations: Fix erasure-code-jerasure.rst fix
Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit
2a3177e60d93742d3125f3ef0913dfeb8743e8bf )
Zac Dover [Tue, 4 Apr 2023 03:59:46 +0000 (13:59 +1000)]
doc/rados/operations: Acting Set question
Clear up a paragraph that describes the behavior of the Acting Set.
https://tracker.ceph.com/issues/58485
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
3bc9cfd83b3b836775433c7f1b075fe397b56463 )
Adam King [Wed, 24 May 2023 21:47:26 +0000 (17:47 -0400)]
Merge pull request #51433 from Svelar/wip-59687-pacific
pacific: cephadm: eliminate duplication of sections
Reviewed-by: Adam King <adking@redhat.com>
Adam King [Wed, 24 May 2023 21:45:24 +0000 (17:45 -0400)]
Merge pull request #51346 from mgfritch/wip-59649-pacific
pacific: mgr/cephadm: don't try to write client/os tuning profiles to known offline hosts
Reviewed-by: Adam King <adking@redhat.com>
zdover23 [Wed, 24 May 2023 03:15:04 +0000 (13:15 +1000)]
Merge pull request #51727 from zdover23/wip-doc-2023-05-24-backport-51273-to-pacific
pacific: doc: Update jerasure.org references
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Anthony D'Atri [Tue, 23 May 2023 23:13:33 +0000 (19:13 -0400)]
doc: Update jerasure.org references
Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit
5e60e0de275f7260aeae9e664ca22ebfdf8fc5f9 )
Anthony D'Atri [Tue, 23 May 2023 22:35:31 +0000 (18:35 -0400)]
Merge pull request #51722 from zdover23/wip-doc-2023-05-24-backport-51679-to-pacific
pacific: doc/mgr: edit "leaderboard" in telemetry.rst
Zac Dover [Mon, 22 May 2023 20:06:52 +0000 (06:06 +1000)]
doc/mgr: edit "leaderboard" in telemetry.rst
Standardize the presentation of commands in the "Leaderboard" section of
doc/mgr/telemetry.rst.
Follow-up to https://github.com/ceph/ceph/pull/50977
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
4935ad8aed2aa796015473de5b38cc973ba85ba1 )
Yuri Weinstein [Tue, 23 May 2023 19:36:55 +0000 (15:36 -0400)]
Merge pull request #51261 from k0ste/wip-53166-pacific
pacific: ceph_test_rados_api_watch_notify: extend Watch3Timeout test
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Tue, 23 May 2023 16:01:58 +0000 (12:01 -0400)]
Merge pull request #51330 from trociny/wip-59616-pacific
pacific: rgw/rados: check_quota() uses real bucket owner
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 23 May 2023 16:01:31 +0000 (12:01 -0400)]
Merge pull request #51266 from mkogan1/wip-58332-pacific
pacific: rgw: under fips & openssl 3.x allow md5 usage in select rgw ops
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 23 May 2023 16:00:50 +0000 (12:00 -0400)]
Merge pull request #50560 from ljflores/wip-59091-pacific
pacific: rgw: LDAP fix resource leak with wrong credentials
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 23 May 2023 16:00:08 +0000 (12:00 -0400)]
Merge pull request #48928 from yuvalif/wip-58036-pacific
pacific: tests: remove pubsub tests from multisite
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 23 May 2023 15:28:02 +0000 (11:28 -0400)]
Merge pull request #51341 from NitzanMordhai/wip-59628-pacific
pacific: src/valgrind.supp: Adding know leaks unrelated to ceph
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Tue, 23 May 2023 15:26:22 +0000 (11:26 -0400)]
Merge pull request #51258 from k0ste/wip-56604-pacific
pacific: Monitor: forward report command to leader
Reviewed-by: Neha Ojha <nojha@redhat.com>
Nizamudeen A [Tue, 23 May 2023 12:48:26 +0000 (18:18 +0530)]
Merge pull request #51324 from rhcs-dashboard/wip-59622-pacific
pacific: mgr/dashboard: fix the rbd mirroring configure check
Reviewed-by: cloudbehl <NOT@FOUND>
Anthony D'Atri [Tue, 23 May 2023 12:11:15 +0000 (08:11 -0400)]
Merge pull request #51695 from zdover23/wip-doc-2023-05-23-backport-51682-to-pacific
pacific: doc/glossary: update bluestore entry
Zac Dover [Mon, 22 May 2023 21:41:09 +0000 (07:41 +1000)]
doc/glossary: update bluestore entry
Update the BlueStore entry in the glossary, explaining that as of Reef
BlueStore and only BlueStore (and not FileStore) is the storage backend
for Ceph.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
bcee264276128f622c35e3aab81fdecb2b8afc10 )
Anthony D'Atri [Mon, 22 May 2023 08:55:53 +0000 (04:55 -0400)]
Merge pull request #51654 from zdover23/wip-doc-2023-05-22-backport-51319-to-pacific
pacific: doc: deprecate the cache tiering
Radosław Zarzyński [Tue, 2 May 2023 15:52:23 +0000 (17:52 +0200)]
doc: deprecate the cache tiering
This topic has been discussed many times; recently at the Dev
Summit of Cephalocon 2023.
This commit is the minial version of the work, contained entirely
within the `doc`. However, likely it will be expanded as there
were ideas like e.g. adding cache tiering back experimental feature
list (Sam) to warn users when deploying a new cluster.
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit
535b8db33ea03fbab7ef0c4df5251658f956b0c5 )
Anthony D'Atri [Sat, 20 May 2023 22:16:56 +0000 (18:16 -0400)]
Merge pull request #51621 from zdover23/wip-doc-2023-05-21-backport-51618-to-pacific
pacific: doc: Add missing `ceph` command in documentation section `REPLACING A…
Alexander Proschek [Sat, 20 May 2023 21:06:09 +0000 (14:06 -0700)]
doc: Add missing `ceph` command in documentation section `REPLACING AN OSD`
Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
Signed-off-by: Alexander Proschek <alexander.proschek@protonmail.com>
(cherry picked from commit
0557d5e465556adba6d25db62a40ba55a5dd2400 )
Adam King [Tue, 28 Jun 2022 20:52:05 +0000 (16:52 -0400)]
doc/cephadm: custom config files documentation
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
fa08b55acea0d2fe11e6bfdcf1b414bbf92f5566 )
Conflicts:
doc/cephadm/services/index.rst
Adam King [Tue, 28 Jun 2022 20:30:58 +0000 (16:30 -0400)]
mgr/cephadm: unit testing for custom config files
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
78598ea58410891cbd38a450500753d7124d476e )
Conflicts:
src/pybind/mgr/cephadm/tests/test_cephadm.py
zdover23 [Fri, 19 May 2023 20:19:55 +0000 (06:19 +1000)]
Merge pull request #51597 from zdover23/wip-doc-2023-05-20-backport-51594-to-pacific
pacific: doc/rados: edit data-placement.rst
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Fri, 19 May 2023 16:26:45 +0000 (02:26 +1000)]
doc/rados: edit data-placement.rst
Edit doc/rados/data-placement.rst.
Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
32600c27c4dca6b9d5fae9892c0a1660b672781c )
Anthony D'Atri [Fri, 19 May 2023 12:13:34 +0000 (08:13 -0400)]
Merge pull request #51587 from zdover23/wip-doc-2023-05-19-backport-51580-to-pacific
pacific: doc/radosgw: explain multisite dynamic sharding
Zac Dover [Thu, 18 May 2023 21:07:02 +0000 (07:07 +1000)]
doc/radosgw: explain multisite dynamic sharding
Add a note to doc/radosgw/dynamicresharding.rst and a note to
doc/radosgw/multisite.rst that explains that dynamic resharding is not
supported in releases prior to Reef.
This commit is made in response to a request from Mathias Chapelain.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
d4ed4223d914328361528990f89f1ee4acd30e79 )
zdover23 [Fri, 19 May 2023 07:50:17 +0000 (17:50 +1000)]
Merge pull request #49688 from joscollin/wip-58408-pacific
pacific: doc: document the relevance of mds_namespace mount option
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Nizamudeen A [Fri, 19 May 2023 07:28:52 +0000 (12:58 +0530)]
Merge pull request #51245 from k0ste/wip-53566-pacific
pacific: mgr/dashboard: API docs UI does not work with Angular dev server
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Anthony D'Atri [Thu, 18 May 2023 22:41:54 +0000 (18:41 -0400)]
Merge pull request #51578 from zdover23/wip-doc-2023-05-19-backport-51572-to-pacific
pacific: doc/rados: line-edit devices.rst
Zac Dover [Thu, 18 May 2023 14:13:41 +0000 (00:13 +1000)]
doc/rados: line-edit devices.rst
Edit doc/rados/operations/devices.rst.
Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8d589b43d76a4e291c96c3750d068dba18eb9309 )
zdover23 [Thu, 18 May 2023 14:50:32 +0000 (00:50 +1000)]
Merge pull request #51491 from zdover23/wip-doc-2023-05-16-backport-51485-to-pacific
pacific: doc/start/os-recommendations: drop 4.14 kernel and reword guidance
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Yuri Weinstein [Thu, 18 May 2023 14:33:10 +0000 (07:33 -0700)]
Merge pull request #50988 from lxbsz/wip-59268
pacific: client: clear the suid/sgid in fallocate path
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Thu, 18 May 2023 14:32:19 +0000 (07:32 -0700)]
Merge pull request #50986 from lxbsz/wip-59386
pacific: mds: wait for unlink operation to finish
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Thu, 18 May 2023 14:31:52 +0000 (07:31 -0700)]
Merge pull request #50811 from vshankar/tr-59023
pacific: mds: record and dump last tid for trimming completed requests (or flushes)
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Thu, 18 May 2023 14:30:53 +0000 (07:30 -0700)]
Merge pull request #50809 from dparmar18/wip-59252-pacific
pacific: mgr/nfs: disallow non-existent paths when creating export
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Thu, 18 May 2023 14:30:17 +0000 (07:30 -0700)]
Merge pull request #50773 from batrick/i57597
pacific: qa: data-scan/journal-tool do not output debugging in upstream testing
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Thu, 18 May 2023 14:29:37 +0000 (07:29 -0700)]
Merge pull request #50765 from batrick/i57825
pacific: qa: mirror tests should cleanup fs during unwind
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Anthony D'Atri [Wed, 17 May 2023 22:43:48 +0000 (18:43 -0400)]
Merge pull request #51544 from zdover23/wip-doc-2023-05-18-backport-51534-to-pacific
pacific: doc/cephfs: line-edit "Mirroring Module"
Zac Dover [Wed, 17 May 2023 12:25:38 +0000 (22:25 +1000)]
doc/cephfs: line-edit "Mirroring Module"
Line-edit the "Mirroring Module" section of
doc/cephfs/cephfs-mirroring.rst. Add prompts and formatting where such
things contribute to the realization of adequate sentences.
This commit is a follow-up to https://github.com/ceph/ceph/pull/51505.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
dd8855d9a934bcdd6a026f1308ba7410b1e143e3 )
Yuri Weinstein [Wed, 17 May 2023 15:35:31 +0000 (08:35 -0700)]
Merge pull request #50756 from batrick/i52677
pacific: qa: test_simple failure
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Anthony D'Atri [Wed, 17 May 2023 12:56:36 +0000 (08:56 -0400)]
Merge pull request #51522 from zdover23/wip-doc-2023-05-17-backport-51505-to-pacific
pacific: doc: explain cephfs mirroring `peer_add` step in detail
Venky Shankar [Tue, 16 May 2023 05:25:34 +0000 (10:55 +0530)]
doc: explain cephfs mirroring `peer_add` step in detail
@zdover23 reached out regarding missing explanation for `peer_add`
step in cephfs mirroring documentation. Add some explanation and
and example to make the step clear.
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
6a6e887ff1f7f7d76db7f30f8410783b2f8153b0 )
Anthony D'Atri [Wed, 17 May 2023 00:50:16 +0000 (20:50 -0400)]
Merge pull request #51504 from zdover23/wip-doc-2023-05-16-backport-51492-to-pacific
pacific: doc/start: KRBD feature flag support note
Adam King [Mon, 27 Jun 2022 20:52:14 +0000 (16:52 -0400)]
mgr/cephadm: allow mounting custom conf files
Fixes: https://tracker.ceph.com/issues/56394
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
de43dab44012fc239e4c8c09be264bf5a5a7981c )
Conflicts:
src/cephadm/cephadm
src/pybind/mgr/cephadm/services/cephadmservice.py
Adam King [Mon, 27 Jun 2022 18:26:37 +0000 (14:26 -0400)]
src/python_common: Add CustomConfig class
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
61a6ec0399ac33843d39c9b4bd9ca23ad72e4154 )
Conflicts:
src/python-common/ceph/deployment/drive_group.py
src/python-common/ceph/deployment/service_spec.py
Yuri Weinstein [Tue, 16 May 2023 15:59:27 +0000 (08:59 -0700)]
Merge pull request #49263 from ifed01/wip-ifed-fix-read-error-code-pac
pacific: blk/kernel: Fix error code mapping in KernelDevice::read.
Reviewed-by: Laura Flores <lflores@redhat.com>
Yuri Weinstein [Tue, 16 May 2023 15:58:48 +0000 (08:58 -0700)]
Merge pull request #50637 from ifed01/wip-ifed-bound-rm-range-keys-pac
pacific: kv/RocksDBStore: cumulative backport for rm_range_keys and around
Reviewed-by: Laura Flores <lflores@redhat.com>
Yuri Weinstein [Tue, 16 May 2023 15:58:15 +0000 (08:58 -0700)]
Merge pull request #50496 from ifed01/wip-ifed-fix-prefixed-kv-iterator-pac
pacific: kv/RocksDBStore: don't use real wholespace iterator for prefixed access
Reviewed-by: Laura Flores <lflores@redhat.com>
Yuri Weinstein [Tue, 16 May 2023 15:57:43 +0000 (08:57 -0700)]
Merge pull request #50322 from ifed01/wip-ifed-57271-pac
pacific: blk/KernelDevice: Modify the rotational and discard check log message
Reviewed-by: Laura Flores <lflores@redhat.com>
Yuri Weinstein [Tue, 16 May 2023 15:55:16 +0000 (08:55 -0700)]
Merge pull request #50932 from ifed01/wip-ifed-fix-spillover-alert-pac
pacific: os/bluestore: fix spillover alert
Reviewed-by: Laura Flores <lflores@redhat.com>
Igor Fedotov [Tue, 16 May 2023 15:35:40 +0000 (18:35 +0300)]
Merge pull request #50506 from ifed01/wip-ifed-report-min-alloc-size-pac
pacific: os/bluestore: report min_alloc_size through "ceph osd metadata"
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Mon, 15 May 2023 17:04:43 +0000 (03:04 +1000)]
doc/start: KRBD feature flag support note
Add KRBD feature flag support note to doc/start/os-recommendations.rst.
This change was suggested by Anthony D'Atri in https://github.com/ceph/ceph/pull/51485.
Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
2a619dba2d22749e6facaf8dd0d370e16a1672c4 )
Anthony D'Atri [Mon, 15 May 2023 16:52:00 +0000 (12:52 -0400)]
Merge pull request #51479 from zdover23/wip-doc-2023-05-15-backport-51473-to-pacific
pacific: doc/rados: edit devices.rst
Ilya Dryomov [Fri, 12 May 2023 11:55:32 +0000 (13:55 +0200)]
doc/start/os-recommendations: drop 4.14 kernel and reword guidance
The 4.14 LTS kernel has less than a year left in terms of maintenance,
drop it.
Also, the current wording with an explicit list of kernels tends to go
stale: it's missing the latest 6.1 LTS kernel.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b697f96f3872f178f024e85799445386204a96e1 )
Yuri Weinstein [Mon, 15 May 2023 15:37:04 +0000 (08:37 -0700)]
Merge pull request #50733 from lxbsz/wip-58881
pacific: mds: make num_fwd and num_retry to __u32
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Mon, 15 May 2023 15:36:32 +0000 (08:36 -0700)]
Merge pull request #50725 from lxbsz/wip-59007
pacific: mds: force replay sessionmap version
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Mon, 15 May 2023 15:35:24 +0000 (08:35 -0700)]
Merge pull request #50715 from joscollin/wip-58807-pacific
pacific: cephfs-top: dump values to stdout and -d [--delay] option fix
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Mon, 15 May 2023 15:34:49 +0000 (08:34 -0700)]
Merge pull request #50596 from neesingh-rh/wip-58866-pacific
pacific: cephfs-top: Some fixes in `choose_field()` for sorting
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Yuri Weinstein [Mon, 15 May 2023 15:33:47 +0000 (08:33 -0700)]
Merge pull request #50523 from trociny/wip-59019-pacific
pacific: tools/cephfs-data-scan: support for multi-datapool
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Zac Dover [Mon, 15 May 2023 01:01:19 +0000 (11:01 +1000)]
doc/rados: edit devices.rst
Line-edit doc/rados/operations/devices.rst.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Co-authored-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8321b457a25a4394439f908c500091ce30e0736a )
Anthony D'Atri [Sun, 14 May 2023 13:39:18 +0000 (09:39 -0400)]
Merge pull request #51471 from zdover23/wip-doc-2023-05-14-backport-51175-to-pacific
pacific: doc: add link to "documenting ceph" to index.rst
Zac Dover [Fri, 21 Apr 2023 20:59:04 +0000 (22:59 +0200)]
doc: add link to "documenting ceph" to index.rst
Add a link to the landing page of docs.ceph.com to direct documentation
contributors to documentation-related information.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
155a382cb2e8b80dca260ca7abdc3cc89c805edb )
Anthony D'Atri [Sat, 13 May 2023 11:40:29 +0000 (07:40 -0400)]
Merge pull request #51467 from zdover23/wip-doc-2023-05-13-backport-51463-to-pacific
pacific: doc/cephfs: edit fs-volumes.rst (1 of x)
Zac Dover [Fri, 12 May 2023 15:49:14 +0000 (01:49 +1000)]
doc/cephfs: edit fs-volumes.rst (1 of x)
Edit the syntax of the English language in the file
doc/cephfs/fs-volumes.rst up to (but not including) the section called
"FS Subvolumes".
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
a1184070a1a3d2f6c1462c62f88fe70df5626c36 )
zdover23 [Fri, 12 May 2023 13:29:02 +0000 (23:29 +1000)]
Merge pull request #51460 from zdover23/wip-doc-2023-05-12-backport-51458-to-pacific
pacific: doc/cephfs: rectify prompts in fs-volumes.rst
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>