]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 months agoqa: Wait for mirror daemon restart before getting new rados_inst 58621/head
Jos Collin [Thu, 14 Mar 2024 14:42:46 +0000 (20:12 +0530)]
qa: Wait for mirror daemon restart before getting new rados_inst

After blocklisted/failed, wait for the mirror daemon restart
which is after 30 seconds timeout and then check for the new rados_inst.

Fixes: https://tracker.ceph.com/issues/64927
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit a9a56919ff95d2face436da2ca08fd26580fadb9)

12 months agocephfs_mirror: Fixed negative seconds
Jos Collin [Thu, 30 May 2024 10:18:08 +0000 (15:48 +0530)]
cephfs_mirror: Fixed negative seconds

Fixes: https://tracker.ceph.com/issues/64927
Fixes: https://tracker.ceph.com/issues/51964
Fixes: https://tracker.ceph.com/issues/63931
Fixes: https://tracker.ceph.com/issues/63089
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 96c3f8f33d789a065c7ed418679afd53faffa3d8)

12 months agocephfs_mirror: Add ErrorListener to maintain blocklisted/failed timestamp in FSMirror
Jos Collin [Tue, 28 May 2024 14:57:55 +0000 (20:27 +0530)]
cephfs_mirror: Add ErrorListener to maintain blocklisted/failed timestamp in FSMirror

Have FSMirror register a listener with InstanceWatcher/MirrorWatcher which would get invoked when the mirror daemon is blocklisted or failed.
Thus FSMirror can maintain the last blocklisted/failed timestamp and use that for restarting the mirror daemon.

Fixes: https://tracker.ceph.com/issues/64927
Fixes: https://tracker.ceph.com/issues/51964
Fixes: https://tracker.ceph.com/issues/63931
Fixes: https://tracker.ceph.com/issues/63089
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 77ec7bfde7a349b0e06b34ecdf328996c7642d43)

12 months agoMerge pull request #57678 from batrick/wip-66188-squid
Xiubo Li [Wed, 17 Jul 2024 07:29:50 +0000 (15:29 +0800)]
Merge pull request #57678 from batrick/wip-66188-squid

squid: mds: use regular dispatch for processing metrics

12 months agoMerge pull request #58476 from rhcs-dashboard/wip-66872-squid
Avan [Wed, 17 Jul 2024 06:04:07 +0000 (11:34 +0530)]
Merge pull request #58476 from rhcs-dashboard/wip-66872-squid

squid: mgr/dashboard: nfs export enhancement for CEPHFS

Reviewed-by: afreen23 <NOT@FOUND>
12 months agoMerge pull request #58593 from rhcs-dashboard/wip-66785-squid
Pedro Gonzalez Gomez [Tue, 16 Jul 2024 18:10:24 +0000 (20:10 +0200)]
Merge pull request #58593 from rhcs-dashboard/wip-66785-squid

squid: mgr/dashboard: add RGW lifecycle management

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
12 months agomgr/dashboard: nfs export enhancement for CEPHFS 58476/head
Avan Thakkar [Thu, 27 Jun 2024 10:06:42 +0000 (15:36 +0530)]
mgr/dashboard: nfs export enhancement for CEPHFS

Fixes: https://tracker.ceph.com/issues/66718
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 69a45db9c3cc9ed4ac36e7f2d6db78bd7940530b)

12 months agoMerge pull request #58553 from adk3798/squid-cephadm-cert-store
Adam King [Tue, 16 Jul 2024 12:16:38 +0000 (08:16 -0400)]
Merge pull request #58553 from adk3798/squid-cephadm-cert-store

squid: mgr/cephadm: Cert Store + use secure_channel for grpc requests

Reviewed-by: Nizamudeen A <nia@redhat.com>
12 months agoMerge pull request #58347 from idryomov/wip-66570-squid
Ilya Dryomov [Tue, 16 Jul 2024 06:59:43 +0000 (08:59 +0200)]
Merge pull request #58347 from idryomov/wip-66570-squid

squid: librbd: make diff-iterate in fast-diff mode aware of encryption

Reviewed-by: Ramana Raja <rraja@redhat.com>
12 months agoMerge pull request #57610 from vshankar/wip-65988-squid
Xiubo Li [Tue, 16 Jul 2024 01:29:49 +0000 (09:29 +0800)]
Merge pull request #57610 from vshankar/wip-65988-squid

squid: qa: ignore cluster warnings generated from forward-scrub task

12 months agoMerge pull request #57918 from batrick/wip-66386-squid
Xiubo Li [Tue, 16 Jul 2024 01:28:07 +0000 (09:28 +0800)]
Merge pull request #57918 from batrick/wip-66386-squid

squid: qa: disable mon_warn_on_pool_no_app in fs suite

12 months agoMerge pull request #57922 from batrick/wip-66385-squid
Xiubo Li [Tue, 16 Jul 2024 01:27:42 +0000 (09:27 +0800)]
Merge pull request #57922 from batrick/wip-66385-squid

squid: qa: correct json lookup for new `lock path` output

12 months agoMerge pull request #58155 from vshankar/wip-66325-squid
Xiubo Li [Tue, 16 Jul 2024 01:26:54 +0000 (09:26 +0800)]
Merge pull request #58155 from vshankar/wip-66325-squid

