]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 months agoMerge pull request #61917 from adk3798/wip-68647-reef
Adam King [Mon, 24 Feb 2025 16:47:20 +0000 (11:47 -0500)]
Merge pull request #61917 from adk3798/wip-68647-reef

reef: qa/cephadm: wait a bit before checking rgw daemons upgraded w/ `ceph versions`

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61914 from adk3798/wip-68081-reef
Adam King [Mon, 24 Feb 2025 16:32:13 +0000 (11:32 -0500)]
Merge pull request #61914 from adk3798/wip-68081-reef

reef: orch: refactor boolean handling in drive group spec

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61904 from adk3798/reef-cephadm-vrrp-typo
Adam King [Mon, 24 Feb 2025 16:30:05 +0000 (11:30 -0500)]
Merge pull request #61904 from adk3798/reef-cephadm-vrrp-typo

reef: mgr/cephadm: fix typo with vrrp_interfaces in keepalive setup

Reviewed-by: Redouane Kachach <rkachach@ibm.com>
4 months agoMerge pull request #61717 from adk3798/wip-67111-reef
Adam King [Mon, 24 Feb 2025 16:28:50 +0000 (11:28 -0500)]
Merge pull request #61717 from adk3798/wip-67111-reef

reef: mgr/rgw: Adding a retry config while calling zone_create()

Reviewed-by: Redouane Kachach <rkachach@ibm.com>
4 months agoMerge pull request #60474 from guits/wip-68555-reef
Adam King [Mon, 24 Feb 2025 16:27:52 +0000 (11:27 -0500)]
Merge pull request #60474 from guits/wip-68555-reef

reef: cephadm: pull container images from quay.io

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Afreen Misbah <afreen@ibm.com>
4 months agoMerge pull request #61913 from phlogistonjohn/wip-70090-reef
Adam King [Mon, 24 Feb 2025 15:57:51 +0000 (10:57 -0500)]
Merge pull request #61913 from phlogistonjohn/wip-70090-reef

reef: build-with-container fixes exec bit, dnf cache dir option

Reviewed-by: Adam King <adking@redhat.com>
4 months agoMerge pull request #61750 from NitzanMordhai/wip-69888-reef
NitzanMordhai [Mon, 24 Feb 2025 11:58:51 +0000 (13:58 +0200)]
Merge pull request #61750 from NitzanMordhai/wip-69888-reef

reef: workunit/dencoder: dencoder test forward incompat fix

4 months agoMerge pull request #59286 from k0ste/wip-65947-reef
NitzanMordhai [Mon, 24 Feb 2025 11:57:30 +0000 (13:57 +0200)]
Merge pull request #59286 from k0ste/wip-65947-reef

reef: msg/async: Encode message once features are set

4 months agoMerge pull request #61959 from idryomov/wip-70041-reef
Ilya Dryomov [Mon, 24 Feb 2025 08:24:27 +0000 (09:24 +0100)]
Merge pull request #61959 from idryomov/wip-70041-reef

reef: test/rbd_mirror: clear Namespace::s_instance at the end of a test

Reviewed-by: Vinay Bhaskar Varada <vvarada@redhat.com>
4 months agoMerge pull request #61957 from idryomov/wip-63798-reef
Ilya Dryomov [Mon, 24 Feb 2025 08:23:48 +0000 (09:23 +0100)]
Merge pull request #61957 from idryomov/wip-63798-reef

reef: test/rbd_mirror: flush watch/notify callbacks in TestImageReplayer

Reviewed-by: Vinay Bhaskar Varada <vvarada@redhat.com>
4 months agotest/rbd_mirror: clear Namespace::s_instance at the end of a test 61959/head
Ilya Dryomov [Tue, 18 Feb 2025 16:51:47 +0000 (17:51 +0100)]
test/rbd_mirror: clear Namespace::s_instance at the end of a test

TestMockPoolReplayer.Namespaces and NamespacesError tests leave behind
a dangling pointer to a stack-allocated MockNamespace which leads to an
easily reproducible use-after-free and segfault when tests are shuffled.

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

4 months agotest/rbd_mirror: flush watch/notify callbacks in TestImageReplayer 61957/head
Ilya Dryomov [Mon, 17 Feb 2025 11:41:51 +0000 (12:41 +0100)]
test/rbd_mirror: flush watch/notify callbacks in TestImageReplayer

TestImageReplayer establishes its own (i.e. outside of the SUT code)
watch on the header of the remote image to be able to synchronize the
execution of the test with certain notifications.  This watch is
established before the remote image is opened and is teared down until
after the remote image is closed but while the image replayer is still
running.  The flush that is part of image close sequence thus isn't
guaranteed to cover all callbacks, especially for snapshot-based
mirroring where UnlinkPeerRequest spawned from Replayer::unlink_peer()
generates a notification on the remote image for each completed unlink.
Since TestImageReplayer further immediately deletes C_WatchCtx, pretty
much any test can segfault when C_WatchCtx::handle_notify() is invoked
by TestWatchNotify infrastructure.  Because it's a virtual method, the
segfault often involves a completely bogus instruction pointer:

  fn_anonymous[3176255]: segfault at b ip 000000000000000b sp 00007fffbceba7a8 error 14 in unittest_rbd_mirror[555555554000+96a000]
  Code: Bad RIP value.

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

4 months agoMerge pull request #61947 from adk3798/reef-fix-valid-addr-py311
Adam King [Fri, 21 Feb 2025 04:35:38 +0000 (23:35 -0500)]
Merge pull request #61947 from adk3798/reef-fix-valid-addr-py311

