]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agoMerge pull request #51851 from Matan-B/wip-matanb-cmake-allocator-status
Samuel Just [Thu, 1 Jun 2023 19:56:18 +0000 (12:56 -0700)]
Merge pull request #51851 from Matan-B/wip-matanb-cmake-allocator-status

CMakeLists.txt: increase verbosity for selected allocator

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>
2 years agoMerge pull request #51176 from linuxbox2/wip-fix-rgwfile-ver
Casey Bodley [Thu, 1 Jun 2023 14:25:32 +0000 (10:25 -0400)]
Merge pull request #51176 from linuxbox2/wip-fix-rgwfile-ver

rgw/file: advance rgw_file interface version

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2 years agoMerge pull request #51857 from zdover23/wip-doc-2023-05-31-cephadm-48180-cleanup...
zdover23 [Thu, 1 Jun 2023 11:24:10 +0000 (19:24 +0800)]
Merge pull request #51857 from zdover23/wip-doc-2023-05-31-cephadm-48180-cleanup-1-of-x

doc: make instructions to get an updated cephadm common

Reviewed-by : Adam King <adking@redhat.com>

2 years agoMerge pull request #51844 from rhcs-dashboard/fix-qa-failure-orch
Nizamudeen A [Thu, 1 Jun 2023 06:29:23 +0000 (11:59 +0530)]
Merge pull request #51844 from rhcs-dashboard/fix-qa-failure-orch

mgr/dashboard: fix test_dashboard_e2e.sh failure

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agoMerge pull request #51347 from adk3798/maint-host-no-write
Adam King [Wed, 31 May 2023 23:52:20 +0000 (19:52 -0400)]
Merge pull request #51347 from adk3798/maint-host-no-write

mgr/cephadm: also don't write client files/tuned profiles to maintenance hosts

Reviewed-by: Michael Fritch <mfritch@suse.com>
2 years agoMerge pull request #51701 from rkachach/fix_issue_61361
Adam King [Wed, 31 May 2023 18:25:49 +0000 (14:25 -0400)]
Merge pull request #51701 from rkachach/fix_issue_61361

cephadm: delete /tmp/cephadm-<fsid> when removing the cluster

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51660 from rkachach/fix_issue_61330
Adam King [Wed, 31 May 2023 18:18:31 +0000 (14:18 -0400)]
Merge pull request #51660 from rkachach/fix_issue_61330

cephadm: Adding support to configure public_network cfg section

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #50805 from rkachach/fix_issue_59254
Adam King [Wed, 31 May 2023 18:06:06 +0000 (14:06 -0400)]
Merge pull request #50805 from rkachach/fix_issue_59254

mgr/cephadm: show meaningful messages when failing to execute cmds

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #51816 from AliMasarweh/wip-alimasa-admin-delete-persistent-topic
Yuval Lifshitz [Wed, 31 May 2023 18:01:02 +0000 (21:01 +0300)]
Merge pull request #51816 from AliMasarweh/wip-alimasa-admin-delete-persistent-topic

RGW:notifications: persistent topics are not deleted via radosgw-admin

2 years agoMerge pull request #50614 from phlogistonjohn/jjm-nfs-haproxy-cfg
Adam King [Wed, 31 May 2023 18:00:13 +0000 (14:00 -0400)]
Merge pull request #50614 from phlogistonjohn/jjm-nfs-haproxy-cfg

mgr/cephadm: add support for nfs with haproxy protocol

Reviewed-by: Adam King <adking@redhat.com>
2 years agoMerge pull request #51859 from zdover23/wip-doc-2023-05-31-cephadm-48180-cleanup...
Anthony D'Atri [Wed, 31 May 2023 16:48:27 +0000 (12:48 -0400)]
Merge pull request #51859 from zdover23/wip-doc-2023-05-31-cephadm-48180-cleanup-2-of-x

doc: add instructions for compiling cephadm

2 years agodoc: add instructions for compiling cephadm 51859/head
John Mulligan [Mon, 22 May 2023 18:20:19 +0000 (14:20 -0400)]
doc: add instructions for compiling cephadm

Now that cephadm is based on zipapp, add a short section to the
developer docs explaining how to build cephadm yourself.