squid: qa: enable debug logs for fs:cephadm:multivolume subsuite

12 months agoMerge pull request #58233 from batrick/wip-66593-squid
Xiubo Li [Tue, 16 Jul 2024 01:26:21 +0000 (09:26 +0800)]
Merge pull request #58233 from batrick/wip-66593-squid

squid: tools/cephfs: recover alternate_name of dentries from journal

12 months agoMerge pull request #58237 from batrick/wip-66619-squid
Xiubo Li [Tue, 16 Jul 2024 01:25:43 +0000 (09:25 +0800)]
Merge pull request #58237 from batrick/wip-66619-squid

squid: mds: initialize epoch for quiescedb

12 months agoMerge pull request #58252 from joscollin/wip-66674-squid
Xiubo Li [Tue, 16 Jul 2024 01:23:59 +0000 (09:23 +0800)]
Merge pull request #58252 from joscollin/wip-66674-squid

squid: qa: enhance per-client labelled perf counters test

12 months agoMerge pull request #58294 from batrick/wip-66623-squid
Xiubo Li [Tue, 16 Jul 2024 01:23:30 +0000 (09:23 +0800)]
Merge pull request #58294 from batrick/wip-66623-squid

squid: mds: do remove the cap when seqs equal or larger than last issue

12 months agoMerge pull request #58317 from batrick/wip-66585-squid
Xiubo Li [Tue, 16 Jul 2024 01:22:01 +0000 (09:22 +0800)]
Merge pull request #58317 from batrick/wip-66585-squid

squid: mds: QuiesceDbManager: mark next retry event during bootstrap

12 months agoMerge pull request #58318 from batrick/wip-66572-squid
Xiubo Li [Tue, 16 Jul 2024 01:21:42 +0000 (09:21 +0800)]
Merge pull request #58318 from batrick/wip-66572-squid

squid: mds/quiesce-db: calculate_quiesce_map: aggregate quiesce roots' TTL as `max`

12 months agoMerge pull request #58319 from batrick/wip-66542-squid
Xiubo Li [Tue, 16 Jul 2024 01:19:37 +0000 (09:19 +0800)]
Merge pull request #58319 from batrick/wip-66542-squid

squid: mds: dump formatter even for errors

12 months agolibrbd: make diff-iterate in fast-diff mode aware of encryption 58347/head
Ilya Dryomov [Thu, 20 Jun 2024 19:13:56 +0000 (21:13 +0200)]
librbd: make diff-iterate in fast-diff mode aware of encryption

diff-iterate wasn't updated when librbd was being prepared to support
encryption in commit 8d6a47933269 ("librbd: add crypto image dispatch
layer").  This is even noted in [1]:

> The two places I skipped for now are DiffIterate and TrimRequest.

CryptoImageDispatch has since been removed, but diff-iterate in
fast-diff mode is still unaware of encryption and just assumes that all
offsets are raw.  This means that the callback gets invoked with
incorrect image offsets when encryption is loaded.  For example, for
a LUKS1-formatted image with some data at offsets 0 and 20971520,
diff-iterate with encryption loaded reports

  0~4194304
  4194304~4194304
  25165824~4194304

instead of

  0~4194304
  20971520~4194304

as "exists".  For any piece of code that is using diff-iterate to
optimize block-by-block processing (e.g. copy an encrypted source image
to a differently-encrypted destination image), this is fatal: it would
skip processing block 20971520 which has data and instead process block
25165824 which doesn't have any data and was to be skipped, producing
a corrupted destination image.

[1] https://github.com/ceph/ceph/pull/37935#issue-735278403

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

12 months agotest/librbd: extend DiffIterateTest.DiffIterateDeterministic{,PP}
Ilya Dryomov [Fri, 21 Jun 2024 13:56:27 +0000 (15:56 +0200)]
test/librbd: extend DiffIterateTest.DiffIterateDeterministic{,PP}

Currently we are laying data only at the beginning of an object.
Extend the skeletons to write to three different offsets in the middle
and also at the end of the object.

Separately, make C and C++ API test variants slightly different in
terms of offsets being targeted to not go through exactly the same
scenario twice.

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

12 months agotest/librbd: refactor DiffIterateTest.DiffIterateDeterministic{,PP}
Ilya Dryomov [Fri, 21 Jun 2024 13:53:05 +0000 (15:53 +0200)]
test/librbd: refactor DiffIterateTest.DiffIterateDeterministic{,PP}

In preparation for extending coverage, extract test logic into a couple
of parametrized helpers.

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

12 months agoMerge pull request #58541 from idryomov/wip-66886-squid 57399/head
Yuri Weinstein [Mon, 15 Jul 2024 14:09:42 +0000 (07:09 -0700)]
Merge pull request #58541 from idryomov/wip-66886-squid

squid: qa: account for rbd_trash object in krbd_data_pool.sh + related ceph{,adm} task fixes

Reviewed-by: Ramana Raja <rraja@redhat.com>
12 months agoMerge pull request #58212 from idryomov/wip-66418-squid
Yuri Weinstein [Mon, 15 Jul 2024 14:08:52 +0000 (07:08 -0700)]
Merge pull request #58212 from idryomov/wip-66418-squid

squid: librbd: diff-iterate shouldn't crash on an empty byte range

Reviewed-by: Mykola Golub <mgolub@suse.com>
12 months agoMerge pull request #58206 from idryomov/wip-66300-squid
Yuri Weinstein [Mon, 15 Jul 2024 14:07:51 +0000 (07:07 -0700)]
Merge pull request #58206 from idryomov/wip-66300-squid

squid: librbd: disallow group snap rollback if memberships don't match

Reviewed-by: Ramana Raja <rraja@redhat.com>
12 months agoMerge pull request #58575 from zdover23/wip-doc-2024-07-14-backport-58451-to-squid
Zac Dover [Mon, 15 Jul 2024 13:21:05 +0000 (23:21 +1000)]
Merge pull request #58575 from zdover23/wip-doc-2024-07-14-backport-58451-to-squid

squid: doc/dev: edit "Principles for format change"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
12 months agoMerge pull request #58385 from smanjara/wip-squid-pr-56874
Casey Bodley [Mon, 15 Jul 2024 13:14:10 +0000 (14:14 +0100)]
Merge pull request #58385 from smanjara/wip-squid-pr-56874

[squid] qa/multisite: stabilize multisite testing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
12 months agomgr/dashboard: add RGW lifecycle management 58593/head
Pedro Gonzalez Gomez [Thu, 2 May 2024 14:37:38 +0000 (16:37 +0200)]
mgr/dashboard: add RGW lifecycle management

Fixes: https://tracker.ceph.com/issues/50327
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit b54efd44e8d72d9b56fe4c69a96d53934de1df2a)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts

