]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Nizamudeen A [Fri, 19 Jul 2024 12:26:20 +0000 (17:56 +0530)]
Merge pull request #58667 from afreen23/wip-backport-nvmeof
Batch backport for nvme listener, namesapces and regression fix
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Pedro Gonzalez Gomez [Fri, 19 Jul 2024 09:51:32 +0000 (11:51 +0200)]
Merge pull request #58625 from rhcs-dashboard/wip-66982-squid
squid: mgr/dashboard: add fields to EC profile form
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Afreen Misbah [Tue, 16 Jul 2024 07:03:26 +0000 (12:33 +0530)]
mgr/dashboard: Add namespaces views in dashboard
Fixes https://tracker.ceph.com/issues/66990
- list namespaces
- create namespaces
- edit namespaces
- delete namespaces
- update NQN regex
Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit
b45eb5579611b56ee033410a4688984ff468fdcd )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/pipes.module.ts
Afreen Misbah [Wed, 17 Jul 2024 10:16:23 +0000 (15:46 +0530)]
mgr/dashboard: Create and delete listeners
Fixes https://tracker.ceph.com/issues/66996
- list listener under subsystems
- delete listener
- create listener
Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit
a4f2eefe21f973d532a7e08d1ce4e977f39dfe88 )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts
Nizamudeen A [Tue, 16 Jul 2024 14:33:24 +0000 (20:03 +0530)]
mgr/dashboard: nvmf apis broken for insecure channel
because when no certificate, it raises an exception which stops the api call
abruptly.
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
36a4a72959c1428d7295f3e24e5f94c937cff6a6 )
Ankush Behl [Fri, 19 Jul 2024 06:15:52 +0000 (11:45 +0530)]
Merge pull request #58655 from rhcs-dashboard/wip-67002-squid
squid: mgr/dashboard: add NFS export button for subvolume/ grp
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Nizamudeen A [Fri, 19 Jul 2024 06:15:23 +0000 (11:45 +0530)]
Merge pull request #58619 from ceph/squid-sync-policy
squid: mgr/dashboard: rgw multisite sync policy management
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Brad Hubbard [Fri, 19 Jul 2024 02:33:17 +0000 (12:33 +1000)]
Merge pull request #57457 from badone/wip-tracker-59196-lazy-omap-regex-segfault-squid
squid: test/lazy-omap-stats: Convert to boost::regex
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
Naman Munet [Thu, 11 Jul 2024 18:40:51 +0000 (00:10 +0530)]
mgr/dashboard: RGW multisite sync pipe
Fixes: https://tracker.ceph.com/issues/66926
Signed-off-by: Naman Munet <nmunet@redhat.com>
(cherry picked from commit
d451b4d1795e1429b0a530940558cf646579cdb9 )
Avan Thakkar [Fri, 5 Jul 2024 09:29:13 +0000 (14:59 +0530)]
mgr/dashboard: add NFS export route from subvolume/subvolume grp
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
c0b2db74b2a99eb0ee4e4a37997d6516d8622855 )
Nizamudeen A [Thu, 18 Jul 2024 07:18:24 +0000 (12:48 +0530)]
Merge pull request #58620 from rhcs-dashboard/squid-expand-cluster-improvements
squid: mgr/dashboard: Expand Cluster improvements
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Nizamudeen A [Thu, 18 Jul 2024 06:18:58 +0000 (11:48 +0530)]
Merge pull request #58599 from afreen23/wip-backport-nvmeof
Batch backport nvmeof nav and subystems
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Aashish Sharma [Thu, 18 Jul 2024 05:20:14 +0000 (10:50 +0530)]
Merge pull request #58640 from aaSharma14/wip-66993-squid
squid: mgr/dashboard: Block -> Images -> Create form improvements
Reviewed-by: Nizamudeen A <nia@redhat.com>
Zac Dover [Thu, 18 Jul 2024 00:39:30 +0000 (10:39 +1000)]
Merge pull request #58614 from zdover23/wip-doc-2024-07-16-backport-58596-to-squid
squid: doc: clarify superuser note for ceph-fuse
Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Radoslaw Zarzynski [Wed, 17 Jul 2024 23:54:21 +0000 (01:54 +0200)]
Merge pull request #58650 from aclamk/wip-aclamk-denc-compat-check-squid
squid: common, os/bluestore: Fix lack of checking for compat on DENC_START
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Adam Kupczyk [Tue, 16 Jul 2024 13:15:38 +0000 (13:15 +0000)]
include/denc.h: Review fixes
- Added note to release-checklist
- Created specialized DENC_START_OSD_REQID
- Use CEPH_RELEASE_SQUID (19) value
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
6143b80ef7fd9730705ea564f72542caacf7e379 )
Adam Kupczyk [Thu, 4 Jul 2024 17:47:29 +0000 (17:47 +0000)]
include/denc: Not use fmt::format
fmt::format caused linking problems in some compilations.
Instead of fixing them all, discontinue usage.
Moved compatibility throw to separate function.
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
71ca41dbaa5640cc41589d9c2b04ca1b2967ab16 )
Adam Kupczyk [Wed, 3 Jul 2024 15:14:50 +0000 (15:14 +0000)]
test/encoding.cc: Harmonize expected text with exception
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
d4a83b7170657e7eb59507d0c8696238ac62fe32 )
Adam Kupczyk [Mon, 24 Jun 2024 08:22:46 +0000 (08:22 +0000)]
build: split ceph_ver.h
Split ceph_ver.h into:
1) ceph_ver.h containing git-related macros
2) ceph_release.h containing just human written ceph version number /
ceph version name.
The benefit is that denc.h which needs to know CEPH_RELEASE value
can skip including git-related macros. There are many compilation units
that use denc.h and only few that need git-related macros.
Reduces amount of files to recompile after SHA1 changes.
It is only relevant for developer environment.
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
1a56293f2c890d9222fab5e1e91c34e2d864aef9 )
Adam Kupczyk [Tue, 21 May 2024 09:07:49 +0000 (09:07 +0000)]
include/encoding.h: Fix message on compat failure
Change misleading message printed when compat is not met.
Was:
FUNC no longer understand old encoding version 5 < 7
Is:
Decoder at FUNC v=5 cant decode v=11 minimal_decoder=7
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
ebd8283e2f2923ca5787483919bb1ab9a3faddea )
Adam Kupczyk [Thu, 6 Jun 2024 18:10:45 +0000 (18:10 +0000)]
include/denc: Add protection against bumping up compat
Added protection against bumping up compat until U_____ release (SQUID+2)
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
c94c8baf012b66ba2fe13abbeb2f27c16c717df4 )
Adam Kupczyk [Tue, 21 May 2024 09:05:15 +0000 (09:05 +0000)]
include/denc: Add missing check for compat
Now decoder throws if compat signalled in message is higher than version of decoder.
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
62aba6df38df7203b2565f77afc2fb09e4bc43d6 )
Adam Kupczyk [Tue, 21 May 2024 09:02:25 +0000 (09:02 +0000)]
test/denc: Add check for compat
Add unittest that checks if code throws exception if decoder is outside compat range.
Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit
59c48b1202b324f0ddffeb4bad1029e799121813 )
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
Aashish Sharma [Tue, 4 Jun 2024 12:29:34 +0000 (17:59 +0530)]
mgr/dashboard: Block -> Images -> Create form improvements
Fixes: https://tracker.ceph.com/issues/66348
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
e3c656440f69fed1a93ed6fa92e2b9e6adf27e45 )
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>
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>
Pedro Gonzalez Gomez [Wed, 19 Jun 2024 20:23:11 +0000 (22:23 +0200)]
mgr/dashboard: add fields to EC profile form
Fixes: https://tracker.ceph.com/issues/66571
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit
8f7a5de584b04b1dcba04799d1d9301af325d64b )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts
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 )
Naman Munet [Fri, 7 Jun 2024 10:49:23 +0000 (16:19 +0530)]
mgr/dashboard: Expand Cluster improvements
worked on expand cluster screen hide/show and persisting osd form values
Fixes: https://tracker.ceph.com/issues/66344
Signed-off-by: Naman Munet <nmunet@redhat.com>
(cherry picked from commit
aa4d6b58459079a3b59ffdd1c9913c0a07a1549a )
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>
Naman Munet [Thu, 11 Jul 2024 18:40:51 +0000 (00:10 +0530)]
mgr/dashboard: RGW multisite sync flow
Fixes: https://tracker.ceph.com/issues/66915
Signed-off-by: Naman Munet <nmunet@redhat.com>
(cherry picked from commit
41d46b7b507f95603ec432c061fdf0569f12dc3b )
Naman Munet [Tue, 2 Jul 2024 06:36:59 +0000 (12:06 +0530)]
mgr/dashboard: RGW sync policy crud operations
sync group crud ops added
Fixes: https://tracker.ceph.com/issues/66798
Signed-off-by: Naman Munet <nmunet@redhat.com>
(cherry picked from commit
a784b71abf64ec26d3f424c6298b5ecc97d296e3 )
Naman Munet [Tue, 25 Jun 2024 11:54:51 +0000 (17:24 +0530)]
mgr/dashborad: RGW sync policy
Fixes: https://tracker.ceph.com/issues/66576
Signed-off-by: Naman Munet <nmunet@redhat.com>
(cherry picked from commit
94f9a2bf18f43cc5b05dd8c216fe9e0975969106 )
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>
Patrick Donnelly [Mon, 15 Jul 2024 14:18:15 +0000 (10:18 -0400)]
doc: elide superuser discussion from mount prereq
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
7290bdce6f4dd93be88be6ad54030fa90a8c1ec0 )
Patrick Donnelly [Mon, 15 Jul 2024 14:12:24 +0000 (10:12 -0400)]
doc: clarify superuser note for ceph-fuse
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
d100de9c9ce884beee6e9551b2b221c686b775b5 )
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
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
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
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
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
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
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
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
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
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`
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
Afreen Misbah [Sat, 22 Jun 2024 12:00:49 +0000 (17:30 +0530)]
mgr/dashboard: Configure subsystems from dashboard
Fixes https://tracker.ceph.com/issues/66659
- adds subsytems tab
- adds subsystem listing view
- adds create subsystem modal
- adds delete subsystem
- adds unit tests
Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
(cherry picked from commit
b85f982def41320003ecb632e2b03a8779567fbe )
Afreen [Fri, 31 May 2024 07:54:27 +0000 (13:24 +0530)]
mgr/dashboard: Introduce NVMe/TCP navigation
Fixes https://tracker.ceph.com/issues/66346
- adds NVMe/TCP tab under Block nav
- adds overview page for NVMe/TCP nav
- overview page lists gateways
- add default error page when no nvmeof service running
- added unit tests
- fixes service page e2e test
Signed-off-by: Afreen <afreen23.git@gmail.com>
(cherry picked from commit
442346f0efbb5d7d3af3ebdf847586bbe3f93f6d )
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
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 )
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 )
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 )
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>
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>
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>
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>
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>
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
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"
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>
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>
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>
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 )
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 )
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>
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>
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>
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>
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>
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 )
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 )
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
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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 )
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>
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 )
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 )
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 )
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>
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 )
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 )
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 )
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 )
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 )