Note: This commit is a cherry-pick of
9ad38033cc5c7f177cb8fe3bae696682687e0346, which was introduced by John
Mulligan in #48180. This is one of three commits introduced in that PR,
and this cherry-pick cleans up omissions I (Zac Dover) inadvertently
introduced while attempting to rectify the merge conflicts in #51843. I
expect that one more cherry-picked commit (specifically,
d11cf0e82aab8d4cef9d423e5d463a373eaf383a, which cannot be merged easily
until d7921e88d69b4bc355da9c0327cc33e59e7d7abb has been merged into
main, for reasons that are too
Rick-and-Morty-there-should-never-be-more-than-one-dot to go into here)
will follow this one.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 9ad38033cc5c7f177cb8fe3bae696682687e0346)

2 years agodoc: make instructions to get an updated cephadm common 51857/head
John Mulligan [Wed, 24 May 2023 17:42:26 +0000 (13:42 -0400)]
doc: make instructions to get an updated cephadm common

As discussed in person and over the ceph orch weekly, we want all users
to use a recent supported version of cephadm. Previously, the
instructions only had those downloading cephadm with curl using the
"add-repo" and "install" commands to get a up-to-date cephadm build.
According to ADK we've seen cases of users get "old" distro packages
in the past. Change the instructions so that the "update cephadm" steps
are common after acquiring a "bootstrap copy" of cephadm.

Note: This commit is a cherry-pick of
d7921e88d69b4bc355da9c0327cc33e59e7d7abb, which was introduced by John
Mulligan in https://github.com/ceph/ceph/pull/48180. This is one of
three commits introduced in that PR, and this cherry-pick cleans up
omissions I (Zac Dover) inadvertently introduced while attempting to
rectify the merge conflicts in https://github.com/ceph/ceph/pull/51843.
I expect that two more cherry-picked commits will follow this one.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit d7921e88d69b4bc355da9c0327cc33e59e7d7abb)

2 years agoMerge pull request #51828 from petrutlucian94/it_decrement_issue
Ilya Dryomov [Wed, 31 May 2023 13:07:12 +0000 (15:07 +0200)]
Merge pull request #51828 from petrutlucian94/it_decrement_issue

librbd: avoid decrementing iterator before first element

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agoMerge pull request #51814 from idryomov/wip-61382
Ilya Dryomov [Wed, 31 May 2023 13:05:16 +0000 (15:05 +0200)]
Merge pull request #51814 from idryomov/wip-61382

osd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoRGW:notifications: persistent topics are not deleted via radosgw-admin 51816/head
Ali Masarwa [Mon, 29 May 2023 14:40:15 +0000 (17:40 +0300)]
RGW:notifications: persistent topics are not deleted via radosgw-admin

Signed-off-by: Ali Masarwa <ali.saed.masarwa@gmail.com>
2 years agoCMakeLists.txt: increase verbosity for selected allocator 51851/head
Matan Breizman [Wed, 31 May 2023 11:06:16 +0000 (11:06 +0000)]
CMakeLists.txt: increase verbosity for selected allocator

Unless the allocator was set on command line, we will select one based on the following order:
```
"specify memory allocator to use. currently tcmalloc, tcmalloc_minimal, \
jemalloc, and libc is supported. if not specified, will try to find tcmalloc, \
and then jemalloc. If neither of then is found. use the one in libc.")
```
with this change, cmake will explicitly message the compiler selected,
otherwise we have no option to identify the one which is being used.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
2 years agoMerge pull request #51810 from yuvalif/wip-yuval-fix-61477
Yuval Lifshitz [Wed, 31 May 2023 08:48:42 +0000 (11:48 +0300)]
Merge pull request #51810 from yuvalif/wip-yuval-fix-61477

test/rgw/notifications: fix kafka consumer shutdown issue

2 years agomgr/dashboard: fix test_dashboard_e2e.sh failure 51844/head
Nizamudeen A [Wed, 31 May 2023 05:39:25 +0000 (11:09 +0530)]
mgr/dashboard: fix test_dashboard_e2e.sh failure

The qa e2e is failing because the script is not adapted with cypress 10.

Fixes: https://tracker.ceph.com/issues/61519
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51843 from zdover23/wip-doc-2023-05-31-compiled-cephadm
colemitchell [Tue, 30 May 2023 23:43:26 +0000 (19:43 -0400)]
Merge pull request #51843 from zdover23/wip-doc-2023-05-31-compiled-cephadm

doc: update the cephadm download instructions

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
2 years agoMerge pull request #51380 from Matan-B/wip-matanb-c-last-sent-epoch
Samuel Just [Tue, 30 May 2023 23:04:43 +0000 (16:04 -0700)]
Merge pull request #51380 from Matan-B/wip-matanb-c-last-sent-epoch

