]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Xiubo Li [Fri, 15 Jul 2022 09:41:43 +0000 (17:41 +0800)]
ceph_fuse: retry the test_dentry_handling if fails
For some unknown reason the remount will fail, we need to retry it
for the test_dentry_handling.
Fixes: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
f6a9bd6a69362527502eba4906e2605f3474007f )
Xiubo Li [Fri, 10 Mar 2023 05:46:27 +0000 (13:46 +0800)]
client: rename mds_max_retries_on_remount_failure to client_
mds_max_retries_on_remount_failure option is used by Client.cc only.
Fixed: https://tracker.ceph.com/issues/56532
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
b9edab80f048fee09b82cdd4ec58fa37bd937ded )
Conflicts:
- The options are still old style in pacific
zdover23 [Thu, 9 Mar 2023 19:59:01 +0000 (05:59 +1000)]
Merge pull request #50389 from zdover23/wip-doc-2023-03-06-backport-50386-to-pacific
pacific: doc/rgw - fix grammar in table in s3.rst
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Nizamudeen A [Thu, 9 Mar 2023 05:29:20 +0000 (10:59 +0530)]
Merge pull request #50122 from rhcs-dashboard/wip-57513-pacific
pacific: mgr/dashboard: osd form preselect db/wal device filters
Reviewed-by: Pegonzal <NOT@FOUND>
Anthony D'Atri [Wed, 8 Mar 2023 12:49:43 +0000 (07:49 -0500)]
Merge pull request #50436 from zdover23/wip-doc-2023-03-08-backport-49823-to-pacific
pacific: doc/install: refine index.rst
Zac Dover [Sat, 21 Jan 2023 16:32:59 +0000 (02:32 +1000)]
doc/install: refine index.rst
Refine English sentences in doc/install/index.rst. Remove adverbial
phrases of time that refer to Nautilus-era features as "new", since that
was four years ago.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
e7669539aceffc0f6f5d61bd140f1c7936d21cf9 )
zdover23 [Wed, 8 Mar 2023 04:01:15 +0000 (14:01 +1000)]
Merge pull request #50433 from zdover23/wip-doc-2023-03-08-backport-50430-to-pacific
pacific: doc/install: update index.rst
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Wed, 8 Mar 2023 01:52:12 +0000 (11:52 +1000)]
doc/install: update index.rst
Update index.rst by making minor grammar improvements. This file was
long overdue for a backport to Reef, Quincy, and Pacific, so this commit
was a good way to pass a human eyeball over the text before making those
backports.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
82d748ff590cfd31fefddc094b10622d090b054f )
Ilya Dryomov [Tue, 7 Mar 2023 18:54:36 +0000 (19:54 +0100)]
Merge pull request #50158 from idryomov/wip-57396-pacific
pacific: librbd: Fix local rbd mirror journals growing forever
Reviewed-by: Mykola Golub <mgolub@suse.com>
Yuri Weinstein [Tue, 7 Mar 2023 17:06:15 +0000 (09:06 -0800)]
Merge pull request #50265 from idryomov/wip-58755-pacific
pacific: rbd-mirror: add information about the last snapshot sync to image status
Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Yuri Weinstein [Tue, 7 Mar 2023 17:05:29 +0000 (09:05 -0800)]
Merge pull request #50181 from nbalacha/wip-58764-pacific
pacific: rbd-mirror: fix syncing_percent calculation logic in get_replay_status()
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Tue, 7 Mar 2023 17:03:57 +0000 (09:03 -0800)]
Merge pull request #50129 from idryomov/wip-58060-pacific
pacific: librbd: avoid EUCLEAN error after "rbd rm" is interrupted
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Tue, 7 Mar 2023 17:03:25 +0000 (09:03 -0800)]
Merge pull request #50112 from idryomov/wip-58688-pacific
pacific: qa/suites/rbd: fix sporadic "rx-only direction" test failures
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Tue, 7 Mar 2023 17:02:30 +0000 (09:02 -0800)]
Merge pull request #49650 from ajarr/wip-58361-pacific
pacific: mgr/rbd_support: remove localized schedule option during module startup
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Tue, 7 Mar 2023 17:01:45 +0000 (09:01 -0800)]
Merge pull request #49413 from idryomov/wip-50461-pacific
pacific: librbd/crypto: fix bad return checks from libcryptsetup
Reviewed-by: Mykola Golub <mgolub@suse.com>
zdover23 [Mon, 6 Mar 2023 23:13:59 +0000 (09:13 +1000)]
Merge pull request #50401 from zdover23/wip-doc-2023-03-07-backport-50398-to-pacific
pacific: doc/dev: add full stop to sentence in basic-wo
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Mon, 6 Mar 2023 16:15:27 +0000 (02:15 +1000)]
doc/dev: add full stop to sentence in basic-wo
Add a full stop to a sentence in basic-workflow.rst. I looked at this
document and noticed that it wasn't there, and it was just bugging me.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
262b115b7554b7931cc174500eb12ac7a5d67513 )
Anthony D'Atri [Mon, 6 Mar 2023 14:18:16 +0000 (09:18 -0500)]
Merge pull request #50396 from zdover23/wip-doc-2023-03-06-backport-50382-to-pacific
pacific: doc/rgw: fix caption
Zac Dover [Sun, 5 Mar 2023 06:43:38 +0000 (16:43 +1000)]
doc/rgw: fix caption
Rewrite the third paragraph of the caption to the figure depicting how a
zonegroup works.
Follows https://github.com/ceph/ceph/pull/50316.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8fa521466023635436305c1af31501bbbe20e857 )
Zac Dover [Mon, 6 Mar 2023 00:09:24 +0000 (10:09 +1000)]
doc/rgw - fix grammar in table in s3.rst
Put an "only" in the correct place. Also, this is a very small change
that will allow me to see if Jenkins is working (it probably isn't).
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
1beab1e8abf59088be628cca972c59202526637d )
Anthony D'Atri [Fri, 3 Mar 2023 23:04:48 +0000 (18:04 -0500)]
Merge pull request #50379 from zdover23/wip-doc-2023-03-04-backport-50375-to-pacific
pacific: doc/rgw: refine keycloak.rst
Zac Dover [Fri, 3 Mar 2023 19:36:35 +0000 (05:36 +1000)]
doc/rgw: refine keycloak.rst
Full line-edit of doc/radosgw/keycloak.rst. Corrected syntax, grammar,
RST, and broken links.
Co-authored-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
5706ff1e451e6c7b3c3d40d492985377161b0133 )
Anthony D'Atri [Fri, 3 Mar 2023 15:55:50 +0000 (10:55 -0500)]
Merge pull request #50368 from zdover23/wip-doc-2023-03-03-backport-50364-to-pacific
pacific: doc/cephadm: Redd up compatibility.rst
Anthony D'Atri [Fri, 3 Mar 2023 07:44:26 +0000 (02:44 -0500)]
doc/cephadm: Redd up compatibility.rst
Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit
d608dec43b84c9a06990458219dda769829e05f8 )
Anthony D'Atri [Fri, 3 Mar 2023 06:49:47 +0000 (01:49 -0500)]
Merge pull request #50363 from zdover23/wip-doc-2023-03-03-backport-50354-to-pacific
pacific: doc/rgw: clean zone-sync.svg
Zac Dover [Thu, 2 Mar 2023 19:24:00 +0000 (05:24 +1000)]
doc/rgw: clean zone-sync.svg
Refine zone-sync.svg (fix kerning and use fonts that render properly).
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
064fdc9d9b4ad3393bfb5069d2f97dc622aaf12d )
Anthony D'Atri [Thu, 2 Mar 2023 23:47:29 +0000 (18:47 -0500)]
Merge pull request #50357 from zdover23/wip-doc-2023-03-03-backport-50351-to-pacific
pacific: doc/radosgw: format admonitions
Zac Dover [Thu, 2 Mar 2023 18:04:30 +0000 (04:04 +1000)]
doc/radosgw: format admonitions
Break up the text of two similar admonitions into three paragraphs (in
each of the two instances). This makes the content of the admonition
much easier to read at a glance.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
4db68f5711f48b190f0135a3a7a6df8dfcf5abfa )
zdover23 [Thu, 2 Mar 2023 04:00:37 +0000 (14:00 +1000)]
Merge pull request #50337 from zdover23/wip-doc-2023-03-02-backport-50335-to-pacific
pacific: doc/cephadm: update cephadm compatability and stability page
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Adam King [Wed, 1 Mar 2023 21:10:41 +0000 (16:10 -0500)]
doc/cephadm: update cephadm compatability and stability page
This page is very out of date. This commit probably doesn't
cover everything there is to say about stability and compatability
in cephadm, but it at least gets it noticeably closer to reality
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
383f46aa79e7a6f5571405a352ad023983560625 )
Anthony D'Atri [Wed, 1 Mar 2023 18:39:06 +0000 (13:39 -0500)]
Merge pull request #50332 from zdover23/wip-doc-2023-03-02-backport-50316-to-pacific
pacific: doc/rgw: improve diagram caption
Zac Dover [Wed, 1 Mar 2023 07:36:18 +0000 (17:36 +1000)]
doc/rgw: improve diagram caption
Improve the syntax and semantics of the caption of the diagram
"Replication of Object Data Between Zones" in doc/radosgw/multisite.rst.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
e8aa50e240141949e2cf91c3b216808f4e055887 )
Anthony D'Atri [Tue, 28 Feb 2023 12:54:31 +0000 (07:54 -0500)]
Merge pull request #50298 from zdover23/wip-doc-2023-02-28-backport-50295-to-pacific
doc/radosgw: s/zone group/zonegroup/g et alia
Zac Dover [Tue, 28 Feb 2023 02:55:08 +0000 (12:55 +1000)]
doc/radosgw: s/zone group/zonegroup/g et alia
s/zone group/zonegroup/ where simple greps failed to find instances of
"zone group" that were spread across two lines; break a paragraph into
two paragraphs so that each paragraph has a thematic idea of its own.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
d1f2e9f3a6837f2b19acaabfb3261849d547d5f8 )
Anthony D'Atri [Tue, 28 Feb 2023 06:03:59 +0000 (01:03 -0500)]
Merge pull request #50294 from zdover23/wip-doc-2023-02-28-backport-50276-to-pacific
pacific: doc/rgw: caption a diagram
Zac Dover [Mon, 27 Feb 2023 09:00:04 +0000 (19:00 +1000)]
doc/rgw: caption a diagram
Add an explanation of a diagram that shows how object data is replicated
between zones within a zonegroup.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
ce2bd7cb2603c479c17ac18b9277b903a02bb06a )
Anthony D'Atri [Mon, 27 Feb 2023 19:45:24 +0000 (14:45 -0500)]
Merge pull request #50288 from zdover23/wip-doc-2023-02-28-backport-50274-to-pacific
pacific: doc/rgw: remove "tertiary", link to procedure
zdover23 [Mon, 27 Feb 2023 18:31:16 +0000 (04:31 +1000)]
Merge pull request #50278 from zdover23/wip-doc-2023-02-27-backport-50264-to-pacific
pacific: doc/radosgw: multisite - edit "functional changes"
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Mon, 27 Feb 2023 08:40:14 +0000 (18:40 +1000)]
doc/rgw: remove "tertiary", link to procedure
Remove the term "tertiary zone" and replace it with "second secondary
zone" (because there is no such thing as a tertiary zone). Link to the
procedure for creating a secondary zone in a place where such a link is
helpful to the reader.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
8e273199d09a670578b0c1076bc18dbd113d42dd )
Anthony D'Atri [Mon, 27 Feb 2023 13:42:25 +0000 (08:42 -0500)]
Merge pull request #50272 from zdover23/wip-doc-2023-02-27-backport-50267-to-pacific
pacific: doc/glossary: Add "zone" to glossary.rst
Zac Dover [Sun, 26 Feb 2023 16:52:02 +0000 (02:52 +1000)]
doc/radosgw: multisite - edit "functional changes"
Improve the wording of the section "Functional Changes from Infernalis"
in doc/radosgw/multisite.rst.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
35edcc17c96010328e8ee85648a3b74887aef7b9 )
Zac Dover [Sun, 26 Feb 2023 18:18:50 +0000 (04:18 +1000)]
doc/glossary: Add "zone" to glossary.rst
Add "Zone" 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
495eb97fd7fa3d53d27ad8d7df993df80b708ca1 )
Divyansh Kamboj [Wed, 7 Dec 2022 10:25:38 +0000 (15:55 +0530)]
rbd-mirror: add information about the last snapshot sync to image status
this commit adds fields for time taken to sync and bytes in the last
snapshot to the mirror image status command.
Fixes: https://tracker.ceph.com/issues/58755
Signed-off-by: Divyansh Kamboj <dkamboj@redhat.com>
(cherry picked from commit
9b9f18a65d2430ddcf32cbf85566b0223be91758 )
Anthony D'Atri [Sun, 26 Feb 2023 16:53:50 +0000 (11:53 -0500)]
Merge pull request #50263 from zdover23/wip-doc-2023-02-27-backport-50260-to-pacific
pacific: doc/glossary: add "client" to glossary
Zac Dover [Sat, 25 Feb 2023 19:51:07 +0000 (05:51 +1000)]
doc/glossary: add "client" to glossary
Add a definition of "client" to doc/glossary.rst.
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
2dc6f56f26c55f89f3445ff97a88a704622b55c0 )
zdover23 [Sat, 25 Feb 2023 20:16:30 +0000 (06:16 +1000)]
Merge pull request #50259 from zdover23/wip-doc-2023-02-26-backport-50257-to-pacific
pacific: doc/glossary: add "application" to the glossary
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
Zac Dover [Sat, 25 Feb 2023 10:12:16 +0000 (20:12 +1000)]
doc/glossary: add "application" to the glossary
Add an admittedly-stub definition of "application" 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
235d2e8b67b1700a55819a14eb26f00de86ba554 )
zdover23 [Sat, 25 Feb 2023 10:13:57 +0000 (20:13 +1000)]
Merge pull request #50255 from zdover23/wip-doc-2023-02-24-backport-50250-to-pacific
pacific: doc/cephadm/host-management: add service spec link
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
colemitchell [Fri, 24 Feb 2023 16:01:19 +0000 (11:01 -0500)]
Merge pull request #50253 from zdover23/wip-doc-2023-02-24-backport-50179-to-pacific
pacific: doc/cephfs: describe conf opt "client quota df" in quota doc
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
Rishabh Dave [Mon, 20 Feb 2023 07:51:25 +0000 (13:21 +0530)]
doc/cephfs: describe conf opt "client quota df" in quota doc
The ceph config file option (from the client section) "client quota df"
is mentioned in "CephFS Client Capabilities" document but not in the
"CephFS Quota" document. Adding information about this option to this
document too would make it easier for CephFS users to discover,
understand and use this option.
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
cd3f9575afb33bdb0a311a3f27801879a3254824 )
thomas [Fri, 24 Feb 2023 06:00:00 +0000 (01:00 -0500)]
doc/cephadm/host-management: add service spec link
The old "(below)" text is not accurate, the service spec definition is
not in the same file at this point in time. This commit adds a ref link
to the actual service specification section.
Signed-off-by: thomas <me@thomasanderson.cloud>
(cherry picked from commit
bb5837f049d9eb46f8d5c63c4dfec09fd94424f3 )
Anthony D'Atri [Fri, 24 Feb 2023 02:53:18 +0000 (21:53 -0500)]
Merge pull request #50248 from zdover23/wip-doc-2023-02-24-backport-50246-to-pacific
pacific: doc/glossary: add AWS/OpenStack bucket info
Zac Dover [Fri, 24 Feb 2023 01:07:12 +0000 (11:07 +1000)]
doc/glossary: add AWS/OpenStack bucket info
Add links to AWS's documentation of buckets, in accordance with Casey
Bodley's suggestions here:
https://github.com/ceph/ceph/pull/50221#discussion_r1115900879
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
d16ed970e9ac76d6320f0ae26fa3ddd745dbd429 )
colemitchell [Thu, 23 Feb 2023 15:20:41 +0000 (10:20 -0500)]
Merge pull request #50225 from zdover23/wip-doc-2023-02-23-backport-50221-to-pacific
pacific: doc/glossary: add "Bucket"
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
zdover23 [Thu, 23 Feb 2023 15:06:52 +0000 (01:06 +1000)]
Merge pull request #50229 from zdover23/wip-doc-2023-02-23-backport-50226-to-pacific
pacific: doc: preen cephadm/troubleshooting.rst and radosgw/placement.rst
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Anthony D'Atri [Thu, 23 Feb 2023 06:31:31 +0000 (01:31 -0500)]
doc: preen cephadm/troubleshooting.rst and radosgw/placement.rst
Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit
d5bf55bcd6fcec43d2b728a2b8cd2f35b42e3b7e )
Anthony D'Atri [Thu, 23 Feb 2023 06:38:21 +0000 (01:38 -0500)]
Merge pull request #50223 from zdover23/wip-doc-2023-02-23-backport-50220-to-pacific
pacific: doc/cephadm/troubleshooting: remove word repeat
Zac Dover [Thu, 23 Feb 2023 05:53:39 +0000 (15:53 +1000)]
doc/glossary: add "Bucket"
Add "Bucket" to the glossary. The definition added here is just a first
attempt, but a man's reach must exceed his grasp, or what's a heaven
for?
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
ffbc5ea2b9347e2600df6aea9cdf895529fbf857 )
thomas [Thu, 23 Feb 2023 05:41:34 +0000 (00:41 -0500)]
doc/cephadm/troubleshooting: remove word repeat
The original text was "In case the cluster the last MGR of a cluster"
Signed-off-by: thomas <me@thomasanderson.cloud>
(cherry picked from commit
4e9eaf8b5d81b58ad49ed6ecbce38db98b985fc1 )
Anthony D'Atri [Thu, 23 Feb 2023 05:35:03 +0000 (00:35 -0500)]
Merge pull request #50219 from zdover23/wip-doc-2023-02-23-backport-50213-to-pacific
pacific: doc/rados: update OSD_BACKFILLFULL description
Ponnuvel Palaniyappan [Wed, 22 Feb 2023 16:20:46 +0000 (16:20 +0000)]
doc/rados: update OSD_BACKFILLFULL description
Document that this warning can happen even when the OSDs' limits
haven't hit the backfill_full_ratio.
Signed-off-by: Ponnuvel Palaniyappan <pponnuvel@gmail.com>
(cherry picked from commit
198a9e02cb934802fcb5d5d06b05e3662a4b5cab )
Adam King [Wed, 22 Feb 2023 16:58:45 +0000 (11:58 -0500)]
Merge pull request #49972 from mnasiadka/pacific_57627
ceph-volume: fix regression in activate
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Adam King [Wed, 22 Feb 2023 16:56:52 +0000 (11:56 -0500)]
Merge pull request #50145 from guits/wip-58736-pacific
pacific: ceph-volume: do not raise RuntimeError in util.lsblk
Reviewed-by: Teoman ONAY <tonay@ibm.com>
Adam King [Wed, 22 Feb 2023 16:55:34 +0000 (11:55 -0500)]
Merge pull request #50162 from guits/wip-58786-pacific
pacific: ceph-volume: legacy_encrypted() shouldn't call lsblk() when device is 'tmpfs'
Reviewed-by: Teoman ONAY <tonay@ibm.com>
Anthony D'Atri [Wed, 22 Feb 2023 04:41:08 +0000 (23:41 -0500)]
Merge pull request #50205 from zdover23/wip-doc-2023-02-22-backport-50203-to-pacific
pacific: doc/rgw: clarify multisite.rst top matter
Zac Dover [Wed, 22 Feb 2023 03:36:40 +0000 (13:36 +1000)]
doc/rgw: clarify multisite.rst top matter
Improve the pragmatics of the top matter of multisite.rst. Organize the
text into sections, where doing so makes the nature of multi-site
configurations clearer.
Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
bbc229340f77ba8ec7fa967a59664caf3c07d030 )
zdover23 [Tue, 21 Feb 2023 16:34:23 +0000 (02:34 +1000)]
Merge pull request #50190 from zdover23/wip-doc-2023-02-21-backport-50165-to-pacific
pacific: doc/rgw: multisite ref. top matter cleanup
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
Zac Dover [Sun, 19 Feb 2023 13:20:45 +0000 (23:20 +1000)]
doc/rgw: multisite ref. top matter cleanup
Edit the top matter in "Multi-site Configuration Reference" so that it
is semantically more natural.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
db2a5624852224263ba3bd8baaa9b4addf80cb97 )
colemitchell [Tue, 21 Feb 2023 04:19:55 +0000 (23:19 -0500)]
Merge pull request #50188 from zdover23/wip-doc-2023-02-21-backport-50186-to-pacific
pacific: doc/rgw: session-tags.rst - fix link to keycloak
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
Zac Dover [Tue, 21 Feb 2023 03:55:03 +0000 (13:55 +1000)]
doc/rgw: session-tags.rst - fix link to keycloak
Fix a link in the doc/radosgw/session-tags.rst file that was intended to
link to the doc/radosgw/keycloak.rst file.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
76eae93ab8dcd91873f49350d452da8b4838fbb0 )
N Balachandran [Thu, 16 Feb 2023 04:57:02 +0000 (10:27 +0530)]
rbd-mirror: fix syncing_percent calculation logic in get_replay_status()
When a snapshot sync is resumed and the get_replay_status function
is called before handle_copy_image_progress, the syncing_percent
value may be greater than 100 as the m_local_object_count is still
set to zero. This commit sets the syncing_percent to 0 in such cases.
Fixes: https://tracker.ceph.com/issues/58706
Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit
c7ae0f6eb6a8fb08859454d1b2e81d2dc7b0226f )
Anthony D'Atri [Mon, 20 Feb 2023 01:43:50 +0000 (20:43 -0500)]
Merge pull request #50174 from zdover23/wip-doc-2023-02-20-backport-50164-to-pacific
pacific: doc/radosgw: s/execute/run/ in multisite.rst
Zac Dover [Sun, 19 Feb 2023 06:46:49 +0000 (16:46 +1000)]
doc/radosgw: s/execute/run/ in multisite.rst
Replace "execute" with "run" in fourteen out of fifteen instances in
multisite.rst. "Execute" is plain old too grand in most of these
instances.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
b54b1b6bf5c9f7fee9387464b553035a88f6729e )
Guillaume Abrioux [Sun, 19 Feb 2023 00:20:40 +0000 (01:20 +0100)]
Merge pull request #49789 from guits/wip-58397-pacific
pacific: ceph-volume/tests: add allowlist_externals to tox.ini
Guillaume Abrioux [Sat, 18 Feb 2023 02:05:51 +0000 (03:05 +0100)]
ceph-volume: legacy_encrypted() shouldn't call lsblk() when device is 'tmpfs'
When the device variable is rebound and become 'tmpfs', lsblk() shouldn't be called.
Fixes: https://tracker.ceph.com/issues/58784
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit
c0369fbecee1a4d71004ee5e72ee0e2526d0fcf2 )
Ilya Dryomov [Thu, 16 Feb 2023 11:53:02 +0000 (12:53 +0100)]
qa/workunits/rbd-nbd: work around "rbd feature disable" hang
"rbd feature disable" appears to reliably hang if the corresponding
remote request is proxied to rbd-nbd (because rbd-nbd happens to own
the exclusive lock after a series of blkdiscard calls) [1]. Work
around it here by enabling journaling before the image is mapped
and disabling it after the image is unmapped.
Also, don't assert on the output of "rbd journal inspect --verbose"
having a certain number of entries. This is racy: if the script gets
delayed after the last blkdiscard call for some reason, there may be
fewer entries present in the journal or none at all.
[1] https://tracker.ceph.com/issues/58740
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
fcfef0a19e1d85a8b9414909268f1370ec82808d )
Ilya Dryomov [Thu, 16 Feb 2023 11:51:04 +0000 (12:51 +0100)]
test/librbd: add LengthModifiedDiscardJournalAppendEnabled test
Currently nothing triggers the length_modified case in
ImageDiscardRequest::prune_object_extents() in isolation. It's only
triggered in DiscardGranularityJournalAppendEnabled test together with
the prune_required case and a bad refactoring could easily break the
length_modified logic again.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
34e59c450298e1c05f07570f74a9489bd8479a44 )
Conflicts:
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
b9a2384cdc43 ("librbd: propagate area down to
file_to_extents()") not in pacific ]
Josef Johansson [Mon, 2 Jan 2023 13:12:53 +0000 (14:12 +0100)]
librbd: Fix local rbd mirror journals growing forever
This commit fixes commit
7ca1bab90f3 by pushing properly aligned
discards back to m_image_extents, if corrected.
If discards are misaligned (off 0, len 4608, gran=4096), they are
corrected properly, but only in object_extents and not in
m_image_extents.
When journal_append_event is triggered it will only append from
m_image_extents and does not now about the alignment fixes. In
commit_io_events_extent it will log a message and return without
completing the io since the larger misaligned area was sent to the journal.
This will in turn break rbd journal mirroring since the local client will wait
indefinately on the commit to be completed, which it never does.
This does not effect rbd-mirror in any way, which may be confusing and
dangerous since it's only rbd-mirror that updates ceph health, and not
the local client.
Setting `rbd_skip_partial_discard = false` under client will restore the
pre
7ca1bab behaviour and thus not trigger the bug with journals growing.
This will set `rbd_discard_granularity_bytes = 0` internally. This
setting is only changed during startup of a client.
Fixes: 7ca1bab90f3db3aaaa4cdbfc1f18e9f5cfbf5568
Fixes: https://tracker.ceph.com/issues/57396
Signed-off-by: Josef Johansson <josef@oderland.se>
(cherry picked from commit
21a26a752843295ff946d1543c2f5f9fac764593 )
Conflicts:
src/librbd/io/ImageRequest.cc [ commit
b2c88820923e ("librbd:
return area from extents_to_file()") not in pacific ]
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
b9a2384cdc43 ("librbd: propagate area down to
file_to_extents()") not in pacific ]
Anthony D'Atri [Sat, 18 Feb 2023 03:30:29 +0000 (22:30 -0500)]
Merge pull request #50156 from zdover23/wip-doc-2023-02-18-backport-50154-to-pacific
pacific: doc/glossary: add "Period" to glossary
Zac Dover [Fri, 17 Feb 2023 22:03:06 +0000 (08:03 +1000)]
doc/glossary: add "Period" to glossary
Add definition for "period" to glossary.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
bd9bc3adb3960385615fe79ea83809396a19dae0 )
Adam King [Fri, 17 Feb 2023 14:06:46 +0000 (09:06 -0500)]
Merge pull request #49927 from adk3798/wip-58559-pacific
pacific: cephadm: don't overwrite cluster logrotate file
Reviewed-by: Teoman ONAY <tonay@ibm.com>
Adam King [Fri, 17 Feb 2023 14:03:40 +0000 (09:03 -0500)]
Merge pull request #49310 from adk3798/wip-58203-pacific
pacific: mgr/cephadm: iscsi username and password defaults to admin
Reviewed-by: Nizamudeen A <nia@redhat.com>
Adam King [Fri, 17 Feb 2023 14:02:18 +0000 (09:02 -0500)]
Merge pull request #49917 from adk3798/wip-58177-pacific
pacific: mgr/cephadm: add ingress support for ssl rgw service
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Adam King [Fri, 17 Feb 2023 14:00:46 +0000 (09:00 -0500)]
Merge pull request #49920 from adk3798/wip-58208-pacific
pacific: mgr/cephadm: write client files after applying services
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Adam King [Fri, 17 Feb 2023 13:58:44 +0000 (08:58 -0500)]
Merge pull request #49921 from adk3798/wip-58247-pacific
pacific: mgr/cephadm: fix handling of mgr upgrades with 3 or more mgrs
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Adam King [Fri, 17 Feb 2023 13:58:03 +0000 (08:58 -0500)]
Merge pull request #49922 from adk3798/wip-58452-pacific
pacific: mgr/orchestrator: fix upgrade status help message
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Adam King [Fri, 17 Feb 2023 13:57:21 +0000 (08:57 -0500)]
Merge pull request #49929 from adk3798/wip-57788-pacific
pacific: mgr/nfs: add sectype option
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Pedro Gonzalez Gomez [Fri, 17 Feb 2023 08:05:21 +0000 (09:05 +0100)]
Merge pull request #47330 from rhcs-dashboard/wip-56946-pacific
pacific: mgr/dashboard: added pattern validaton for form input
Reviewed-by: Nizamudeen A <nia@redhat.com>
zdover23 [Fri, 17 Feb 2023 04:32:32 +0000 (14:32 +1000)]
Merge pull request #50135 from zdover23/wip-doc-2023-02-16-backport-50120-to-pacific
pacific: doc/glossary: add "realm" to glossary
Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
Yuri Weinstein [Thu, 16 Feb 2023 16:33:54 +0000 (08:33 -0800)]
Merge pull request #49233 from Matan-B/wip-58144-pacific
pacific: mon/MonCommands: Support dump_historic_slow_ops
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
Yuri Weinstein [Thu, 16 Feb 2023 16:33:09 +0000 (08:33 -0800)]
Merge pull request #48846 from nkshirsagar/wip-58007-pacific
pacific: mon: bail from handle_command() if _generate_command_map() fails
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Thu, 16 Feb 2023 16:32:02 +0000 (08:32 -0800)]
Merge pull request #48804 from tserong/wip-57996-pacific
pacific: ceph-crash: drop privleges to run as "ceph" user, rather than root (CVE-2022-3650)
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Guillaume Abrioux [Tue, 7 Feb 2023 09:51:36 +0000 (10:51 +0100)]
ceph-volume: do not raise RuntimeError in util.lsblk
Otherwise it makes `simple scan` calls fail.
```
File "/usr/lib/python3.6/site-packages/ceph_volume/util/disk.py", line 246, in lsblk
raise RuntimeError(f"{device} not found is lsblk report")
RuntimeError: /var/lib/ceph/osd/ceph-0/ not found is lsblk report
```
Fixes: https://tracker.ceph.com/issues/58655
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit
4f19a0f4e1726466968d610da3b0f753981e44a7 )
Nizamudeen A [Thu, 16 Feb 2023 10:58:47 +0000 (16:28 +0530)]
Merge pull request #49503 from rhcs-dashboard/wip-58270-pacific
pacific: mgr/dashboard: add tooltip mirroring pools table
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Guillaume Abrioux [Thu, 16 Feb 2023 09:45:07 +0000 (10:45 +0100)]
Merge pull request #49869 from guits/wip-58575-pacific
pacific: ceph-volume: fix a bug in lsblk_all()
Anthony D'Atri [Thu, 16 Feb 2023 02:12:46 +0000 (21:12 -0500)]
Merge pull request #50140 from zdover23/wip-doc-2023-02-16-backport-50138-to-pacific
pacific: doc/rgw: refine "Realms" section
Zac Dover [Wed, 15 Feb 2023 23:56:53 +0000 (09:56 +1000)]
doc/rgw: refine "Realms" section
Make various syntactical and semantic improvements to "Realms" section.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
5cea2529c442cd0c5ecc25a8f3131548a71f590f )
Anthony D'Atri [Thu, 16 Feb 2023 01:56:38 +0000 (20:56 -0500)]
Merge pull request #50137 from zdover23/wip-doc-2023-02-16-backport-50119-to-pacific
pacific: doc/rgw: s/[Zz]one [Gg]roup/zonegroup/g
Zac Dover [Wed, 15 Feb 2023 05:05:43 +0000 (15:05 +1000)]
doc/rgw: s/[Zz]one [Gg]roup/zonegroup/g
Change all instances of "Zone Group" and "Zone group" and "zone group"
to "Zonegroup" or "zonegroup".
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
956c54b7c922adddba8dc56304636f21bb053c0e )
Zac Dover [Wed, 15 Feb 2023 07:51:41 +0000 (17:51 +1000)]
doc/glossary: add "realm" to glossary
Add the term "Realm" to the glossary, and link to the section in the RGW
documentation that provides more information about realms.
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit
5e8aed3367060503c0d4c50f19e72b5ea4583a01 )