reef: python-common: fix valid_addr on python 3.11

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agopython-common: fix valid_addr on python 3.11 61947/head
John Mulligan [Thu, 27 Jul 2023 18:17:36 +0000 (14:17 -0400)]
python-common: fix valid_addr on python 3.11

The behavior on python 3.11 regarding IPv4 addresses in bracket has
changed:
```
$ python3.8 -c 'from urllib.parse import urlparse; urlparse("http://[192.168.0.1]")'

[john@edfu ~]$ python3.11 -c 'from urllib.parse import urlparse; urlparse("http://[192.168.0.1]")'
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/usr/lib64/python3.11/urllib/parse.py", line 395, in urlparse
    splitresult = urlsplit(url, scheme, allow_fragments)
                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib64/python3.11/urllib/parse.py", line 500, in urlsplit
    _check_bracketed_host(bracketed_host)
  File "/usr/lib64/python3.11/urllib/parse.py", line 448, in
_check_bracketed_host
    raise ValueError(f"An IPv4 address cannot be in brackets")
ValueError: An IPv4 address cannot be in brackets
```

This breaks the test in test_valid_addr that asserts that function
valid_addr returns the string "IPv4 address wrapped in brackets is
invalid".
Move the step that checks for brackets and dots above the urllib
check so that the function continues returning the expected string.

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

4 months agoMerge pull request #61932 from zdover23/wip-doc-2025-02-20-backport-61785-to-reef
David Galloway [Thu, 20 Feb 2025 14:19:34 +0000 (09:19 -0500)]
Merge pull request #61932 from zdover23/wip-doc-2025-02-20-backport-61785-to-reef

reef: doc: Upgrade and unpin some python versions

4 months agoMerge pull request #61927 from zdover23/wip-doc-2025-02-20-backport-61883-to-reef
Zac Dover [Thu, 20 Feb 2025 13:15:06 +0000 (23:15 +1000)]
Merge pull request #61927 from zdover23/wip-doc-2025-02-20-backport-61883-to-reef

reef: doc/start: Mention RGW in Intro to Ceph

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 months agodoc: Upgrade and unpin some python versions 61932/head
David Galloway [Wed, 12 Feb 2025 23:46:06 +0000 (18:46 -0500)]
doc: Upgrade and unpin some python versions

https://access.redhat.com/security/cve/CVE-2022-34749

https://bugzilla.redhat.com/show_bug.cgi?id=2255448

Fixes https://github.com/ceph/ceph/pull/44222

Signed-off-by: David Galloway <david.galloway@ibm.com>
(cherry picked from commit 4e2924433612263ae0dee3fc11d9ffa37a1c0346)

4 months agodoc/start: Mention RGW in Intro to Ceph 61927/head
Anthony D'Atri [Tue, 18 Feb 2025 21:31:47 +0000 (16:31 -0500)]
doc/start: Mention RGW in Intro to Ceph

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 4a6e9b0de6b899c09fcb40aa73ed3edddfdecba9)

4 months agoqa/cephadm: wait a bit before checking rgw daemons upgraded w/ `ceph versions` 61917/head
Adam King [Tue, 27 Aug 2024 21:24:44 +0000 (17:24 -0400)]
qa/cephadm: wait a bit before checking rgw daemons upgraded w/ `ceph versions`

As this seems to take a little bit to be updated and the tests end
up failing despite the rgw daemons actually being upgraded successfully

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

4 months agoorch: refactor boolean handling in drive group spec 61914/head
Guillaume Abrioux [Thu, 12 Sep 2024 06:09:21 +0000 (06:09 +0000)]
orch: refactor boolean handling in drive group spec

The intent of 42721c03ee6f was to address an issue where boolean
parameters weren't handled correctly.

I noticed that a parameter (`tpm2`) was missed, which made me realize
that maintaining a list of these boolean parameters is necessary.

To simplify things, we should only accept `"true"` or `"false"` (in any case),
allowing us to avoid the need to maintain a list of boolean parameters.

This change introduces a `list_drive_group_spec_bool_arg` to store boolean
arguments related to drive group specifications, simplifying the validation
process for boolean values by directly checking if the values are 'true' or 'false'.

Fixes: https://tracker.ceph.com/issues/68045
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit e3d8a37ef6e31eaf69671cec6ee5b1ed11ca267d)

4 months agoscript: allow relative & ~ paths in build-with-container dnf cache arg 61913/head
John Mulligan [Thu, 6 Feb 2025 16:51:54 +0000 (11:51 -0500)]
script: allow relative &  ~ paths in build-with-container dnf cache arg

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

4 months agoscript: set execute bit on build-with-container.py
John Mulligan [Thu, 6 Feb 2025 14:59:29 +0000 (09:59 -0500)]
script: set execute bit on build-with-container.py

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

4 months agomgr/rgw: Adding a retry config while calling zone_create() 61717/head
Kritik Sachdeva [Fri, 28 Jun 2024 12:23:37 +0000 (17:53 +0530)]
mgr/rgw: Adding a retry config while calling zone_create()

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

Signed-off-by: Kritik Sachdeva <sachdevakritik.440@gmail.com>
(cherry picked from commit 480253eaea553b3827a9d584ba8b45a32c845386)

Conflicts:
src/pybind/mgr/rgw/module.py

4 months agoMerge pull request #61721 from adk3798/wip-68018-reef
Adam King [Wed, 19 Feb 2025 18:32:04 +0000 (13:32 -0500)]
Merge pull request #61721 from adk3798/wip-68018-reef

reef: cephadm: emit warning if daemon's image is not to be used

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
4 months agoMerge pull request #61720 from adk3798/wip-67694-reef
Adam King [Wed, 19 Feb 2025 18:30:59 +0000 (13:30 -0500)]
Merge pull request #61720 from adk3798/wip-67694-reef