crimson/osd/heartbeat: Improve maybe_share_osdmap behavior

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>
2 years agodoc: update the cephadm download instructions 51843/head
John Mulligan [Mon, 19 Sep 2022 17:46:48 +0000 (13:46 -0400)]
doc: update the cephadm download instructions

Starting with reef, cephadm is a compiled (zipapp) python application.
The cephadm script has been renamed and thus the old curl-based
download instructions will no loner work. While cephadm still has
no dependencies outside the Python stdlib, this will be changed in
future versions so it is no longer appropriate to just download the
source file of cephadm and run it either.

This change updates the `Install cephadm` section of the doc to explain
how to acquire a "compiled" version of cephadm as well as:
* moving and tweaking the note that the two installation methods are
  distinct
* adding a new note linking to instructions on building cephadm
* moving the distribution-specific installations before the curl-based
  installation to subtly hint that we prefer you to get it using
  packages if you can
* Noting cephadm's minimal required python verision and how to run it
  with a particular python version.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit d11cf0e82aab8d4cef9d423e5d463a373eaf383a)

doc: make instructions to get an updated cephadm common

As discussed in person and over the ceph orch weekly, we want all users
to use a recent supported version of cephadm. Previously, the
instructions only had those downloading cephadm with curl using the
"add-repo" and "install" commands to get a up-to-date cephadm build.
According to ADK we've seen cases of users get "old" distro packages
in the past. Change the instructions so that the "update cephadm" steps
are common after acquiring a "bootstrap copy" of cephadm.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit d7921e88d69b4bc355da9c0327cc33e59e7d7abb)

2 years agoMerge pull request #48180 from phlogistonjohn/jjm-cephadm-compile-doc
zdover23 [Tue, 30 May 2023 22:44:53 +0000 (06:44 +0800)]
Merge pull request #48180 from phlogistonjohn/jjm-cephadm-compile-doc

doc: Updates to doc for compiled cephadm

Reviewed-by: Zac Dover <zac.dover@proton.me>
2 years agoMerge pull request #51475 from aravind-wdc/wip-crimson-zbd
Samuel Just [Tue, 30 May 2023 20:43:23 +0000 (13:43 -0700)]
Merge pull request #51475 from aravind-wdc/wip-crimson-zbd

crimson/os/seastore: fix ceph_assert in segment_manager.h

Reviewed-by: chunmei-liu <chunmei.liu@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agoMerge pull request #51765 from pdvian/wip-fix-versions
Yuri Weinstein [Tue, 30 May 2023 19:23:40 +0000 (15:23 -0400)]
Merge pull request #51765 from pdvian/wip-fix-versions

mon: Fix ceph versions command

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #51838 from cbodley/wip-doc-rgw-reshard-feature-reef
Anthony D'Atri [Tue, 30 May 2023 16:43:38 +0000 (12:43 -0400)]
Merge pull request #51838 from cbodley/wip-doc-rgw-reshard-feature-reef

doc/rgw: fix multisite resharding feature to say Reef instead of Quincy

2 years agoMerge pull request #51818 from idryomov/wip-61495
Ilya Dryomov [Tue, 30 May 2023 16:36:01 +0000 (18:36 +0200)]
Merge pull request #51818 from idryomov/wip-61495

Revert "test: adjust rbd test case guards to handle new defaults"

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agodoc: make instructions to get an updated cephadm common 48180/head
John Mulligan [Wed, 24 May 2023 17:42:26 +0000 (13:42 -0400)]
doc: make instructions to get an updated cephadm common

As discussed in person and over the ceph orch weekly, we want all users
to use a recent supported version of cephadm. Previously, the
instructions only had those downloading cephadm with curl using the
"add-repo" and "install" commands to get a up-to-date cephadm build.
According to ADK we've seen cases of users get "old" distro packages
in the past. Change the instructions so that the "update cephadm" steps
are common after acquiring a "bootstrap copy" of cephadm.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agodoc: update the cephadm download instructions
John Mulligan [Mon, 19 Sep 2022 17:46:48 +0000 (13:46 -0400)]
doc: update the cephadm download instructions

Starting with reef, cephadm is a compiled (zipapp) python application.
The cephadm script has been renamed and thus the old curl-based
download instructions will no loner work. While cephadm still has
no dependencies outside the Python stdlib, this will be changed in
future versions so it is no longer appropriate to just download the
source file of cephadm and run it either.

