]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agoMerge pull request #50180 from nbalacha/wip-58763-quincy
Yuri Weinstein [Mon, 6 Mar 2023 15:43:21 +0000 (07:43 -0800)]
Merge pull request #50180 from nbalacha/wip-58763-quincy

quincy: rbd-mirror: fix syncing_percent calculation logic in get_replay_status()

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50159 from idryomov/wip-57396-quincy
Yuri Weinstein [Mon, 6 Mar 2023 15:41:47 +0000 (07:41 -0800)]
Merge pull request #50159 from idryomov/wip-57396-quincy

quincy: librbd: Fix local rbd mirror journals growing forever

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #50395 from zdover23/wip-doc-2023-03-06-backport-50382-to-quincy
Anthony D'Atri [Mon, 6 Mar 2023 14:22:18 +0000 (09:22 -0500)]
Merge pull request #50395 from zdover23/wip-doc-2023-03-06-backport-50382-to-quincy

quincy: doc/rgw: fix caption

2 years agodoc/rgw: fix caption 50395/head
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)

2 years agoMerge pull request #49851 from adk3798/wip-58540-quincy
Adam King [Sat, 4 Mar 2023 23:42:13 +0000 (18:42 -0500)]
Merge pull request #49851 from adk3798/wip-58540-quincy

quincy: mgr/cephadm: support for extra entrypoint args

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
2 years agoMerge pull request #50378 from zdover23/wip-doc-2023-03-04-backport-50375-to-quincy
Anthony D'Atri [Fri, 3 Mar 2023 23:05:15 +0000 (18:05 -0500)]
Merge pull request #50378 from zdover23/wip-doc-2023-03-04-backport-50375-to-quincy

quincy: doc/rgw: refine keycloak.rst

2 years agoMerge pull request #49522 from NitzanMordhai/wip-58315-quincy
Yuri Weinstein [Fri, 3 Mar 2023 22:31:16 +0000 (14:31 -0800)]
Merge pull request #49522 from NitzanMordhai/wip-58315-quincy

quincy: src/valgrind.supp: Adding know leaks unrelated to ceph

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agodoc/rgw: refine keycloak.rst 50378/head
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)

2 years agoqa/workunits/rbd-nbd: work around "rbd feature disable" hang 50159/head
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)

2 years agotest/librbd: add LengthModifiedDiscardJournalAppendEnabled test
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 quincy ]

2 years agolibrbd: Fix local rbd mirror journals growing forever
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 quincy ]
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
  b9a2384cdc43 ("librbd: propagate area down to
  file_to_extents()") not in quincy ]

2 years agoMerge pull request #50292 from idryomov/wip-58833-quincy
Yuri Weinstein [Fri, 3 Mar 2023 16:26:07 +0000 (08:26 -0800)]
Merge pull request #50292 from idryomov/wip-58833-quincy

quincy: librbd: call apply_changes() after setting librados_thread_count

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #50266 from idryomov/wip-58755-quincy
Yuri Weinstein [Fri, 3 Mar 2023 16:24:31 +0000 (08:24 -0800)]
Merge pull request #50266 from idryomov/wip-58755-quincy

quincy: rbd-mirror: add information about the last snapshot sync to image status

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2 years agoMerge pull request #50367 from zdover23/wip-doc-2023-03-03-backport-50364-to-quincy
Anthony D'Atri [Fri, 3 Mar 2023 15:56:20 +0000 (10:56 -0500)]
Merge pull request #50367 from zdover23/wip-doc-2023-03-03-backport-50364-to-quincy

quincy: doc/cephadm: Redd up compatibility.rst

2 years agomgr/cephadm: fix extra container/entrypoint args with spaces 49851/head
Adam King [Mon, 9 Jan 2023 19:50:12 +0000 (14:50 -0500)]
mgr/cephadm: fix extra container/entrypoint args with spaces

Fixes: https://tracker.ceph.com/issues/57338
Prior, doing extra container args like

- "--cpus"
- "2"

would work fine as the two args would be passed separately and
eventually placed in the final podman/docker run command
with a space between them. However, trying to do something like

- "--cpus 2"

instead would fail, as it would be translated to

--extra-container-args=--cpus 2

causing "2" to be considered its own arg, which cephadm
wouldn't know how to handle. Another way this can cause problems
is listed in the linked tracker. Either way, leaving the spaces
in the args was causing problems, and the simplest way to handle
it seems to be to just split on the original arg on the spaces
into multiple args

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit a161381ba816609b5041d2072e7e6cec39eaa753)