reef: mgr/orchestrator: fix encrypted flag handling in orch daemon add osd

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61719 from adk3798/wip-67498-reef
Adam King [Wed, 19 Feb 2025 18:29:54 +0000 (13:29 -0500)]
Merge pull request #61719 from adk3798/wip-67498-reef

reef: mgr/nfs: scrape nfs monitoring endpoint

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61718 from adk3798/wip-67463-reef
Adam King [Wed, 19 Feb 2025 18:28:36 +0000 (13:28 -0500)]
Merge pull request #61718 from adk3798/wip-67463-reef

reef: qa/upgrade: fix checks to make sure upgrade is still in progress

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61716 from adk3798/wip-66959-reef
Adam King [Wed, 19 Feb 2025 18:26:29 +0000 (13:26 -0500)]
Merge pull request #61716 from adk3798/wip-66959-reef

reef: cephadm: turn off cgroups_split setting  when bootstrapping with --no-cgroups-split

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61715 from adk3798/wip-66891-reef
Adam King [Wed, 19 Feb 2025 18:23:34 +0000 (13:23 -0500)]
Merge pull request #61715 from adk3798/wip-66891-reef

reef: mgr/rgw: fix setting rgw realm token in secondary site rgw spec

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
4 months agoMerge pull request #61714 from adk3798/wip-66788-reef
Adam King [Wed, 19 Feb 2025 18:20:25 +0000 (13:20 -0500)]
Merge pull request #61714 from adk3798/wip-66788-reef

reef: cephadm: disable ms_bind_ipv4 if we will enable ms_bind_ipv6

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
4 months agoMerge pull request #61683 from phlogistonjohn/wip-69856-reef
Adam King [Wed, 19 Feb 2025 18:12:32 +0000 (13:12 -0500)]
Merge pull request #61683 from phlogistonjohn/wip-69856-reef

reef: containerized build tools [V2]

Reviewed-by: Adam King <adking@redhat.com>
4 months agoMerge pull request #61713 from adk3798/wip-66647-reef
Adam King [Wed, 19 Feb 2025 16:50:16 +0000 (11:50 -0500)]
Merge pull request #61713 from adk3798/wip-66647-reef

reef: mgr/rgw: fix error handling in rgw zone create

Reviewed-by: Redouane Kachach <rkachach@ibm.com>
4 months agoMerge pull request #61712 from adk3798/wip-66529-reef
Adam King [Wed, 19 Feb 2025 16:47:18 +0000 (11:47 -0500)]
Merge pull request #61712 from adk3798/wip-66529-reef

reef: cephadm: fix apparmor profiles with spaces in the names

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61711 from adk3798/wip-66476-reef
Adam King [Wed, 19 Feb 2025 16:46:21 +0000 (11:46 -0500)]
Merge pull request #61711 from adk3798/wip-66476-reef

reef: qa/suites: add "mon down" log variations to ignorelist

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61151 from stackhpc/reef-keepalived-security-context
Adam King [Wed, 19 Feb 2025 16:45:19 +0000 (11:45 -0500)]
Merge pull request #61151 from stackhpc/reef-keepalived-security-context

reef: cephadm/services/ingress: configure security user in keepalived template

Reviewed-by: Adam King <adking@redhat.com>
4 months agoMerge pull request #61027 from adk3798/wip-69186-reef
Adam King [Wed, 19 Feb 2025 16:43:45 +0000 (11:43 -0500)]
Merge pull request #61027 from adk3798/wip-69186-reef

reef: qa/tasks/nvme_loop: update task to work with new nvme list format

Reviewed-by: Laura Flores <lflores@ibm.com>
4 months agoMerge pull request #60350 from aaSharma14/wip-68547-reef
Adam King [Wed, 19 Feb 2025 16:42:17 +0000 (11:42 -0500)]
Merge pull request #60350 from aaSharma14/wip-68547-reef

reef: mgr/cephadm: Update multi-site configs before deploying  daemons on rgw service create

Reviewed-by: Adam King <adking@redhat.com>
4 months agoMerge pull request #59947 from aaSharma14/wip-68202-reef
Adam King [Wed, 19 Feb 2025 16:41:08 +0000 (11:41 -0500)]
Merge pull request #59947 from aaSharma14/wip-68202-reef

reef: mgr/cephadm: use host address while updating rgw zone endpoints

Reviewed-by: Adam King <adking@redhat.com>
4 months agoMerge pull request #56714 from adk3798/reef-test-cephadm-correct-bootstrap-image
Adam King [Wed, 19 Feb 2025 16:40:16 +0000 (11:40 -0500)]
Merge pull request #56714 from adk3798/reef-test-cephadm-correct-bootstrap-image

reef: qa/cephadm: use reef image as default for test_cephadm workunit

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61881 from yuvalif/wip-yuval-bucket-notif-test
Adam Emerson [Wed, 19 Feb 2025 16:22:46 +0000 (11:22 -0500)]
Merge pull request #61881 from yuvalif/wip-yuval-bucket-notif-test

reef: fix issue with bucket notification test

Reviewed-by: Yuri Weinstein <yuriw@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
4 months agomgr/cephadm: fix typo with vrrp_interfaces in keepalive setup 61904/head
Adam King [Wed, 5 Feb 2025 22:00:06 +0000 (17:00 -0500)]
mgr/cephadm: fix typo with vrrp_interfaces in keepalive setup