This change updates the `Install cephadm` section of the doc to explain
how to acquire a "compiled" version of cephadm as well as:
* moving and tweaking the note that the two installation methods are
  distinct
* adding a new note linking to instructions on building cephadm
* moving the distribution-specific installations before the curl-based
  installation to subtly hint that we prefer you to get it using
  packages if you can
* Noting cephadm's minimal required python verision and how to run it
  with a particular python version.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agodoc: add instructions for compiling cephadm
John Mulligan [Mon, 22 May 2023 18:20:19 +0000 (14:20 -0400)]
doc: add instructions for compiling cephadm

Now that cephadm is based on zipapp, add a short section to the
developer docs explaining how to build cephadm yourself.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agodoc/rgw: fix multisite resharding feature to say Reef instead of Quincy 51838/head
Casey Bodley [Tue, 30 May 2023 15:30:05 +0000 (11:30 -0400)]
doc/rgw: fix multisite resharding feature to say Reef instead of Quincy

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51763 from dang/wip-dang-61251
Daniel Gryniewicz [Tue, 30 May 2023 12:14:48 +0000 (08:14 -0400)]
Merge pull request #51763 from dang/wip-dang-61251

RGW - Use correct multipart upload mtime

2 years agolibrbd: avoid decrementing iterator before first element 51828/head
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>
2 years agoMerge pull request #51798 from zdover23/wip-doc-2023-05-29-rados-operations-balancer
zdover23 [Tue, 30 May 2023 07:34:58 +0000 (15:34 +0800)]
Merge pull request #51798 from zdover23/wip-doc-2023-05-29-rados-operations-balancer

doc/rados: edit balancer.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #51750 from zhscn/fix-scan-order
Yingxin [Tue, 30 May 2023 01:45:02 +0000 (09:45 +0800)]
Merge pull request #51750 from zhscn/fix-scan-order

crimson/os/seastore/backref_manager: scan backref entries by journal seq

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2 years agoRevert "test: adjust rbd test case guards to handle new defaults" 51818/head
Ilya Dryomov [Mon, 29 May 2023 15:40:05 +0000 (17:40 +0200)]
Revert "test: adjust rbd test case guards to handle new defaults"

This reverts commit feb2fc02404775bc262677a2d0434faec0348c53 which
appears to have caused us to lose old format coverage in the Python
bindings tests (rbd_python_api_tests_old_format.yaml).

Unset RBD_FEATURES enviroment variable means "old format".  This
shouldn't be mucked with in any way, see require_new_format() and
create_image() methods in particular.

Fixes: https://tracker.ceph.com/issues/61495
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2 years agoMerge pull request #51748 from rhcs-dashboard/rgw-roles-fix
Nizamudeen A [Mon, 29 May 2023 14:13:45 +0000 (19:43 +0530)]
Merge pull request #51748 from rhcs-dashboard/rgw-roles-fix

mgr/dashboard: fix the rgw roles page

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2 years agodoc/rados: edit balancer.rst 51798/head
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>
2 years agoosd/OSDCap: allow rbd.metadata_list method under rbd-read-only profile 51814/head
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>
2 years agoMerge pull request #51408 from AliMasarweh/wip-alimasa-topics-op-by-bucket
Ali Masarwa [Mon, 29 May 2023 12:41:04 +0000 (15:41 +0300)]
Merge pull request #51408 from AliMasarweh/wip-alimasa-topics-op-by-bucket

RGW: add admin interfaces to get and delete notifications by bucket

2 years agotest/rgw/notifications: fix kafka consumer shutdown issue 51810/head
Yuval Lifshitz [Mon, 29 May 2023 11:54:00 +0000 (11:54 +0000)]
test/rgw/notifications: fix kafka consumer shutdown issue

Fixes: https://tracker.ceph.com/issues/61477
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
2 years agoMerge pull request #51396 from rhcs-dashboard/access-landing-page-readonly-users
Nizamudeen A [Mon, 29 May 2023 09:56:07 +0000 (15:26 +0530)]
Merge pull request #51396 from rhcs-dashboard/access-landing-page-readonly-users

mgr/dashboard: fix issues with read-only user on landing page

Reviewed-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: fix issues with read-only user on landing page 51396/head
Pedro Gonzalez Gomez [Mon, 8 May 2023 20:51:40 +0000 (22:51 +0200)]
mgr/dashboard: fix issues with read-only user on landing page