2 years agodoc/cephadm: docs for extra entrypoint args
Adam King [Tue, 8 Nov 2022 19:25:13 +0000 (14:25 -0500)]
doc/cephadm: docs for extra entrypoint args

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 8ee799e9cc0800fbedc8d9343aa3207bc9fd429e)

2 years agomgr/cephadm: support for extra entrypoint args
Adam King [Tue, 8 Nov 2022 19:09:05 +0000 (14:09 -0500)]
mgr/cephadm: support for extra entrypoint args

Args specified in the service spec to be added as
args for the entrypoint when we deploy the daemon

Fixes: https://tracker.ceph.com/issues/57944
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit db8e4462c968e1d29b0688efafad3442abb8779c)

Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py

2 years agopython-common: add extra_entrypoint_args to service specs
Adam King [Mon, 7 Nov 2022 21:15:09 +0000 (16:15 -0500)]
python-common: add extra_entrypoint_args to service specs

To allow users to set extra args to be passed to
the entrypoint in the podman/docker run command
built by cephadm

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 98f6a9379e2dccbaf599923644b7aaa7200ded1f)

2 years agoMerge pull request #50144 from guits/wip-58735-quincy
Guillaume Abrioux [Fri, 3 Mar 2023 14:54:15 +0000 (15:54 +0100)]
Merge pull request #50144 from guits/wip-58735-quincy

quincy: ceph-volume: do not raise RuntimeError in util.lsblk

2 years agoMerge pull request #50161 from guits/wip-58785-quincy
Guillaume Abrioux [Fri, 3 Mar 2023 14:53:50 +0000 (15:53 +0100)]
Merge pull request #50161 from guits/wip-58785-quincy

quincy: ceph-volume: legacy_encrypted() shouldn't call lsblk() when device is 'tmpfs'

2 years agoMerge pull request #49865 from adk3798/wip-58176-quincy
Adam King [Fri, 3 Mar 2023 13:37:10 +0000 (08:37 -0500)]
Merge pull request #49865 from adk3798/wip-58176-quincy

quincy: 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>
2 years agodoc/cephadm: Redd up compatibility.rst 50367/head
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)

2 years agoMerge pull request #50362 from zdover23/wip-doc-2023-03-03-backport-50354-to-quincy
Anthony D'Atri [Fri, 3 Mar 2023 06:50:15 +0000 (01:50 -0500)]
Merge pull request #50362 from zdover23/wip-doc-2023-03-03-backport-50354-to-quincy

quincy: doc/rgw: clean zone-sync.svg

2 years agodoc/rgw: clean zone-sync.svg 50362/head
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)

2 years agomgr/cephadm: add ingress support for ssl rgw service 49865/head
Frank Ederveen [Mon, 14 Nov 2022 12:27:45 +0000 (12:27 +0000)]
mgr/cephadm: add ingress support for ssl rgw service

This commit adds support for ssl backend rgw. This allows for full
network encryption.

Fixes: https://tracker.ceph.com/issues/51972
Signed-off-by: Frank Ederveen <frank.ederveen@gmail.com>
(cherry picked from commit ab9d6ea42453225189f3ded8863c00bc55b71189)

2 years agoMerge pull request #49857 from adk3798/wip-58446-quincy
Adam King [Fri, 3 Mar 2023 01:49:25 +0000 (20:49 -0500)]
Merge pull request #49857 from adk3798/wip-58446-quincy

quincy: mgr/cephadm: make logging refresh metadata to debug logs configurable

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #49853 from adk3798/wip-58538-quincy
Adam King [Fri, 3 Mar 2023 01:47:39 +0000 (20:47 -0500)]
Merge pull request #49853 from adk3798/wip-58538-quincy

quincy: mgr/cephadm: increase ingress timeout values

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50356 from zdover23/wip-doc-2023-03-03-backport-50351-to-quincy
Anthony D'Atri [Thu, 2 Mar 2023 23:47:36 +0000 (18:47 -0500)]
Merge pull request #50356 from zdover23/wip-doc-2023-03-03-backport-50351-to-quincy

quincy: doc/radosgw: format admonitions

2 years agoMerge pull request #50090 from mchangir/wip-58599-quincy
Yuri Weinstein [Thu, 2 Mar 2023 22:41:17 +0000 (14:41 -0800)]
Merge pull request #50090 from mchangir/wip-58599-quincy