12 months agoMerge pull request #58578 from zdover23/wip-doc-2024-07-15-backport-58574-to-squid
Anthony D'Atri [Sun, 14 Jul 2024 17:22:24 +0000 (13:22 -0400)]
Merge pull request #58578 from zdover23/wip-doc-2024-07-15-backport-58574-to-squid

squid: doc/cephfs: edit "is mount helper present"

12 months agoMerge pull request #58001 from amathuria/wip-66421-squid
Yuri Weinstein [Sun, 14 Jul 2024 14:25:07 +0000 (07:25 -0700)]
Merge pull request #58001 from amathuria/wip-66421-squid

squid: osd/scrub: Change scrub cost to average object size

Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
12 months agoMerge pull request #57618 from sajibreadd/wip-66143-squid
Yuri Weinstein [Sun, 14 Jul 2024 14:23:25 +0000 (07:23 -0700)]
Merge pull request #57618 from sajibreadd/wip-66143-squid

squid: osd: CEPH_OSD_OP_FLAG_BYPASS_CLEAN_CACHE flag is passed from ECBackend

Reviewed-by: Samuel Just <sjust@redhat.com>
12 months agoMerge pull request #57195 from k0ste/wip-64591-squid
Yuri Weinstein [Sun, 14 Jul 2024 14:21:54 +0000 (07:21 -0700)]
Merge pull request #57195 from k0ste/wip-64591-squid

squid: os/bluestore: fix the problem of l_bluefs_log_compactions double recording

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
12 months agodoc/cephfs: edit "is mount helper present" 58578/head
Zac Dover [Sun, 14 Jul 2024 06:40:14 +0000 (16:40 +1000)]
doc/cephfs: edit "is mount helper present"

Edit the section called "Is mount helper present?", the title of which
prior to this commit was "Is mount helper is present?". Other small
disambiguating improvements have been made to the text in the section.
An unselectable prompt has been added before a command.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 0ebfb3eda8e2fc88662530bbddc84f2efcc4e13c)

12 months agodoc/dev: edit "Principles for format change" 58575/head
Zac Dover [Sun, 7 Jul 2024 03:59:15 +0000 (13:59 +1000)]
doc/dev: edit "Principles for format change"

Improve "Principles for format change" in doc/dev/encoding.rst. This
commit started as a response to Anthony D'Atri's suggestion here: https://github.com/ceph/ceph/pull/58299/files#r1656985564

Review of this section suggested to me that certain minor English usage
improvements would be of benefit. The numbered lists in this section
could still be made a bit clearer.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 570797e5588b67b8c72e5297b61f84d9aa48dc45)

12 months agoMerge pull request #58071 from yuvalif/wip-66497-squid
Casey Bodley [Sat, 13 Jul 2024 16:15:04 +0000 (17:15 +0100)]
Merge pull request #58071 from yuvalif/wip-66497-squid

squid: rgw/admin/notification: add command to dump notifications

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
12 months agoMerge pull request #58538 from cbodley/wip-66913-squid
Casey Bodley [Sat, 13 Jul 2024 16:14:24 +0000 (17:14 +0100)]
Merge pull request #58538 from cbodley/wip-66913-squid

squid: rgw/datalog: fix LazyFIFO race fix

Reviewed-by: Adam Emerson <aemerson@redhat.com>
12 months agoMerge pull request #58545 from smanjara/wip-66919-squid
Casey Bodley [Sat, 13 Jul 2024 16:13:49 +0000 (17:13 +0100)]
Merge pull request #58545 from smanjara/wip-66919-squid