This was intended to be vrrp_interfaces, the variable actually
used later in the code. Instead, due to a typo, it was setting
a variable that is unused other than in the log line right after
it is set. Issue was introduced in
https://github.com/ceph/ceph/commit/58ddc4e20f7cead1f2594241450f4beb5230c746

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

4 months agoMerge pull request #61885 from zdover23/wip-doc-2025-02-19-backport-61867-to-reef
Anthony D'Atri [Wed, 19 Feb 2025 01:09:05 +0000 (20:09 -0500)]
Merge pull request #61885 from zdover23/wip-doc-2025-02-19-backport-61867-to-reef

reef: doc/mgr: Add root CA cert instructions to rgw.rst

4 months agodoc/mgr: Add root CA cert instructions to rgw.rst 61885/head
Anuradha Gadge [Tue, 18 Feb 2025 09:09:31 +0000 (14:39 +0530)]
doc/mgr: Add root CA cert instructions to rgw.rst

Add documentation for adding fs_id in root_ca_cert upgrade path

Fixes: https://tracker.ceph.com/issues/70014
Signed-off-by: Anuradha Gadge <anuradha.gadge@ibm.com>
(cherry picked from commit 76106dd9890fdbd9440a5f7de85e9d5de6d0a2b4)

doc/mgr: edit grammar and formatting of rgw.rst

Improve the grammar and correct the formatting of the "Upgrading root ca
certificates" procedure that was added to the documentation in https://github.com/ceph/ceph/pull/61867

Fixes: https://tracker.ceph.com/issues/70014
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 7d9298e3de74e91db116c79a7087f559464ae52d)

4 months agosrc/script: add a script to help build ceph using containers 61683/head
John Mulligan [Tue, 20 Aug 2024 19:01:05 +0000 (15:01 -0400)]
src/script: add a script to help build ceph using containers

The build-with-container script tries to encapsulate nearly all major
build tasks using docker/podman containers. If there's no build image
locally it will create one for your. It provides targets for building
(make), testing (make check), building rpm packages or deb packages and
is designed to be fairly easily extended.

View the comment at the top of the source file for usage details.

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

4 months agobuild: add files needed to create a build container
John Mulligan [Tue, 20 Aug 2024 19:00:57 +0000 (15:00 -0400)]
build: add files needed to create a build container

A build container contains all the tools and dependencies needed to
build ceph. It provides a Container file and small script that
helps bootstrap the container setup. This script installs a few extra
things we need before farming most of the work out to install-deps.sh.

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

4 months agobuild: small script tweak to allow different build dirs
John Mulligan [Sat, 14 Sep 2024 10:31:23 +0000 (06:31 -0400)]
build: small script tweak to allow different build dirs

Move the mkdir line to allow for other builds dir naming schemes outside
of what appears in the .gitignore file. A tiny bit of added flexibility
at little cost.

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

4 months agosrc/script: add helper function has_build_dir
John Mulligan [Mon, 14 Nov 2022 15:57:25 +0000 (10:57 -0500)]
src/script: add helper function has_build_dir

This function returns successfully if $BUILD_DIR exists and is valid.
This is a useful building block for automation around the build and
can be used to avoid re-running commands that fail is the build dir
exists already.

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

4 months agoscript: add gcc-toolset-11 support to discover_compiler
John Mulligan [Tue, 1 Nov 2022 18:58:16 +0000 (14:58 -0400)]
script: add gcc-toolset-11 support to discover_compiler

In order to configure, build, and run tests in a CentOS 8 (or similar)
container we need a functioning gcc-toolset compiler. This relies on
the environment script being sourced as well. cmake does not appear
to be able to discover this compiler own its own.

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

4 months agoscript: add discover_compiler function to lib-build.sh
John Mulligan [Tue, 1 Nov 2022 18:51:57 +0000 (14:51 -0400)]
script: add discover_compiler function to lib-build.sh

The discover_compiler function is an abstraction over the current
compiler detection code in run-make.sh. It is intended to be flexible
enough to work on {centos,rhel} systems, but currently is just an
updated version of the logic from run-make.sh. The intent is that this
function will grow and become useful for other scripts used for
building (possibly do_cmake.sh for example).

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

4 months agoscript: move get_processors to lib-build.sh
John Mulligan [Tue, 1 Nov 2022 13:57:16 +0000 (09:57 -0400)]
script: move get_processors to lib-build.sh

This function can be more useful because the NPROC value can
be provided regardless of how many cores nproc actually detects
and may be handy in a restricted environment like a container.

The new version quotes some values and uses $((...)) as per shellcheck
warning that "expr is antiquated".

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

4 months agoinstall-deps.sh: use ci_debug function
John Mulligan [Mon, 31 Oct 2022 19:18:25 +0000 (15:18 -0400)]
install-deps.sh: use ci_debug function

Replace a number of boilerplate CI_DEBUG lines with the recently added
ci_debug function.

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

4 months agoscript: add a common ci_debug function to print ci debug lines
John Mulligan [Mon, 31 Oct 2022 19:06:25 +0000 (15:06 -0400)]
script: add a common ci_debug function to print ci debug lines

Reduces some of the boilerplate around emitting the "CI_DEBUG:"
prefixed debug lines for the CI. Additionally, enables using
the FORCE_CI_DEBUG var to enable ci debug lines even when not
in a jenkins environment.

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

4 months agoinstall-deps.sh: source lib-build.sh
John Mulligan [Mon, 31 Oct 2022 17:52:50 +0000 (13:52 -0400)]
install-deps.sh: source lib-build.sh

Currently, only in_jenkins is used. More will come later.

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

4 months agoscript: add lib-build.sh for common high level funcs and no main
John Mulligan [Mon, 31 Oct 2022 17:50:56 +0000 (13:50 -0400)]
script: add lib-build.sh for common high level funcs and no main