quincy: mon: disable snap id allocation for fsmap pools

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49957 from dparmar18/wip-58604-quincy
Yuri Weinstein [Thu, 2 Mar 2023 22:40:14 +0000 (14:40 -0800)]
Merge pull request #49957 from dparmar18/wip-58604-quincy

quincy: qa/fs/mixed-clients: specify distros for tests

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49942 from lxbsz/wip-58602
Yuri Weinstein [Thu, 2 Mar 2023 22:39:23 +0000 (14:39 -0800)]
Merge pull request #49942 from lxbsz/wip-58602

quincy: ceph_fuse: retry the test_dentry_handling if fails

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49939 from lxbsz/wip-58609
Yuri Weinstein [Thu, 2 Mar 2023 22:38:30 +0000 (14:38 -0800)]
Merge pull request #49939 from lxbsz/wip-58609

quincy: mds: fix and skip submitting invalid osd request

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49655 from dparmar18/wip-58253-quincy
Yuri Weinstein [Thu, 2 Mar 2023 22:37:48 +0000 (14:37 -0800)]
Merge pull request #49655 from dparmar18/wip-58253-quincy

quincy: mds/PurgeQueue: don't consider filer_max_purge_ops when _calculate_ops

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49654 from dparmar18/wip-58348-quincy
Yuri Weinstein [Thu, 2 Mar 2023 22:36:22 +0000 (14:36 -0800)]
Merge pull request #49654 from dparmar18/wip-58348-quincy

quincy: mgr/nfs: handle bad cluster name during info command

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #50151 from neesingh-rh/wip-57970-quincy
Yuri Weinstein [Thu, 2 Mar 2023 22:31:23 +0000 (14:31 -0800)]
Merge pull request #50151 from neesingh-rh/wip-57970-quincy

quincy: cephfs-top: addition of sort feature and limit option

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2 years agoMerge pull request #49863 from adk3798/wip-58197-quincy
Guillaume Abrioux [Thu, 2 Mar 2023 20:43:20 +0000 (21:43 +0100)]
Merge pull request #49863 from adk3798/wip-58197-quincy

quincy: mgr/cephadm: save host cache data after scheduling daemon action

2 years agodoc/radosgw: format admonitions 50356/head
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)

2 years agoMerge pull request #49284 from adk3798/wip-58147-quincy
Adam King [Thu, 2 Mar 2023 17:56:55 +0000 (12:56 -0500)]
Merge pull request #49284 from adk3798/wip-58147-quincy

quincy: mgr/cephadm: some master -> main cleanup

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #50336 from zdover23/wip-doc-2023-03-02-backport-50335-to-quincy
zdover23 [Thu, 2 Mar 2023 04:00:10 +0000 (14:00 +1000)]
Merge pull request #50336 from zdover23/wip-doc-2023-03-02-backport-50335-to-quincy

quincy: doc/cephadm: update cephadm compatability and stability page

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/cephadm: update cephadm compatability and stability page 50336/head
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)

2 years agoMerge pull request #50331 from zdover23/wip-doc-2023-03-02-backport-50316-to-quincy
Anthony D'Atri [Wed, 1 Mar 2023 18:39:12 +0000 (13:39 -0500)]
Merge pull request #50331 from zdover23/wip-doc-2023-03-02-backport-50316-to-quincy

quincy: doc/rgw: improve diagram caption

2 years agodoc/rgw: improve diagram caption 50331/head
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)

2 years agoMerge pull request #50241 from cbodley/wip-58768
Yuri Weinstein [Wed, 1 Mar 2023 16:02:00 +0000 (08:02 -0800)]
Merge pull request #50241 from cbodley/wip-58768

quincy: cls/rgw: remove index entry after cancelling last racing delete op

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #50240 from cbodley/wip-58772
Yuri Weinstein [Wed, 1 Mar 2023 16:00:11 +0000 (08:00 -0800)]
Merge pull request #50240 from cbodley/wip-58772

quincy: rgw: Fix segfault due to concurrent socket use at timeout

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #50239 from cbodley/wip-58770
Yuri Weinstein [Wed, 1 Mar 2023 15:57:21 +0000 (07:57 -0800)]
Merge pull request #50239 from cbodley/wip-58770