squid: rgw/multisite: allow PutACL replication.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
12 months agoMerge pull request #58550 from idryomov/wip-test-cookie-squid
Ilya Dryomov [Fri, 12 Jul 2024 16:16:44 +0000 (18:16 +0200)]
Merge pull request #58550 from idryomov/wip-test-cookie-squid

squid: test/librbd: clean up unused TEST_COOKIE variable

Reviewed-by: Ramana Raja <rraja@redhat.com>
12 months agoMerge pull request #58477 from afreen23/wip-backport-nvmeof-service
Pedro Gonzalez Gomez [Fri, 12 Jul 2024 14:17:19 +0000 (16:17 +0200)]
Merge pull request #58477 from afreen23/wip-backport-nvmeof-service

Batch backport of nvmeof service configuration

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
12 months agomgr/dashboard: fall back to server_cert 58553/head
Nizamudeen A [Mon, 27 May 2024 04:35:21 +0000 (10:05 +0530)]
mgr/dashboard: fall back to server_cert

if root_ca is not found

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0a393ca9bde714524da369caaef1c097472f791c)
(cherry picked from commit 5a89eae68c1b4004832a6c2dfe3f1f54fd72c3a1)

12 months agomgr/cephadm: create OrchSecretNotFound exception type
Adam King [Mon, 8 Jul 2024 21:08:00 +0000 (17:08 -0400)]
mgr/cephadm: create OrchSecretNotFound exception type

This exception type is made to handle the formatting
of errors where we try to find a cert/key in the
cert/key store and can't

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

12 months agomgr/dashboard: use secure_channel for grpc requests
Nizamudeen A [Mon, 27 May 2024 04:35:21 +0000 (10:05 +0530)]
mgr/dashboard: use secure_channel for grpc requests

Store the certificates to config-key stores and then later on used by
dashboard to set-up the secure_channel for grpc nvmeof requests

By storing the certificates we can ensure that the dashboard nvmeof apis
will be configurable even if the deployments are not cephadm based

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0a393ca9bde714524da369caaef1c097472f791c)
(cherry picked from commit ebcb198894347d1a21ab4cd81fea985aca454b29)

Conflicts:
src/pybind/mgr/dashboard/services/orchestrator.py

12 months agomgr/cephadm: fix nvmeof conf unit test
Adam King [Wed, 3 Jul 2024 20:22:32 +0000 (16:22 -0400)]
mgr/cephadm: fix nvmeof conf unit test

This needed changes to reflect changes made
to the conf to not have the certs stored at a
relative path and the addition of the root ca
cert

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

12 months agomgr/cephadm: add get cert/key commands
Adam King [Wed, 3 Jul 2024 19:55:12 +0000 (15:55 -0400)]
mgr/cephadm: add get cert/key commands

In order to be able to grab certs/keys stored
in the new CertKeyStore class

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

12 months agomgr/cephadm: integrate nvmeof spec certs/keys into cert/key store
Adam King [Wed, 3 Jul 2024 19:27:03 +0000 (15:27 -0400)]
mgr/cephadm: integrate nvmeof spec certs/keys into cert/key store

Now that we're taking actual certs/keys in the spec, they
should go into the cert/key store with the others

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

12 months agopython-common/service_spec: add root_ca_cert to nvmeof spec
Adam King [Wed, 3 Jul 2024 18:54:47 +0000 (14:54 -0400)]
python-common/service_spec: add root_ca_cert to nvmeof spec

Also improves the error messaging around when spec/key
attributes are missing when enable_auth is set to true

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

12 months agomgr/cephadm: allow passing client/server cert/key in nvmeof spec
Adam King [Thu, 23 May 2024 16:54:25 +0000 (12:54 -0400)]
mgr/cephadm: allow passing client/server cert/key in nvmeof spec

Before this patch the client/server cert/key fields were
just filepaths that told the nvmeof gw daemon where to look
for the cert/key. There's not much reason why users would
care where in the nvmeof gw container the cert goes. It's more
useful to use these fields as a way to pass the certs/keys
to the daemon and then just hardcode where in the container
we'll place the certs/keys

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

12 months agomgr/cephadm: add migration for certs/keys to cert store
Adam King [Fri, 14 Jun 2024 15:51:54 +0000 (11:51 -0400)]
mgr/cephadm: add migration for certs/keys to cert store

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

12 months agomgr/cephadm: move ingress cert to cert store
Adam King [Thu, 8 Feb 2024 13:23:37 +0000 (08:23 -0500)]
mgr/cephadm: move ingress cert to cert store

In an effort to try and organize our cert handling
and provide cert management features in the future

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

12 months agomgr/cephadm: store iscsi cert and key in cert store
Adam King [Wed, 7 Feb 2024 20:51:56 +0000 (15:51 -0500)]
mgr/cephadm: store iscsi cert and key in cert store

In an effort to organize our handling of certs and
offer cert management functionality in the future

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

12 months agomgr/cephadm: move rgw frontend ssl cert to cert store
Adam King [Wed, 7 Feb 2024 16:45:56 +0000 (11:45 -0500)]
mgr/cephadm: move rgw frontend ssl cert to cert store

In an effort to organize our certs and in the future
add cert management features.

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