The intention of this file is collect some of the most basic or common
shell functions used across the various build scripts.
I would also like to ensure that functions added here are validated
using `shellcheck`. Currently, there's no automation for this, just
the honor system, but eventually we can start automating validating
this and other scripts with shellcheck.

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

4 months agoscript: use install-deps.sh to install extra packages wanted by run-make.sh
John Mulligan [Wed, 5 Oct 2022 14:19:32 +0000 (10:19 -0400)]
script: use install-deps.sh to install extra packages wanted by run-make.sh

The run-make.sh script's prepare method pulls in additional dependencies
that are needed by the CI build and tests. To avoid issues such as these
packages not being available until after install-deps.sh being run in a
container environment, we allow install-deps.sh and its new
INSTALL_EXTRA_PKGS input variable to handle all of the dependency
installation.

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

4 months agoinstall-deps.sh: copy ubuntu/apt retry logic from run-make.sh
John Mulligan [Mon, 3 Oct 2022 19:08:30 +0000 (15:08 -0400)]
install-deps.sh: copy ubuntu/apt retry logic from run-make.sh

Copy the logic from run-make.sh into install-deps.sh so that we can later
remove it from run-make.sh. It helps prevent breakage when apt-get is
interrupted.

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

4 months agoinstall-deps.sh: support INSTALL_EXTRA_PKGS
John Mulligan [Mon, 3 Oct 2022 18:43:19 +0000 (14:43 -0400)]
install-deps.sh: support INSTALL_EXTRA_PKGS

Instead of requiring other scripts to install packages independently,
teach install-deps.sh to install additional packages from the variable
INSTALL_EXTRA_PKGS. Now, other scripts should just set
INSTALL_EXTRA_PKGS and call install-deps.sh.

In particular, this fixes an issue installing packages in a clean (ex.
container) system that doesn't yet have repositories set up. Since this
task is performed by install-deps.sh already we avoid a chicken-and-egg
issue (or doing redundant work of setting up repos) in other scripts.

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

4 months agoinstall-deps.sh: move functions above all "main" script body
John Mulligan [Thu, 29 Sep 2022 14:34:12 +0000 (10:34 -0400)]
install-deps.sh: move functions above all "main" script body

Previously, the main part (top level body) of the script started and
then some function definitions occurred and then the main part of the
script resumed after that. I, and others, find this confusing so this
change moves the function definitions to occur before the main body of
the install-deps.sh script.

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

4 months agoscript: have run-make.sh honor BUILD_DIR like do_cmake.sh does
John Mulligan [Thu, 6 Oct 2022 17:43:41 +0000 (13:43 -0400)]
script: have run-make.sh honor BUILD_DIR like do_cmake.sh does

The BUILD_DIR environment variable is honored by do_cmake.sh in order to
create multiple build output directories. Before this change run-make.sh
did not support BUILD_DIR the same way as do_cmake.sh. This change makes
it possible to use BUILD_DIR with run-make.sh.

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

4 months agoscript: reorganize build scripts
John Mulligan [Mon, 31 Oct 2022 14:54:53 +0000 (10:54 -0400)]
script: reorganize build scripts

In preparation for running builds and tests in containers, make some
organizational changes to the run-make-*.sh scripts.

Original version of the patch can be found at https://github.com/ceph/ceph/pull/46071

Original-version-by: Ernesto Puerta <epuertat@redhat.com>
Co-authored-by: Ernesto Puerta <epuertat@redhat.com>
Co-authored-by: John Mulligan <jmulligan@redhat.com>
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 70bf755f9e62e4bb373e5082876a37b2a89abbc9)

4 months agoreef: fix issue with bucket notification test 61881/head
Yuval Lifshitz [Tue, 18 Feb 2025 19:09:17 +0000 (19:09 +0000)]
reef: fix issue with bucket notification test

the get_ip() function now uses the get_ip_http() implementation.
(without that test are sometimes failing with multiple RGWs).
however, the name was modified to get_ip(), and this was not updated
in all tests.

Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>
5 months agoMerge pull request #60369 from neesingh-rh/wip-68590-reef
Hemanth [Tue, 18 Feb 2025 04:55:41 +0000 (10:25 +0530)]
Merge pull request #60369 from neesingh-rh/wip-68590-reef

reef: mgr/vol : shortening the name of helper method

5 months agoMerge pull request #61582 from dmick/wip-69716-reef
Dan Mick [Mon, 17 Feb 2025 22:20:32 +0000 (14:20 -0800)]
Merge pull request #61582 from dmick/wip-69716-reef

reef: container/build.sh: don't require repo creds on NO_PUSH

5 months agoMerge pull request #61581 from dmick/wip-69718-reef
Dan Mick [Mon, 17 Feb 2025 22:20:16 +0000 (14:20 -0800)]
Merge pull request #61581 from dmick/wip-69718-reef

reef: container/build.sh: fix up org vs. repo naming

5 months agoMerge pull request #61580 from dmick/wip-69720-reef
Dan Mick [Mon, 17 Feb 2025 22:19:56 +0000 (14:19 -0800)]
Merge pull request #61580 from dmick/wip-69720-reef

reef: container/Containerfile: replace CEPH_VERSION label for backward compat

5 months agoMerge pull request #61432 from cbodley/wip-69577-reef
Yuri Weinstein [Thu, 13 Feb 2025 16:07:15 +0000 (08:07 -0800)]
Merge pull request #61432 from cbodley/wip-69577-reef