quincy: rgw/beast: StreamIO remembers connection errors for graceful shutdown

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49689 from joscollin/wip-58409-quincy
Anthony D'Atri [Tue, 28 Feb 2023 15:14:22 +0000 (10:14 -0500)]
Merge pull request #49689 from joscollin/wip-58409-quincy

quincy: doc: document the relevance of mds_namespace mount option

2 years agoMerge pull request #50304 from idryomov/wip-qa-workunits-windows-ownership-quincy
Ilya Dryomov [Tue, 28 Feb 2023 14:59:21 +0000 (15:59 +0100)]
Merge pull request #50304 from idryomov/wip-qa-workunits-windows-ownership-quincy

quincy: CODEOWNERS: assign qa/workunits/windows to RBD

Reviewed-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
2 years agoCODEOWNERS: assign qa/workunits/windows to RBD 50304/head
Ilya Dryomov [Thu, 23 Feb 2023 13:07:46 +0000 (14:07 +0100)]
CODEOWNERS: assign qa/workunits/windows to RBD

Assume ownership of qa/workunits/windows.  Despite the generic name,
currently it has just rbd-wnbd tests.

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

2 years agoMerge pull request #50297 from zdover23/wip-doc-2023-02-28-backport-50295-to-quincy
Anthony D'Atri [Tue, 28 Feb 2023 12:54:52 +0000 (07:54 -0500)]
Merge pull request #50297 from zdover23/wip-doc-2023-02-28-backport-50295-to-quincy

quincy: doc/radosgw: s/zone group/zonegroup/g et alia

2 years agoMerge pull request #50231 from rhcs-dashboard/node-14-quincy
Nizamudeen A [Tue, 28 Feb 2023 08:13:29 +0000 (13:43 +0530)]
Merge pull request #50231 from rhcs-dashboard/node-14-quincy

quincy: cmake: bump node version to 14

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2 years agodoc/radosgw: s/zone group/zonegroup/g et alia 50297/head
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)

2 years agoMerge pull request #50293 from zdover23/wip-doc-2023-02-28-backport-50276-to-quincy
Anthony D'Atri [Tue, 28 Feb 2023 06:03:37 +0000 (01:03 -0500)]
Merge pull request #50293 from zdover23/wip-doc-2023-02-28-backport-50276-to-quincy

quincy: doc/rgw: caption a diagram

2 years agodoc/rgw: caption a diagram 50293/head
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)

2 years agoMerge pull request #49883 from petrutlucian94/quincy_rbd_wnbd_test
Yuri Weinstein [Mon, 27 Feb 2023 21:50:18 +0000 (13:50 -0800)]
Merge pull request #49883 from petrutlucian94/quincy_rbd_wnbd_test

quincy: qa/workunits/windows: backport rbd-wnbd tests

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #50287 from zdover23/wip-doc-2023-02-28-backport-50274-to-quincy
Anthony D'Atri [Mon, 27 Feb 2023 19:45:35 +0000 (14:45 -0500)]
Merge pull request #50287 from zdover23/wip-doc-2023-02-28-backport-50274-to-quincy

quincy: doc/rgw: remove "tertiary", link to procedure

2 years agoMerge pull request #49856 from adk3798/wip-58447-quincy
Adam King [Mon, 27 Feb 2023 19:30:32 +0000 (14:30 -0500)]
Merge pull request #49856 from adk3798/wip-58447-quincy

quincy: mgr/cephadm: improve offline host handling, mostly around upgrade

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #49862 from adk3798/wip-58201-quincy
Adam King [Mon, 27 Feb 2023 19:29:13 +0000 (14:29 -0500)]
Merge pull request #49862 from adk3798/wip-58201-quincy

quincy: mgr/cephadm: specify ports for iscsi

Reviewed-by: Teoman ONAY <tonay@ibm.com>
2 years agolibrbd: call apply_changes() after setting librados_thread_count 50292/head
Ilya Dryomov [Wed, 22 Feb 2023 18:02:18 +0000 (19:02 +0100)]
librbd: call apply_changes() after setting librados_thread_count

Otherwise the setting doesn't take effect.  While at it, replace
home-grown stringify() with standard to_string().

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

2 years agoMerge pull request #50277 from zdover23/wip-doc-2023-02-27-backport-50264-to-quincy
zdover23 [Mon, 27 Feb 2023 18:31:07 +0000 (04:31 +1000)]
Merge pull request #50277 from zdover23/wip-doc-2023-02-27-backport-50264-to-quincy