12 months agomgr/cephadm: move node-exporter cert/key to cert store
Adam King [Tue, 6 Feb 2024 01:07:15 +0000 (20:07 -0500)]
mgr/cephadm: move node-exporter cert/key to cert store

We weren't storing this before, but we want to
add some cert management stuff later, so it's
good to start doing so

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

12 months agomgr/cephadm: move prometheus daemon cert to cert store
Adam King [Tue, 6 Feb 2024 00:56:46 +0000 (19:56 -0500)]
mgr/cephadm: move prometheus daemon cert to cert store

We weren't storing this before, but since we want to
add more options for cert management, it's good to start
doing so

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

12 months agomgr/cephadm: move alertmanager crt/key to cert store
Adam King [Tue, 6 Feb 2024 00:18:00 +0000 (19:18 -0500)]
mgr/cephadm: move alertmanager crt/key to cert store

We weren't actually even storing these before, but
given we want to be able to offer some more cert
management options in the future, it's good to start
doing so

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

12 months agomgr/cephadm: add cert-store ls commands
Adam King [Wed, 31 Jan 2024 15:15:00 +0000 (10:15 -0500)]
mgr/cephadm: add cert-store ls commands

To see what certs cephadm has stored in
its internal cert store

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

12 months agomgr/cephadm: move grafana cert/key to cert/key store
Adam King [Tue, 30 Jan 2024 13:56:17 +0000 (08:56 -0500)]
mgr/cephadm: move grafana cert/key to cert/key store

In an effort to try and better track what certs/keys
we manage with cephadm

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

12 months agomgr/cephadm: move agent endpoint root cert/key to cert store
Adam King [Tue, 23 Jan 2024 22:35:44 +0000 (17:35 -0500)]
mgr/cephadm: move agent endpoint root cert/key to cert store

Trying to move all certs/keys cephadm manages to
a central location

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

12 months agomgr/cephadm: move service discovery cert/key to cert store
Adam King [Tue, 23 Jan 2024 14:57:30 +0000 (09:57 -0500)]
mgr/cephadm: move service discovery cert/key to cert store

Trying to move all of the certs/keys cephadm manages
into one place.

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

12 months agomgr/cephadm: add a Cert/Key tracking/storage class
Adam King [Mon, 22 Jan 2024 17:37:19 +0000 (12:37 -0500)]
mgr/cephadm: add a Cert/Key tracking/storage class

The idea is to move storage/handling of certs from any misc.
spot in the mgr/cephadm codebase into a single class. This will
make it much easier to do things with the certs we have in
the future.

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

12 months agoMerge pull request #58521 from cbodley/wip-66897-squid
Casey Bodley [Fri, 12 Jul 2024 12:52:41 +0000 (13:52 +0100)]
Merge pull request #58521 from cbodley/wip-66897-squid

squid: install-deps.sh, do_cmake.sh: almalinux is another el flavour

Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Reviewed-by: Dan van der Ster <dan.vanderster@clyso.com>
12 months agotest/ librbd: clean up unused 'TEST_COOKIE' 58550/head
Rongqi Sun [Tue, 9 Jul 2024 02:55:27 +0000 (02:55 +0000)]
test/ librbd: clean up unused 'TEST_COOKIE'

Clean them up because
```
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/test/librbd/exclusive_lock/test_mock_PreAcquireRequest.cc:47:26: error: unused variable 'TEST_COOKIE' [-Werror,-Wunused-const-variable]
static const std::string TEST_COOKIE("auto 123");
                         ^
1 error generated.
```

Ref: https://jenkins.ceph.com/job/ceph-pull-requests-arm64/59242/consoleFull#-5120798632a811ea2-3e7b-466b-84b4-d13df7e35809

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
(cherry picked from commit 49869222c816023f696ff2a42898e2d9f3f54215)

12 months agoqa/multisite: add object set acl test 58545/head
Shilpa Jagannath [Wed, 27 Mar 2024 06:14:44 +0000 (02:14 -0400)]
qa/multisite: add object set acl test

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit d18b722557af8fc082d578547fa7be07a8ffc49e)

12 months agorgw/multisite: allow modified object acls to be replicated
Shilpa Jagannath [Tue, 19 Mar 2024 14:59:35 +0000 (10:59 -0400)]
rgw/multisite: allow modified object acls to be replicated

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit f5f6194c07b40c50913e956e06aaa3709d4d53aa)

12 months agoMerge pull request #58479 from afreen23/wip-backport-nfs
Pedro Gonzalez Gomez [Thu, 11 Jul 2024 15:27:53 +0000 (17:27 +0200)]
Merge pull request #58479 from afreen23/wip-backport-nfs

Batch backport NFS route separation for cephfs and rgw

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
12 months agoqa/tasks/cephadm: drop --cluster and sudo in create_rbd_pool() 58541/head
Ilya Dryomov [Wed, 10 Jul 2024 09:53:05 +0000 (11:53 +0200)]
qa/tasks/cephadm: drop --cluster and sudo in create_rbd_pool()

The cluster (name) is already specified in the arguments passed to
_shell() and this command doesn't need privileges.

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

12 months agoqa/tasks/cephadm: don't wait for OSDs in create_rbd_pool()
Ilya Dryomov [Wed, 10 Jul 2024 09:02:47 +0000 (11:02 +0200)]
qa/tasks/cephadm: don't wait for OSDs in create_rbd_pool()