reef: rgw: S3 Delete Bucket Policy should return 204 on success

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
5 months agoMerge pull request #58546 from smanjara/wip-66920-reef
Yuri Weinstein [Thu, 13 Feb 2025 16:05:38 +0000 (08:05 -0800)]
Merge pull request #58546 from smanjara/wip-66920-reef

reef: rgw/multisite: allow PutACL replication.

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 months agoMerge pull request #59375 from rishabh-d-dave/mds-fs-fail-reef
Hemanth [Thu, 13 Feb 2025 14:17:21 +0000 (19:47 +0530)]
Merge pull request #59375 from rishabh-d-dave/mds-fs-fail-reef

reef: qa/cephfs: use different config options to generate MDS_TRIM

5 months agoMerge pull request #57362 from batrick/wip-65870-reef
Hemanth [Thu, 13 Feb 2025 14:16:31 +0000 (19:46 +0530)]
Merge pull request #57362 from batrick/wip-65870-reef

reef: common/StackStringStream: update pointer to newly allocated memory in overflow()

5 months agomgr/nfs: scrape nfs monitoring endpoint 61719/head
avanthakkar [Wed, 3 Jan 2024 11:52:33 +0000 (17:22 +0530)]
mgr/nfs: scrape nfs monitoring endpoint

Fixes: https://tracker.ceph.com/issues/62558
Signed-off-by: avanthakkar <avanjohn@gmail.com>
(cherry picked from commit 5fb45e5fb8330721e03b04d493202c9c845e33b1)

Conflicts:
src/pybind/mgr/cephadm/service_discovery.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2

5 months agoMerge pull request #61625 from prazumovsky/close-range-reef
Ilya Dryomov [Tue, 11 Feb 2025 11:17:45 +0000 (12:17 +0100)]
Merge pull request #61625 from prazumovsky/close-range-reef

reef: common: use close_range on Linux

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
5 months agoworkunit/dencoder: fix corpus test for backword and forward compability 61750/head
Nitzan Mordechai [Wed, 31 Jul 2024 10:38:11 +0000 (10:38 +0000)]
workunit/dencoder: fix corpus test for backword and forward compability

- changed the check for non-deterministic, return code 1 is also legit
- unneeded check for is_dir, if it exist
- limit the number of threads to prevent error

Fixes: https://tracker.ceph.com/issues/67263
Signed-off-by: NitzanMordhai <nmordech@redhat.com>
(cherry picked from commit 30921272ddee5e7c8aaf4bdb8d69645ce92ba379)

5 months agosuites: adding dencoder test multi versions
nmordech@redhat.com [Wed, 3 Apr 2024 07:02:15 +0000 (07:02 +0000)]
suites: adding dencoder test multi versions

We are currently conducting regular ceph-dencoder tests for backward compatibility.
However, we are omitting tests for forward compatibility.
This suite will introduce tests against the ceph-objects-corpus to address forward
compatibility issues that may arise.
the script will install N-2 version and run against the latest version corpus objects
that we have, then install N-1 to N version and check them as well.

Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit 3f26a965f6aae4eb448846ec6e039aa71e209742)

5 months agoMerge pull request #61748 from zdover23/wip-doc-2025-02-11-backport-61739-to-reef
Anthony D'Atri [Tue, 11 Feb 2025 01:47:01 +0000 (20:47 -0500)]
Merge pull request #61748 from zdover23/wip-doc-2025-02-11-backport-61739-to-reef

reef: doc/cephadm: improve "Activate Existing OSDs".

5 months agodoc/cephadm: improve "Activate Existing OSDs". 61748/head
Zac Dover [Mon, 10 Feb 2025 08:12:34 +0000 (18:12 +1000)]
doc/cephadm: improve "Activate Existing OSDs".

Make three minor changes to doc/cephadm/services/osd.rst. These three
changes were suggested by Eugen Block, who reviewed this procedure after
developing it.

Co-authored-by: Eugen Block <eblock@nde.ag>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit abc4a197f7849922bc6a1cd0a45e82f7e93a0a39)

5 months agoMerge pull request #61336 from idryomov/wip-69014-reef
Ilya Dryomov [Mon, 10 Feb 2025 18:34:20 +0000 (19:34 +0100)]
Merge pull request #61336 from idryomov/wip-69014-reef

reef: osd: optimize extent comparison in PrimaryLogPG

Reviewed-by: Laura Flores <lflores@redhat.com>
5 months agoMerge pull request #61345 from YiteGu/wip-69504-reef
SrinivasaBharathKanta [Mon, 10 Feb 2025 10:42:53 +0000 (16:12 +0530)]
Merge pull request #61345 from YiteGu/wip-69504-reef

reef: mon/scrub: log error details of store access failures

5 months agoMerge pull request #60004 from kamoltat/wip-68281-reef
SrinivasaBharathKanta [Mon, 10 Feb 2025 10:39:01 +0000 (16:09 +0530)]
Merge pull request #60004 from kamoltat/wip-68281-reef

reef: src/mon/ConnectionTracker.cc: Fix dump function

5 months agoMerge pull request #59193 from NitzanMordhai/wip-67502-reef
NitzanMordhai [Sun, 9 Feb 2025 08:07:28 +0000 (10:07 +0200)]
Merge pull request #59193 from NitzanMordhai/wip-67502-reef

reef: qa/tasks: watchdog should terminate thrasher

5 months agoMerge pull request #61644 from idryomov/wip-58185-reef
Yuri Weinstein [Sat, 8 Feb 2025 17:44:37 +0000 (09:44 -0800)]
Merge pull request #61644 from idryomov/wip-58185-reef