quincy: doc/radosgw: multisite - edit "functional changes"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rgw: remove "tertiary", link to procedure 50287/head
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)

2 years agoMerge pull request #50271 from zdover23/wip-doc-2023-02-27-backport-50267-to-quincy
Anthony D'Atri [Mon, 27 Feb 2023 13:31:29 +0000 (08:31 -0500)]
Merge pull request #50271 from zdover23/wip-doc-2023-02-27-backport-50267-to-quincy

quincy: doc/glossary: Add "zone" to glossary.rst

2 years agoMerge pull request #50234 from rhcs-dashboard/wip-58830-quincy
Nizamudeen A [Mon, 27 Feb 2023 12:37:18 +0000 (18:07 +0530)]
Merge pull request #50234 from rhcs-dashboard/wip-58830-quincy

quincy: mgr/dashboard: fix constraints.txt

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2 years agodoc/radosgw: multisite - edit "functional changes" 50277/head
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)

2 years agodoc/glossary: Add "zone" to glossary.rst 50271/head
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)

2 years agomgr/dashboard: fix constraints.txt again 50234/head
Ernesto Puerta [Thu, 23 Feb 2023 16:22:10 +0000 (17:22 +0100)]
mgr/dashboard: fix constraints.txt again

The previous attempt to fix this issue
(https://github.com/ceph/ceph/pull/50207) was not successful, since the
PIP syntax for compatible versions (~=) behaves differently compared to
other package management tools (e.g.: npm).

In this case, package~=x.y.z equasl to package>=x.y.z;package==x.y.*,
instead of the desired package>=x.y.z;package==x.*.

Fixes: tracker.ceph.com/issues/58827
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 1c7fb66856d14a02bf9d4935c7e6bd1832bb3aae)

2 years agorbd-mirror: add information about the last snapshot sync to image status 50266/head
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)

2 years agoMerge pull request #50262 from zdover23/wip-doc-2023-02-27-backport-50260-to-quincy
Anthony D'Atri [Sun, 26 Feb 2023 16:53:41 +0000 (11:53 -0500)]
Merge pull request #50262 from zdover23/wip-doc-2023-02-27-backport-50260-to-quincy

quincy: doc/glossary: add "client" to glossary

2 years agodoc/glossary: add "client" to glossary 50262/head
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)

2 years agoMerge pull request #50258 from zdover23/wip-doc-2023-02-26-backport-50257-to-quincy
zdover23 [Sat, 25 Feb 2023 20:16:23 +0000 (06:16 +1000)]
Merge pull request #50258 from zdover23/wip-doc-2023-02-26-backport-50257-to-quincy

quincy: doc/glossary: add "application" to the glossary

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/glossary: add "application" to the glossary 50258/head
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)

2 years agoMerge pull request #48452 from lxbsz/wip-57837
Yuri Weinstein [Sat, 25 Feb 2023 16:44:47 +0000 (08:44 -0800)]
Merge pull request #48452 from lxbsz/wip-57837

quincy: mds: wait unlink to finish to avoid conflict when creating same entries

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2 years agoMerge pull request #50254 from zdover23/wip-doc-2023-02-24-backport-50250-to-quincy
zdover23 [Sat, 25 Feb 2023 10:13:49 +0000 (20:13 +1000)]
Merge pull request #50254 from zdover23/wip-doc-2023-02-24-backport-50250-to-quincy

quincy: doc/cephadm/host-management: add service spec link

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge pull request #50209 from cfsnyder/wip-57965-quincy-backport
Anthony D'Atri [Fri, 24 Feb 2023 16:32:18 +0000 (11:32 -0500)]
Merge pull request #50209 from cfsnyder/wip-57965-quincy-backport

quincy: rgw: add 'inline_data' zone placement info option

2 years agoMerge pull request #50252 from zdover23/wip-doc-2023-02-24-backport-50179-to-quincy
colemitchell [Fri, 24 Feb 2023 16:01:18 +0000 (11:01 -0500)]
Merge pull request #50252 from zdover23/wip-doc-2023-02-24-backport-50179-to-quincy

quincy: doc/cephfs: describe conf opt "client quota df" in quota doc

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agorgw: add 'inline_data' zone placement info option 50209/head
Cory Snyder [Wed, 2 Nov 2022 20:06:23 +0000 (20:06 +0000)]
rgw: add 'inline_data' zone placement info option