This fails because teuthology.wait_until_osds_up() wants to use
adjust-ulimits wrapper which isn't available in "cephadm shell"
environment.  The whole thing is also redundant because cephadm task
is supposed to wait for OSDs to come up earlier, in ceph_osds().

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

12 months agoqa/tasks: initialize rbd pool instead of just tagging it
Ilya Dryomov [Wed, 10 Jul 2024 07:10:02 +0000 (09:10 +0200)]
qa/tasks: initialize rbd pool instead of just tagging it

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

12 months agoqa: krbd_data_pool.sh: account for rbd_trash object
Ilya Dryomov [Wed, 10 Jul 2024 07:10:02 +0000 (09:10 +0200)]
qa: krbd_data_pool.sh: account for rbd_trash object

... created since commit 0bcb5cfce9a2 ("librbd/image: create rbd_trash
object during RBD pool initialization").

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

12 months agorgw/datalog: fix LazyFIFO race fix 58538/head
Casey Bodley [Tue, 9 Jul 2024 21:40:03 +0000 (17:40 -0400)]
rgw/datalog: fix LazyFIFO race fix

initialize `fifo_tmp` to prevent the race on member variable `fifo` that
was identified in 8fa844383f9c22e758f39ecdda74f70de054ad68

Fixes: https://tracker.ceph.com/issues/66880
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 5dfbaac15f0ffb3dfe84ae304643d1cf4eee892d)

12 months agoMerge pull request #58255 from rhcs-dashboard/wip-66254-squid
Pedro Gonzalez Gomez [Thu, 11 Jul 2024 09:06:51 +0000 (11:06 +0200)]
Merge pull request #58255 from rhcs-dashboard/wip-66254-squid

squid: mgr/dashboard: rgw bucket replication management

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
12 months agoMerge pull request #58244 from rhcs-dashboard/wip-66425-squid
Pedro Gonzalez Gomez [Thu, 11 Jul 2024 07:49:34 +0000 (09:49 +0200)]
Merge pull request #58244 from rhcs-dashboard/wip-66425-squid

squid: mgr/dashboard: fix edit bucket failing in other selected gateways

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: nmunet <NOT@FOUND>
12 months agoMerge pull request #58337 from rhcs-dashboard/wip-66737-squid
Nizamudeen A [Thu, 11 Jul 2024 07:08:31 +0000 (12:38 +0530)]
Merge pull request #58337 from rhcs-dashboard/wip-66737-squid

squid: mgr/dashboard: fix clone async validators with different groups

Reviewed-by: nmunet <NOT@FOUND>
12 months agoMerge pull request #58436 from cbodley/wip-66839-squid
Casey Bodley [Wed, 10 Jul 2024 23:18:35 +0000 (00:18 +0100)]
Merge pull request #58436 from cbodley/wip-66839-squid

squid: doc/rgw: update s3 authentication

Reviewed-by: Zac Dover <zac.dover@proton.me>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
12 months agoinstall-deps.sh, do_cmake.sh: almalinux is another el flavour 58521/head
Dan van der Ster [Thu, 5 Oct 2023 16:50:36 +0000 (09:50 -0700)]
install-deps.sh, do_cmake.sh: almalinux is another el flavour

Signed-off-by: Dan van der Ster <dan.vanderster@clyso.com>
(cherry picked from commit 6e85f76385c3cffd860a8a3054bf14ce85a43b59)

12 months agoMerge pull request #57971 from adk3798/squid-adjust-bootstrap-config-priorities
Adam King [Wed, 10 Jul 2024 15:23:29 +0000 (11:23 -0400)]
Merge pull request #57971 from adk3798/squid-adjust-bootstrap-config-priorities

squid: cephadm: the user config is preferred during the bootstrap

Reviewed-by: John Mulligan <jmulligan@redhat.com>
12 months agomgr/dashboard: fix nav urls for cephfs and nfs 58479/head
Nizamudeen A [Wed, 26 Jun 2024 10:34:31 +0000 (16:04 +0530)]
mgr/dashboard: fix nav urls for cephfs and nfs

Fixes: https://tracker.ceph.com/issues/66697
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit e8d0e76b63079f8d16c470030bda105637e1bb1e)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html

12 months agomgr/dashboard: Fix NFS routing
Afreen [Wed, 3 Apr 2024 02:15:32 +0000 (07:45 +0530)]
mgr/dashboard: Fix NFS routing

Fixes https://tracker.ceph.com/issues/65310

The NFS tab in object and File nav uses same route due to which both
gets activated when one of them is clicked.
Hence, this PR separates the routing for Object and File nav.
Object-> NFS: /rgw/nfs
File-> NFS: /cephfs/nfs

Both routes use same NFS List and Form component but under different
routes as mentioned above.

Changes summary
- updated route for File from "/fs" to "/cephfs/<any_other_sub_route>"
  to support both fs and nfs tabs. Since using `/fs` and `/fs/nfs` will
activate both paths and it will be an undesirable user experience.
- `getFsalRouteFromPath` helper function to set the storage backend from
  route.
- removed `stoarge-backend` field from nfs form as now route decides teh
  storage backend