reef: librbd: stop filtering async request error codes

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
5 months agoMerge pull request #61729 from zdover23/wip-doc-2025-02-08-backport-61660-to-reef
Anthony D'Atri [Sat, 8 Feb 2025 13:35:33 +0000 (08:35 -0500)]
Merge pull request #61729 from zdover23/wip-doc-2025-02-08-backport-61660-to-reef

reef: doc/rados/operations: Improve pools.rst

5 months agoMerge pull request #61726 from zdover23/wip-doc-2025-02-08-backport-61685-to-reef
Anthony D'Atri [Sat, 8 Feb 2025 12:00:19 +0000 (07:00 -0500)]
Merge pull request #61726 from zdover23/wip-doc-2025-02-08-backport-61685-to-reef

reef: doc/cephadm: improve "Activate Existing OSDs"

5 months agoMerge branch 'reef' into wip-doc-2025-02-08-backport-61660-to-reef 61729/head
Anthony D'Atri [Sat, 8 Feb 2025 11:59:25 +0000 (06:59 -0500)]
Merge branch 'reef' into wip-doc-2025-02-08-backport-61660-to-reef

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
5 months agoMerge pull request #61731 from zdover23/wip-doc-2025-02-08-backport-61708-to-reef
Anthony D'Atri [Sat, 8 Feb 2025 11:56:38 +0000 (06:56 -0500)]
Merge pull request #61731 from zdover23/wip-doc-2025-02-08-backport-61708-to-reef

reef: doc: Clarify that there are no tertiary OSDs

5 months agodoc: Clarify that there are no tertiary OSDs 61731/head
Anthony D'Atri [Fri, 7 Feb 2025 15:08:38 +0000 (10:08 -0500)]
doc: Clarify that there are no tertiary OSDs

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit e261155a8a0234897803d38e899d10ec89b2b08f)

5 months agodoc/rados/operations: Improve pools.rst
Anthony D'Atri [Wed, 5 Feb 2025 16:34:38 +0000 (11:34 -0500)]
doc/rados/operations: Improve pools.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit b1e5da594a662e0037459489fbbd449685ad9854)

5 months agodoc/cephadm: improve "Activate Existing OSDs" 61726/head
Zac Dover [Fri, 7 Feb 2025 01:32:20 +0000 (11:32 +1000)]
doc/cephadm: improve "Activate Existing OSDs"

Improve the section "Activate Existing OSDs".

Supplement the information in the "Activate Existing OSDs" section with
a procedure developed by Eugen Block, here:
https://heiterbiswolkig.blogs.nde.ag/2025/02/06/cephadm-activate-existing-osds/

This procedure explains how to activate OSDs on a host that, for
whatever reason, has had to have its operating system reinstalled.

Co-authored by Eugen Block.

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

5 months agoMerge pull request #61602 from idryomov/wip-69679-reef
Ilya Dryomov [Fri, 7 Feb 2025 21:47:17 +0000 (22:47 +0100)]
Merge pull request #61602 from idryomov/wip-69679-reef

reef: mon/OSDMonitor: relax cap enforcement for unmanaged snapshots

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 months agocephadm: emit warning if daemon's image is not to be used 61721/head
Matthew Vernon [Wed, 28 Aug 2024 15:37:46 +0000 (16:37 +0100)]
cephadm: emit warning if daemon's image is not to be used

If an image is not specified, cephadm shell will use the image
corresponding to a Ceph daemon running on the host (and will log a
debug message to that effect).

However, it will only use that image if it appears in the output of:

podman images --filter label=ceph=True --filter dangling=false

This commit means that cephadm will emit a warning if the container
image it was going to use fails this check, so the operator has more
of a clue to what is going on.

Fixes: https://tracker.ceph.com/issues/67778
Signed-off-by: Matthew Vernon <mvernon@wikimedia.org>
(cherry picked from commit b863c93ef1a1ce85164584dd17c5e71441bc550f)

5 months agomgr/orchestrator: fix encrypted flag handling in orch daemon add osd 61720/head
Yonatan Zaken [Mon, 12 Aug 2024 20:00:39 +0000 (23:00 +0300)]
mgr/orchestrator: fix encrypted flag handling in orch daemon add osd

The current implementation incorrectly parses this `encrypted` flag as a string rather than a boolean value.
This leads to unintended behavior causing an LVM encryption layer to be created regardless of whether `encrypted=True` or `encrypted=False` is passed.
The only way to prevent this behavior is by omitting the `encrypted` flag entirely.
This change prevents potential errors, aligning the behavior with user expectations.

Fixes: https://tracker.ceph.com/issues/67372
Signed-off-by: Yonatan Zaken <yonatan.zaken@gmail.com>
(cherry picked from commit 42721c03ee6f2c47a20dfb4d40af4f7f7afe6113)

5 months agoqa/upgrade: use staggered upgrade features for reef-x/stress-split 61718/head
Adam King [Mon, 15 Jul 2024 19:19:22 +0000 (15:19 -0400)]
qa/upgrade: use staggered upgrade features for reef-x/stress-split

This test was trying to partially upgrade the mons and OSDs by
kicking off an upgrade and then checking every 2 seconds if
enough had been upgraded. Since staggered upgrade parameters
were present in the initial reef release (not true for quincy)
it makes sense to use them instead in order to do this in a
more controlled manner.

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

5 months agoqa/upgrade: fix checks to make sure upgrade is still in progress
Adam King [Mon, 15 Jul 2024 19:02:27 +0000 (15:02 -0400)]
qa/upgrade: fix checks to make sure upgrade is still in progress

Without checking both for the upgrade being in progress and that
the status isn't reporting an error, we can end up in a scenario
where the test is just waiting for an upgrade that has already
been marked failed and will never complete. This same sort of
change was already done in the orch suite upgrade tests and
has helped with jobs timing out there

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