Adds a new RGW zone placement info option to control whether
an object's first data chunk is placed in the head object.
This allows admins to make a tradeoff between optimizing for
PUT/GET performance vs. DELETE performance for some cluster
configurations.

Fixes: https://tracker.ceph.com/issues/57965
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit 9052ca420f003af4b89b568c50bd5083333d3010)

Conflicts:
src/rgw/rgw_zone.cc
src/rgw/rgw_zone_types.h

Cherry-pick notes:
- Conflicts due to rgw_zone_types.h moving to rgw_zone.h

2 years agodoc/cephadm/host-management: add service spec link 50254/head
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)

2 years agodoc/cephfs: describe conf opt "client quota df" in quota doc 50252/head
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)

2 years agoMerge pull request #50247 from zdover23/wip-doc-2023-02-24-backport-50246-to-quincy
Anthony D'Atri [Fri, 24 Feb 2023 02:53:58 +0000 (21:53 -0500)]
Merge pull request #50247 from zdover23/wip-doc-2023-02-24-backport-50246-to-quincy

quincy: doc/glossary: add AWS/OpenStack bucket info

2 years agodoc/glossary: add AWS/OpenStack bucket info 50247/head
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)

2 years agotest/cls/rgw: test that index entry is removed after racing deletes 50241/head
Casey Bodley [Thu, 9 Feb 2023 18:45:10 +0000 (13:45 -0500)]
test/cls/rgw: test that index entry is removed after racing deletes

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 5ddde6eb3d6a9e387b904fa4986bfb8e2ccbef7a)

2 years agocls/rgw: remove index entry after cancelling last racing delete op
Casey Bodley [Wed, 8 Feb 2023 19:01:29 +0000 (14:01 -0500)]
cls/rgw: remove index entry after cancelling last racing delete op

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 08efcc2536c34935a516bf850a9f909c0a3b3f52)

Conflicts:
src/cls/rgw/cls_rgw.cc CLS_LOG_BITX() -> CLS_LOG()

2 years agorgw: Fix segfault due to concurrent socket use at timeout 50240/head
Yixin Jin [Wed, 15 Feb 2023 17:08:19 +0000 (17:08 +0000)]
rgw: Fix segfault due to concurrent socket use at timeout

This commit fixes a potential segfault risk when
rgw timeout handler works on the socket in one
thread while it is concurrently used by another.
The details of the fix are:

1. Instead of calling socket close(), which resets
descriptor_data in boost::asio socket and risks
segfault due to concurrent use of the socket,
the timeout handler now calls cancel() to abort
all pending ops followed by shutdown() to disable
the underlying transport. The eventual closure of
the socket will be done in the socket destructor.

2. Expose the actual boost::asio socket via get_socket()
from Connection so that the timeout handler can call
cancel() and shutdown() on it, although the socket data
member is already accessible. It allows future expansion
that wants to hide the socket even though it renders the
existing close() less useful.

Fixes: https://tracker.ceph.com/issues/58670
Signed-off-by: Yixin Jin <yjin77@yahoo.ca>
(cherry picked from commit 6d5988cbdab48705414e311217c61d3c798085d8)

2 years agorgw/beast: StreamIO remembers connection errors for graceful shutdown 50239/head
Casey Bodley [Wed, 8 Feb 2023 17:58:10 +0000 (12:58 -0500)]
rgw/beast: StreamIO remembers connection errors for graceful shutdown

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 525899d4608203ea4236a816a78cf871cadceea6)

2 years agoMerge pull request #50184 from cbodley/wip-58118
Yuri Weinstein [Thu, 23 Feb 2023 18:48:12 +0000 (10:48 -0800)]
Merge pull request #50184 from cbodley/wip-58118

quincy: rgw: default-initialize delete_multi_obj_op_meta

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49902 from ifed01/wip-ifed-fix-cls-queue-list-qui
Yuri Weinstein [Thu, 23 Feb 2023 18:47:43 +0000 (10:47 -0800)]
Merge pull request #49902 from ifed01/wip-ifed-fix-cls-queue-list-qui

quincy: cls/queue: use larger read chunks in queue_list_entries

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49840 from k0ste/wip-58554-quincy
Yuri Weinstein [Thu, 23 Feb 2023 18:47:07 +0000 (10:47 -0800)]
Merge pull request #49840 from k0ste/wip-58554-quincy