- breadcrumbs redirect to respective navs
- updated e2e tests
- updated unit tests
- changes list page of object-> nfs page to say Bucket instead of Path

Signed-off-by: Afreen <afreen23.git@gmail.com>
(cherry picked from commit 97359d6b1ee8133afcddf1f540b147c26723e24e)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html

12 months agomgr/dashboard: fix service form count bugs 58477/head
Afreen Misbah [Sat, 22 Jun 2024 02:18:33 +0000 (07:48 +0530)]
mgr/dashboard: fix service form count bugs

Fixes https://tracker.ceph.com/issues/66608

- for services which do not have a count set default count to be null, otherwise the previous selected service's count is used which is wrong
- make count null when label is selected for placement

Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit 27a8b2f2883fcc1fc4128b3e8995a7819a5ae51e)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html

12 months agomgr/dashboard: fix service page e2e tests
Afreen Misbah [Fri, 14 Jun 2024 05:21:47 +0000 (10:51 +0530)]
mgr/dashboard: fix service page e2e tests

- service page now uses defaults value for the placement count due to which mds test failing
- in test we pass "1" while "2" which is the default count for mds is already populated, making it 21 and causing unable to create mds service

Fixes: https://tracker.ceph.com/issues/66540
Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit 5a718229dc43953f140a16342f19523a1c075863)
(cherry picked from commit 1da0a4f8cb234ef84729c24cc9a82397361e9534)

Conflicts:
src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts
src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts

12 months agomgr/dashboard: Configure NVMe/TCP
Afreen [Fri, 31 May 2024 07:54:27 +0000 (13:24 +0530)]
mgr/dashboard: Configure NVMe/TCP

Fixes https://tracker.ceph.com/issues/63686

- creation of Nvme-oF/TCP service
- deletion of Nvme-oF/TCP service
- edit/update Nvme-oF/TCP service
- added unit tests for Nvme-oF/TCP service
- changed Id -> Service Name
- added prefix of service type in service name (similar to <client.> in
  fs access)
- service name and pool are required fields for nvmeof
- placement count now takes default value as mentioned in cephadm
- slight refactors
- prepopulate serviceId for each service type setServiceId()
- in case serviceId is same as servcie type then do not add create service name with<servicetype>.<setrviceid> format

Signed-off-by: Afreen <afreen23.git@gmail.com>
(cherry picked from commit c6cf91766c45cf766c1d5a3851c2e956a80ac9ee)

12 months agoMerge pull request #58488 from zdover23/wip-doc-2024-07-10-backport-58484-to-squid
Zac Dover [Wed, 10 Jul 2024 00:26:53 +0000 (10:26 +1000)]
Merge pull request #58488 from zdover23/wip-doc-2024-07-10-backport-58484-to-squid

squid: doc: Correct link to "Device management"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
12 months agoMerge pull request #58468 from zdover23/wip-doc-2024-07-09-backport-58454-to-squid
Zac Dover [Wed, 10 Jul 2024 00:26:35 +0000 (10:26 +1000)]
Merge pull request #58468 from zdover23/wip-doc-2024-07-09-backport-58454-to-squid

squid: doc/cephfs: fix typo

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
12 months agodoc: Correct link to "Device management" 58488/head
Matthew Vernon [Tue, 9 Jul 2024 16:02:31 +0000 (17:02 +0100)]
doc: Correct link to "Device management"

The current link goes to `cephadm/services/rados/operations/devices` which is a 404, it instead needs to be `rados/operations/devices/`.

Signed-off-by: Matthew Vernon <mvernon@wikimedia.org>
(cherry picked from commit d1a7cc4978adacd4e11df2d3e0886b191b118cc1)

12 months agoMerge pull request #58443 from cbodley/wip-66847-squid
Casey Bodley [Tue, 9 Jul 2024 17:29:50 +0000 (18:29 +0100)]
Merge pull request #58443 from cbodley/wip-66847-squid

squid: rgw: fix multipart get part when count==1

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
12 months agoMerge pull request #58089 from ronen-fr/wip-rf-57865-squid
Yuri Weinstein [Tue, 9 Jul 2024 14:03:33 +0000 (07:03 -0700)]
Merge pull request #58089 from ronen-fr/wip-rf-57865-squid

squid: osd/scrub: allow new scrubs while reserving

Reviewed-by: Samuel Just <sjust@redhat.com>
12 months agoMerge pull request #57623 from sajibreadd/wip-65937-squid
Yuri Weinstein [Tue, 9 Jul 2024 14:02:26 +0000 (07:02 -0700)]
Merge pull request #57623 from sajibreadd/wip-65937-squid

squid: os/bluestore: set rocksdb iterator bounds for Bluestore::_collection_list()

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
12 months agoMerge pull request #57382 from pdvian/wip-65890-squid
Yuri Weinstein [Tue, 9 Jul 2024 14:00:17 +0000 (07:00 -0700)]
Merge pull request #57382 from pdvian/wip-65890-squid

squid: mgr: integrate optracker in ceph-mgr

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Michael Kidd <linuxkidd@gmail.com>
12 months agoMerge pull request #56200 from ifed01/wip-ifed-fix-64443-squi
Yuri Weinstein [Tue, 9 Jul 2024 13:58:51 +0000 (06:58 -0700)]
Merge pull request #56200 from ifed01/wip-ifed-fix-64443-squi