5 months agocephadm: turn off cgroups_split setting when bootstrapping with --no-cgroups-split 61716/head
Adam King [Mon, 1 Jul 2024 17:44:29 +0000 (13:44 -0400)]
cephadm: turn off cgroups_split setting  when bootstrapping with --no-cgroups-split

If users provide the --no-cgroups-split tag when bootstrapping a
cluster, they probably want the cluster to continue to not use
cgroups split for daemon post bootstrap. Setting the
mgr/cephadm/cgroups_split setting to false accomplishes that.

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

5 months agomgr/rgw: fix setting rgw realm token in secondary site rgw spec 61715/head
Adam King [Thu, 27 Jun 2024 21:09:20 +0000 (17:09 -0400)]
mgr/rgw: fix setting rgw realm token in secondary site rgw spec

This was setting a field called "rgw_token" in the rgw spec
but this is not a real field in rgw specs. Instead we should
be setting "rgw_realm_token" which is what the field is
actually called.

Setting this nonexistent field causes the spec to be deleted
the first time cephadm needs to convert it from a json string
back into a python object (which happens whenever the module
restarts or the active mgr changes) which then causes all the
rgw daemons attached to the service to be removed

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

5 months agocephadm: disable ms_bind_ipv4 if we will enable ms_bind_ipv6 61714/head
Dan van der Ster [Tue, 11 Jun 2024 20:31:05 +0000 (13:31 -0700)]
cephadm: disable ms_bind_ipv4 if we will enable ms_bind_ipv6

While bootstrapping an ipv6 cluster with an ipv6 initial mon, cephadm correctly enables ms_bind_ipv6=true.
However it leaves ms_bind_ipv4 as it's default (true).

As a result, daemons (osd, mds, ...) will attempt to bind to both ipv6 and ipv4.
Usually this results in an osdmap and fsmap like the following:

```
osd.2 up in weight 1 up_from 26 up_thru 909 down_at 0 last_clean_interval [0,0) [v2:[xxxx:4f8:d0:4401:3::29]:6800/3680761436,v1:[xxxx:4f8:d0:4401:3::29]:6801/3680761436,v2:0.0.0.0:6802/3680761436,v1:0.0.0.0:6803/3680761436] [v2:[xxxx:4f8:d0:4401:3::29]:6804/3680761436,v1:[xxxx:4f8:d0:4401:3::29]:6805/3680761436,v2:0.0.0.0:6806/3680761436,v1:0.0.0.0:6807/3680761436] exists,up 0978a571-cd00-4eba-b00b-f863603a9a70
```

```
[mds.cephfs.ceph-test-3.isityv{-1:793154} state up:standby seq 1 join_fscid=1 addr [v2:[xxxx:4f8:d0:4401:3::29]:6832/2213688825,v1:[xxxx:4f8:d0:4401:3::29]:6833/2213688825,v2:0.0.0.0:6834/2213688825,v1:0.0.0.0:6835/2213688825] compat {c=[1],r=[1],i=[7ff]}]
```

Dual stack is not support by kernels (https://tracker.ceph.com/issues/49581) which leads to hard to debug issues for the end users. (corrupt map messages in dmesg).

Fix by disabling ms_bind_ipv4 in the case ipv6 is desired.

Fixes: https://tracker.ceph.com/issues/66436
Signed-off-by: Dan van der Ster <dan.vanderster@clyso.com>
Signed-off-by: Joshua Blanch <joshua.blanch@clyso.com>
(cherry picked from commit 75f0ba5703200f4420a4b53d1c728167daf19909)

5 months agomgr/rgw: fix error handling in rgw zone create 61713/head
Adam King [Wed, 19 Jun 2024 19:04:21 +0000 (15:04 -0400)]
mgr/rgw: fix error handling in rgw zone create

This was returning either a list of strings or
a HandleCommandResult and in the latter case
it would error out trying to build the final
return message which covered up the original
error

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

5 months agopython-common/rgw: fix broken f-string in zone_create func
Adam King [Wed, 19 Jun 2024 18:46:24 +0000 (14:46 -0400)]
python-common/rgw: fix broken f-string in zone_create func

Or I guess I should say make it an f-string since the
"f" was mising despite using f-string syntax

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

5 months agocephadm: rename test_enclosure to test_host_facts 61712/head
John Mulligan [Mon, 10 Jun 2024 18:36:33 +0000 (14:36 -0400)]
cephadm: rename test_enclosure to test_host_facts

There was a whole file dedicated to the enclosure class from host_facts,
but no other tests for host facts. Rename the enclosure test file to
cover all of host_facts module (for the future).

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

5 months agocephadm: black-format the file test_enclosure.py
John Mulligan [Mon, 10 Jun 2024 18:32:34 +0000 (14:32 -0400)]
cephadm: black-format the file test_enclosure.py

A bunch of stray whitespace in this file called out to be cleaned up.
Black did that job and fixed up some other formatting stuff.

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

5 months agocephadm: update hosts_facts to read apparmor profile names with spaces
John Mulligan [Mon, 10 Jun 2024 18:30:31 +0000 (14:30 -0400)]
cephadm: update hosts_facts to read apparmor profile names with spaces

Fixes: https://tracker.ceph.com/issues/66389
Update the host_facts class kernel_security method to correctly read
apparmor profile names that have spaces in them. Update the test to
verify this functionality.

Original-version-by: Sebastian Marsching <sebastian.marsching-git-2016@aquenos.com>
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit d40fe10b8a75402d518fb54f58c689331c854778)

Conflicts:
src/cephadm/cephadmlib/host_facts.py