quincy: rgw/beast: fix interaction between keepalive and 100-continue

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49794 from dang/wip-58509-quincy
Yuri Weinstein [Thu, 23 Feb 2023 18:46:28 +0000 (10:46 -0800)]
Merge pull request #49794 from dang/wip-58509-quincy

quincy: Fix chown to unlink

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49775 from liangmingyuanneo/wip-rgw-backport-49636-to-quincy
Yuri Weinstein [Thu, 23 Feb 2023 18:45:26 +0000 (10:45 -0800)]
Merge pull request #49775 from liangmingyuanneo/wip-rgw-backport-49636-to-quincy

quincy: rgw: remove guard_reshard in bucket_index_read_olh_log

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49404 from lxbsz/wip-58251
Yuri Weinstein [Thu, 23 Feb 2023 18:22:33 +0000 (10:22 -0800)]
Merge pull request #49404 from lxbsz/wip-58251

quincy: mount: fix mount failure with old kernels

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agoMerge pull request #49092 from cfsnyder/wip-54496-quincy
Yuri Weinstein [Thu, 23 Feb 2023 18:21:35 +0000 (10:21 -0800)]
Merge pull request #49092 from cfsnyder/wip-54496-quincy

quincy: rgw: prevent spurious/lost notifications in the index completion thread

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2 years agoMerge pull request #49090 from cfsnyder/wip-54157-quincy
Yuri Weinstein [Thu, 23 Feb 2023 18:20:46 +0000 (10:20 -0800)]
Merge pull request #49090 from cfsnyder/wip-54157-quincy

quincy: rgw: "reshard cancel" errors with "invalid argument"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #48845 from nkshirsagar/wip-58006-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:33:37 +0000 (08:33 -0800)]
Merge pull request #48845 from nkshirsagar/wip-58006-quincy

quincy: mon: bail from handle_command() if _generate_command_map() fails

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #49967 from vshankar/tr-57729
Yuri Weinstein [Thu, 23 Feb 2023 16:32:52 +0000 (08:32 -0800)]
Merge pull request #49967 from vshankar/tr-57729

quincy: pybind/mgr: check for empty metadata mgr_module:get_metadata()

Reviewed-by: Jos Collin <jcollin@redhat.com>
2 years agoMerge pull request #49831 from tserong/wip-58534-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:32:15 +0000 (08:32 -0800)]
Merge pull request #49831 from tserong/wip-58534-quincy

quincy: ceph.spec.in: Replace %usrmerged macro with regular version check

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #48719 from idryomov/gcc-13-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:30:58 +0000 (08:30 -0800)]
Merge pull request #48719 from idryomov/gcc-13-quincy

quincy: common: fix build with GCC 13 (missing <cstdint> include)

Reviewed-by: Ramana Raja <rraja@redhat.com>
2 years agoMerge pull request #48222 from mchangir/wip-55749-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:30:27 +0000 (08:30 -0800)]
Merge pull request #48222 from mchangir/wip-55749-quincy

quincy: mgr/snap_schedule: remove subvol interface

Reviewed-by: Jos Collin <jcollin@redhat.com>
2 years agoMerge pull request #48028 from tserong/wip-57391-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:29:35 +0000 (08:29 -0800)]
Merge pull request #48028 from tserong/wip-57391-quincy

quincy: ceph-dencoder: Add erasure_code to denc-mod-osd's target_link_libraries

Reviewed-by: Kefu Chai <kchai@redhat.com>
2 years agoMerge pull request #48466 from neesingh-rh/wip-57849-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:22:49 +0000 (08:22 -0800)]
Merge pull request #48466 from neesingh-rh/wip-57849-quincy

quincy: mgr/volumes: Add human-readable flag to volume info command

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #48252 from dparmar18/wip-57666-quincy
Yuri Weinstein [Thu, 23 Feb 2023 16:19:52 +0000 (08:19 -0800)]
Merge pull request #48252 from dparmar18/wip-57666-quincy

quincy: mds/Server: Do not abort MDS on unknown messages

Reviewed-by: Jos Collin <jcollin@redhat.com>
2 years agomgr/dashboard: fix constraints.txt
Ernesto Puerta [Wed, 22 Feb 2023 10:31:47 +0000 (11:31 +0100)]
mgr/dashboard: fix constraints.txt

Replaces strict version matching with compatible version syntax.

Reference: https://peps.python.org/pep-0440/#version-specifiers

Fixes: https://tracker.ceph.com/issues/58827
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit d5f8927a5cd4bfd9870f02fea1c66b32191d1fba)