squid: test/store_test: fix DeferredWrite test when prefer_deferred_size=0

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
12 months agodoc/cephfs: fix typo 58468/head
spdfnet [Mon, 8 Jul 2024 08:03:28 +0000 (09:03 +0100)]
doc/cephfs: fix typo

blanacer -> balancer

Signed-off-by: spdfnet <32593931+spdfnet@users.noreply.github.com>
(cherry picked from commit d94f90b757189e269882523178a401cd4411a946)

12 months agoMerge pull request #58072 from yuvalif/wip-66499-squid
Casey Bodley [Mon, 8 Jul 2024 14:37:18 +0000 (15:37 +0100)]
Merge pull request #58072 from yuvalif/wip-66499-squid

squid: rgw: do not assert on thread name setting failures

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
12 months agoMerge pull request #57784 from yuvalif/wip-66288-squid
Casey Bodley [Mon, 8 Jul 2024 12:58:17 +0000 (13:58 +0100)]
Merge pull request #57784 from yuvalif/wip-66288-squid

squid: rgw/kafka: do not destroy the connection on errors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
12 months agorgw/admin/notification: add command to dump notifications 58071/head
Yuval Lifshitz [Wed, 5 Jun 2024 16:08:16 +0000 (16:08 +0000)]
rgw/admin/notification: add command to dump notifications

command will dump pending notifications from a persistent queue in JSON
format:

radosgw-admin topic dump --topic <name>

Fixes: https://tracker.ceph.com/issues/66404
Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>
(cherry picked from commit e63e663dc9095589f4fe28d541fd5178c033bffd)

Conflicts:
src/rgw/driver/rados/rgw_notify.cc
        src/test/rgw/bucket_notification/test_bn.py

12 months agoMerge pull request #57996 from kchheda3/wip-66443-squid
Casey Bodley [Fri, 5 Jul 2024 16:39:06 +0000 (17:39 +0100)]
Merge pull request #57996 from kchheda3/wip-66443-squid

squid:  rgw/notification: Store the value of `persistent_queue` for existing topics and continue commiting events for all topics subscribed to given bucket

Reviewed-by: Casey Bodley <cbodley@redhat.com>
12 months agorgw: fix multipart get part when count==1 58443/head
Casey Bodley [Wed, 26 Jun 2024 14:52:37 +0000 (10:52 -0400)]
rgw: fix multipart get part when count==1

the RGWObjManifest for multipart uploads is subtly different when
there's only a single part. in that case, get_cur_part_id() for the
final rule returns 1 where it otherwise returns (parts_count + 1)

this caused two problems:
* we returned a parts_count of 0 instead 1, and
* the do-while loop got stuck in an infinite loop expecting the last
  rule's part id to be higher than the requested part id

Fixes: https://tracker.ceph.com/issues/66705
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 562e0ce9baac53e714d91a46b4f0114b82827026)

12 months agoMerge pull request #58420 from guits/wip-66830-squid
Guillaume Abrioux [Fri, 5 Jul 2024 08:11:42 +0000 (10:11 +0200)]
Merge pull request #58420 from guits/wip-66830-squid

squid: qa: fix log errors for cephadm tests

12 months agodoc/rgw: update s3 authentication 58436/head
Casey Bodley [Thu, 4 Jul 2024 19:17:52 +0000 (15:17 -0400)]
doc/rgw: update s3 authentication

authentication.rst described the steps to generate a v2 signature,
without reference to aws docs. replace that with sections that reference
aws docs for v2 and v4 signatures. list which values of the request
header x-amz-content-sha256 are supported for v4

Fixes: https://tracker.ceph.com/issues/42888
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 05cab64b9ce3662f0d3e9673dfbbb5d42906caf7)

12 months agoMerge pull request #58431 from zdover23/wip-doc-2024-07-05-backport-58368-to-squid
Anthony D'Atri [Thu, 4 Jul 2024 20:30:55 +0000 (16:30 -0400)]
Merge pull request #58431 from zdover23/wip-doc-2024-07-05-backport-58368-to-squid

squid: doc/rados: document manually passing search domain

12 months agodoc/rados: document manually passing search domain 58431/head
Zac Dover [Mon, 1 Jul 2024 06:36:02 +0000 (16:36 +1000)]
doc/rados: document manually passing search domain

Document how to manually pass the search domain to "mon_dns_srv_name" in
doc/rados/configuration/mon-lookup-dns.rst.

This commit is made in response to a request by Lander Duncan that was made on the [ceph-users] mailing list, and can be seen here: https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/F7V4CWLIYCAJ4JXI2JLNY6QPCFPR4SLA/

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 98938a0312dd0c8e0b293ed9aa2e0760cc9619fa)

12 months agoMerge pull request #58422 from AliMasarweh/wip-66772-squid
Ali Masarwa [Thu, 4 Jul 2024 13:18:05 +0000 (16:18 +0300)]
Merge pull request #58422 from AliMasarweh/wip-66772-squid

squid: RGW|Bucket notification: reload realm correctly

Reviewed-by: yuvalif<ylifshit@redhat.com>