Fixes: https://tracker.ceph.com/issues/61418
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51662 from yuvalif/wip-yuval-61328
Yuval Lifshitz [Sun, 28 May 2023 15:06:38 +0000 (18:06 +0300)]
Merge pull request #51662 from yuvalif/wip-yuval-61328

rgw/notification/kafka: simplify kafka connection memory management

2 years agoMerge pull request #51575 from yuvalif/wip-yuval-fix-61254
Yuval Lifshitz [Sun, 28 May 2023 15:06:08 +0000 (18:06 +0300)]
Merge pull request #51575 from yuvalif/wip-yuval-fix-61254

rgw/kafka: remove potential race condition between creation and deletion of endpoint

2 years agoRGW: add admin interfaces to get and delete notifications from bucket 51408/head
Ali Masarwa [Mon, 8 May 2023 13:55:01 +0000 (16:55 +0300)]
RGW: add admin interfaces to get and delete notifications from bucket

Signed-off-by: Ali Masarwa <ali.saed.masarwa@gmail.com>
2 years agoMerge pull request #51787 from zdover23/wip-doc-2023-05-27-rados-config-bluestore...
zdover23 [Sat, 27 May 2023 22:53:16 +0000 (08:53 +1000)]
Merge pull request #51787 from zdover23/wip-doc-2023-05-27-rados-config-bluestore-config-ref-2-of-x

doc/rados: edit bluestore-config-ref.rst (2 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados: edit bluestore-config-ref.rst (2 of x) 51787/head
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>
2 years agoMerge pull request #51771 from zdover23/wip-doc-2023-05-26-rados-config-bluestore...
zdover23 [Fri, 26 May 2023 21:41:02 +0000 (07:41 +1000)]
Merge pull request #51771 from zdover23/wip-doc-2023-05-26-rados-config-bluestore-config-ref-1-of-x

doc/rados: edit bluestore-config-ref.rst (1 of x)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados: edit bluestore-config-ref.rst (1 of x) 51771/head
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

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
2 years agoRGW - Use correct multipart upload mtime 51763/head
Daniel Gryniewicz [Thu, 25 May 2023 18:09:54 +0000 (14:09 -0400)]
RGW - Use correct multipart upload mtime

During multipart listing, the mtime of the uploads were not being
loaded, resulting in the current time being returned.  Fix this by
setting the correct mtime.

Fixes: https://tracker.ceph.com/issues/61251
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2 years agodoc/cephadm: document haproxy protocol options 50614/head
John Mulligan [Tue, 21 Mar 2023 20:47:35 +0000 (16:47 -0400)]
doc/cephadm: document haproxy protocol options

There are now two ways to run NFS with ingress using haxproxy. This
makes three distinct modes for ingress. Document these.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agoqa/cephadm: teuthology test for nfs ingress-mode=haproxy-protocol
John Mulligan [Tue, 21 Mar 2023 20:20:42 +0000 (16:20 -0400)]
qa/cephadm: teuthology test for nfs ingress-mode=haproxy-protocol

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: add test explicitly validating proxy protocol
John Mulligan [Tue, 21 Mar 2023 19:40:17 +0000 (15:40 -0400)]
mgr/cephadm: add test explicitly validating proxy protocol

Adds a test case that specifically ensures that the proper values
appear in the configuration files for both nfs and haproxy when
the proxy protocol is enabled.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: parametrize test for haproxy protocol support
John Mulligan [Tue, 21 Mar 2023 17:51:48 +0000 (13:51 -0400)]
mgr/cephadm: parametrize test for haproxy protocol support

Make a few small tweaks to an existing test to validate that it
functions similarly when the haxproxy protocol is disabled or enabled.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: minor reorganizing of nfs service test
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: minor reorganizing of nfs service test

This change makes some formatting and organizational changes to one of
the nfs + ingress test cases. This is in preparation for a future change
that will parametrize this function allowing it to test haproxy config
when proxy protocol is enabled and when not.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/nfs: add support for selecting between haproxy ingress modes
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/nfs: add support for selecting between haproxy ingress modes

When the haproxy-standard mode is selected, the haproxy ingress will
behave as in previous versions of ceph. When the haproxy-protocol mode
is selected, we need to enable protocol support on the ingress service
and nfs service.

While were at it, make a few organization tweaks to improve readability.

Fixes: https://tracker.ceph.com/issues/58933
Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: add two new ingress types for haproxy
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: add two new ingress types for haproxy

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: add haproxy hosts to nfs ganesha configuration
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: add haproxy hosts to nfs ganesha configuration

When haproxy protocol support is enabled a list of IP Addresses where
valid haproxy instances can be needs to be supplied to the ganesha server.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: set haxproxy protocol in config when enabled
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: set haxproxy protocol in config when enabled

When the haproxy protocol is enabled at the service level, add the
'send-proxy-v2' option to the haproxy configuration file.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: add enable_haproxy_protocol to ingress and nfs service specs
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: add enable_haproxy_protocol to ingress and nfs service specs

Add a new boolean field, enable_haproxy_protocol, to both the ingress
service spec and the nfs service spec. The ingress service spec needs
the field to tell haproxy to enable proxy protocol (v2) support.
The nfs service spec needs the field to allow the nfs server to accept
proxy protocol messages.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: add optional HAProxy_Hosts field to ganesha conf template
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: add optional HAProxy_Hosts field to ganesha conf template

When NFS-Ganesha is used behind a HAProxy with proxy protocol support
enabled ganesha requires that HAProxy_Hosts is set to a list of hosts
that are permitted to use the proxy protocol. This change adds support
for specifying HAProxy_Hosts in the ganesha configuration file template.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agomgr/cephadm: add support for default server options to template
John Mulligan [Tue, 21 Mar 2023 15:42:25 +0000 (11:42 -0400)]
mgr/cephadm: add support for default server options to template

Add support for default server-options within the haproxy backend
section. This change will later be used to enable haproxy proxy protocol
(v2)  support.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #51747 from rhcs-dashboard/cypress-followups 49676/head
Nizamudeen A [Fri, 26 May 2023 09:08:23 +0000 (14:38 +0530)]
Merge pull request #51747 from rhcs-dashboard/cypress-followups

mgr/dashboard: remove deprecated preserveOnce

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agomon: Fix ceph versions command 51765/head
Prashant D [Thu, 25 May 2023 22:09:02 +0000 (18:09 -0400)]
mon: Fix ceph versions command

The commit-id d3cca1d has introduced a bug where mgr/osd/mds
version information goes missing during the cluster upgrade.
Collect version information before checking the emptiness
of the map.

Fixes: https://tracker.ceph.com/issues/61453
Signed-off-by: Prashant D <pdhange@redhat.com>
2 years agoMerge pull request #51734 from cbodley/wip-61300
Casey Bodley [Thu, 25 May 2023 21:40:48 +0000 (17:40 -0400)]
Merge pull request #51734 from cbodley/wip-61300

rgw: disable RGWDataChangesLog::add_entry() when log_data is off

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2 years agoMerge pull request #51579 from phlogistonjohn/jjm-fix-test_cephadm
Adam King [Thu, 25 May 2023 16:43:18 +0000 (12:43 -0400)]
Merge pull request #51579 from phlogistonjohn/jjm-fix-test_cephadm

cephadm: fix a cephadm test when docker doesn't exist

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
2 years agoMerge pull request #51570 from NitzanMordhai/wip-nitzan-test-mon-thrasher-quorum...
Yuri Weinstein [Thu, 25 May 2023 16:09:18 +0000 (12:09 -0400)]
Merge pull request #51570 from NitzanMordhai/wip-nitzan-test-mon-thrasher-quorum-delay-inc

test: monitor thrasher wait until quorum

Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
2 years agoMerge pull request #51527 from NitzanMordhai/wip-nitzan-thrash-eio-pool-size-correct
Yuri Weinstein [Thu, 25 May 2023 16:08:48 +0000 (12:08 -0400)]
Merge pull request #51527 from NitzanMordhai/wip-nitzan-thrash-eio-pool-size-correct

test: correct osd pool default size

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Matan Breizman <Matan.Brz@gmail.com>
2 years agoMerge pull request #51456 from Svelar/filestore-mon
Yuri Weinstein [Thu, 25 May 2023 16:07:40 +0000 (12:07 -0400)]
Merge pull request #51456 from Svelar/filestore-mon

mon: remove filestore

Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
2 years agoMerge pull request #48999 from tchaikov/wip-nerados-fmt-v9
Yuri Weinstein [Thu, 25 May 2023 16:06:28 +0000 (12:06 -0400)]
Merge pull request #48999 from tchaikov/wip-nerados-fmt-v9

neorados: s/ostream_formatter/fmt::ostream_formatter/

Reviewed-by: Adam Emerson <aemerson@redhat.com>
2 years agomgr/dashboard: add more e2e for cephx users 51748/head
Nizamudeen A [Wed, 24 May 2023 16:45:59 +0000 (22:15 +0530)]
mgr/dashboard: add more e2e for cephx users

Fixes: https://tracker.ceph.com/issues/61421
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51516 from ivancich/wip-integrate-logging-flag
Casey Bodley [Thu, 25 May 2023 15:46:39 +0000 (11:46 -0400)]
Merge pull request #51516 from ivancich/wip-integrate-logging-flag

rgw: multisite data log flag not used

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #50841 from smanjara/fix-duplicate-objects-archive
Casey Bodley [Thu, 25 May 2023 15:46:14 +0000 (11:46 -0400)]
Merge pull request #50841 from smanjara/fix-duplicate-objects-archive

rgw/archive: avoid duplicating objects when syncing from multiple zones

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51219 from smanjara/wip-archive-delete-bucket
Casey Bodley [Thu, 25 May 2023 15:45:49 +0000 (11:45 -0400)]
Merge pull request #51219 from smanjara/wip-archive-delete-bucket

rgw/multisite[archive zone]: fix storing of bucket instance info in the new bucket entrypoint

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51233 from smanjara/wip-archive-bucket-metadata
Casey Bodley [Thu, 25 May 2023 15:45:36 +0000 (11:45 -0400)]
Merge pull request #51233 from smanjara/wip-archive-bucket-metadata

rgw/multisite[archive zone]: remove bucket metadata modification during object sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51280 from tcoldrick-bb/multisite-dencoder-types
Casey Bodley [Thu, 25 May 2023 15:45:14 +0000 (11:45 -0400)]
Merge pull request #51280 from tcoldrick-bb/multisite-dencoder-types

rgw: Add log types to dencoder

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #51497 from mkogan1/wip-rgw-bulk
Casey Bodley [Thu, 25 May 2023 15:44:59 +0000 (11:44 -0400)]
Merge pull request #51497 from mkogan1/wip-rgw-bulk

rgw: set bulk pool flag when creating data pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #50876 from rishabh-d-dave/qa-ceph-man-get-keyring
Yuri Weinstein [Thu, 25 May 2023 14:49:53 +0000 (10:49 -0400)]
Merge pull request #50876 from rishabh-d-dave/qa-ceph-man-get-keyring

qa/ceph_manager: preserve newline char at EOF in keyring

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
2 years agoMerge pull request #50312 from rishabh-d-dave/ceph-caps-improvements
Yuri Weinstein [Thu, 25 May 2023 14:49:11 +0000 (10:49 -0400)]
Merge pull request #50312 from rishabh-d-dave/ceph-caps-improvements

mon, osd: set subsystem prefix for logging MonCap and OSDCap

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2 years agoMerge pull request #51004 from rishabh-d-dave/authmon-invalid-caps
Yuri Weinstein [Thu, 25 May 2023 14:48:18 +0000 (10:48 -0400)]
Merge pull request #51004 from rishabh-d-dave/authmon-invalid-caps

mon/AuthMonitor: log when parsing caps fails

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoMerge PR #50875 into main
Patrick Donnelly [Thu, 25 May 2023 12:25:34 +0000 (08:25 -0400)]
Merge PR #50875 into main

* refs/pull/50875/head:
mon/MDSMonitor: ignore extraneous up:boot messages
qa: add test case for mds sending multiple boot messages
qa: support checking for a log message that should not exist

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
2 years agoMerge pull request #51749 from chenyuanrun/fix_dencoder_trash_watcher
Ilya Dryomov [Thu, 25 May 2023 11:16:00 +0000 (13:16 +0200)]
Merge pull request #51749 from chenyuanrun/fix_dencoder_trash_watcher

tools/ceph-dencoder: Fix incorrect type define for trash_watcher

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2 years agoMerge pull request #51754 from zdover23/wip-doc-2023-05-25-rados-configuration-common...
Anthony D'Atri [Thu, 25 May 2023 10:00:04 +0000 (06:00 -0400)]
Merge pull request #51754 from zdover23/wip-doc-2023-05-25-rados-configuration-common-link-fix

doc/rados: fix link in common.rst

2 years agomgr/dashboard: fix the rgw roles page
Nizamudeen A [Wed, 24 May 2023 16:44:24 +0000 (22:14 +0530)]
mgr/dashboard: fix the rgw roles page

Fixes: https://tracker.ceph.com/issues/61421
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agodoc/rados: fix link in common.rst 51754/head
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>
2 years agoMerge pull request #51745 from zdover23/wip-doc-2023-05-25-rados-configuration-filest...
zdover23 [Thu, 25 May 2023 08:48:18 +0000 (18:48 +1000)]
Merge pull request #51745 from zdover23/wip-doc-2023-05-25-rados-configuration-filestore-config-ref

doc/rados: edit filestore-config-ref.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agocrimson/os/seastore/backref_manager: scan backref entries by journal seq 51750/head
Zhang Song [Thu, 25 May 2023 08:30:44 +0000 (16:30 +0800)]
crimson/os/seastore/backref_manager: scan backref entries by journal seq

Signed-off-by: Zhang Song <zhangsong325@gmail.com>
2 years agotools/ceph-dencoder: Fix incorrect type define for trash_watcher 51749/head
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
2 years agomgr/dashboard: remove deprecated preserveOnce 51747/head
Nizamudeen A [Thu, 25 May 2023 08:13:12 +0000 (13:43 +0530)]
mgr/dashboard: remove deprecated preserveOnce

cypress is deprecating preserveOnce and instead favoring using
cy.session(). session is already introduced as part of the upgrade to
cypress 10. So removing the preserveOnce here

Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #50037 from rhcs-dashboard/cypress-10
Nizamudeen A [Thu, 25 May 2023 07:57:05 +0000 (13:27 +0530)]
Merge pull request #50037 from rhcs-dashboard/cypress-10

mgr/dashboard: update to cypress 10

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agomgr/dashboard: fix the hosts e2e failure 50037/head
Nizamudeen A [Wed, 24 May 2023 15:05:51 +0000 (20:35 +0530)]
mgr/dashboard: fix the hosts e2e failure

Fixes: https://tracker.ceph.com/issues/61354
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agomgr/dashboard: fix the cephadm grafana e2e failure
Nizamudeen A [Wed, 24 May 2023 08:35:32 +0000 (14:05 +0530)]
mgr/dashboard: fix the cephadm grafana e2e failure

Fixes: https://tracker.ceph.com/issues/61354
Signed-off-by: Nizamudeen A <nia@redhat.com>
2 years agoMerge pull request #51696 from rhcs-dashboard/fix-requirement-test-regression
Nizamudeen A [Thu, 25 May 2023 05:25:21 +0000 (10:55 +0530)]
Merge pull request #51696 from rhcs-dashboard/fix-requirement-test-regression

mgr/dashboard: fix regression caused by -  bcc92adb96d1ab8155d30cb51933b0d07b398cdc

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2 years agodoc/rados: edit filestore-config-ref.rst 51745/head
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>
2 years agoMerge pull request #51730 from anthonyeleven/anthonyeleven/formatting
zdover23 [Wed, 24 May 2023 22:55:51 +0000 (08:55 +1000)]
Merge pull request #51730 from anthonyeleven/anthonyeleven/formatting

doc/rados/operations: Fix erasure-code-jerasure.rst fix

Reviewed-by: Zac Dover <zac.dover@proton.me>
2 years agodoc/rados/operations: Fix erasure-code-jerasure.rst fix 51730/head
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>
2 years agoMerge PR #50501 into main
Patrick Donnelly [Wed, 24 May 2023 21:04:07 +0000 (17:04 -0400)]
Merge PR #50501 into main

* refs/pull/50501/head:
mon/MDSMonitor: do not propose on error in prepare_update

Reviewed-by: Rishabh Dave <ridave@redhat.com>
2 years agoMerge PR #51407 into main
Patrick Donnelly [Wed, 24 May 2023 21:01:03 +0000 (17:01 -0400)]
Merge PR #51407 into main

* refs/pull/51407/head:
mon/MDSMonitor: check fscid in pending exists in current

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2 years agorgw: disable RGWDataChangesLog::add_entry() when log_data is off 51734/head
Casey Bodley [Fri, 11 Mar 2022 00:03:59 +0000 (19:03 -0500)]
rgw: disable RGWDataChangesLog::add_entry() when log_data is off

this restores a check for RGWZone::log_data in add_entry(). with
per-bucket replication, this check was replaced by a call to
`RGWBucketSyncPolicyHandler::bucket_exports_data()`

this call has to consult two rados objects,
`bucket.sync-source-hints.<bucketname>` and
`bucket.sync-target-hints.<bucketname>`

but if the zone is not configured for multisite, we should avoid these
extra object reads and return early

Fixes: https://tracker.ceph.com/issues/61300
Signed-off-by: Casey Bodley <cbodley@redhat.com>