]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 months agoscript/build-with-container: add --current-branch cli option
John Mulligan [Fri, 14 Feb 2025 16:24:06 +0000 (11:24 -0500)]
script/build-with-container: add --current-branch cli option

Add a new --current-branch argument that lets the user supply a name for
the current branch. This allows the automatic tag generation to avoid
calling git - something useful if the tree is not using a git checkout
(like a tarball). It also allows you to pull a temporary branch in git
but ignore it and act like the temporary branch is the base branch.

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

4 months agoscript/build-with-container: add more distro aliases
John Mulligan [Tue, 11 Feb 2025 23:36:13 +0000 (18:36 -0500)]
script/build-with-container: add more distro aliases

Add a system to define distro name aliases and use that to define some
additional aliases, primarily to match ubuntu codenames rather than
version numbers. Requested by Zack.

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

4 months agoscript/build-with-container: apply black formatting to file
John Mulligan [Thu, 20 Feb 2025 00:21:27 +0000 (19:21 -0500)]
script/build-with-container: apply black formatting to file

After the last set of fixes and enhancements I forgot to reformat the
file. This applies standard `black` formatting to the file.

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

4 months agoMerge pull request #61531 from soumyakoduri/wip-skoduri-reef
Adam Emerson [Thu, 6 Mar 2025 05:21:33 +0000 (00:21 -0500)]
Merge pull request #61531 from soumyakoduri/wip-skoduri-reef

reef: rgw: Fix LC process stuck issue

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 months agoMerge pull request #55431 from adk3798/reef-mcltf-true
Yuri Weinstein [Wed, 5 Mar 2025 18:43:20 +0000 (10:43 -0800)]
Merge pull request #55431 from adk3798/reef-mcltf-true

reef: qa/tasks/cephadm: enable mon_cluster_log_to_file

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 months agoMerge pull request #61434 from idryomov/wip-57864-reef
NitzanMordhai [Wed, 5 Mar 2025 16:53:57 +0000 (18:53 +0200)]
Merge pull request #61434 from idryomov/wip-57864-reef

reef: qa/tasks: Include stderr on tasks badness check.

4 months agoMerge pull request #62104 from cbodley/wip-70152
Yuri Weinstein [Tue, 4 Mar 2025 21:50:26 +0000 (13:50 -0800)]
Merge pull request #62104 from cbodley/wip-70152

reef: qa/rgw: avoid 'user rm' of keystone users

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 months agoqa/rgw: avoid 'user rm' of keystone users 62104/head
Casey Bodley [Tue, 4 Mar 2025 14:43:27 +0000 (09:43 -0500)]
qa/rgw: avoid 'user rm' of keystone users

partial backport of 2390788b89037bf5121adf4251b980dc20a8f269 did not
include a nearby change from ff81a31ad678472e6847ad39f57e14efd89b0ead

Fixes: https://tracker.ceph.com/issues/70152
Signed-off-by: Casey Bodley <cbodley@redhat.com>
4 months agoMerge pull request #61575 from zdover23/wip-doc-2025-01-30-backport-61566-to-reef
Zac Dover [Tue, 4 Mar 2025 11:57:19 +0000 (21:57 +1000)]
Merge pull request #61575 from zdover23/wip-doc-2025-01-30-backport-61566-to-reef

reef: doc/cephadm: simplify confusing math proposition

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 months agoMerge pull request #56408 from batrick/wip-65082-reef
SrinivasaBharathKanta [Mon, 3 Mar 2025 22:44:45 +0000 (04:14 +0530)]
Merge pull request #56408 from batrick/wip-65082-reef

reef: mon: do not log MON_DOWN if monitor uptime is less than threshold

4 months agoMerge pull request #62046 from pritha-srivastava/wip-69257-reef
Yuri Weinstein [Mon, 3 Mar 2025 21:31:17 +0000 (13:31 -0800)]
Merge pull request #62046 from pritha-srivastava/wip-69257-reef

reef: rgw/sts: fix to disallow unsupported JWT algorithms

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 months agoMerge pull request #62045 from nbalacha/wip-70098-reef
Yuri Weinstein [Mon, 3 Mar 2025 21:30:38 +0000 (13:30 -0800)]
Merge pull request #62045 from nbalacha/wip-70098-reef

reef: librbd: fix a crash in get_rollback_snap_id

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 months agoMerge pull request #62043 from nbalacha/wip-69983-reef
Yuri Weinstein [Mon, 3 Mar 2025 18:18:10 +0000 (10:18 -0800)]
Merge pull request #62043 from nbalacha/wip-69983-reef

reef: rbd-mirror: fix possible recursive lock of ImageReplayer::m_lock

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 months agoMerge pull request #61595 from yuvalif/wip-63630-reef
Casey Bodley [Mon, 3 Mar 2025 17:07:56 +0000 (12:07 -0500)]
Merge pull request #61595 from yuvalif/wip-63630-reef

reef: rgw/test/kafka: let consumer read events from the beginning

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 months agoMerge pull request #61973 from rhcs-dashboard/wip-70122-reef
afreen23 [Mon, 3 Mar 2025 05:34:26 +0000 (11:04 +0530)]
Merge pull request #61973 from rhcs-dashboard/wip-70122-reef

reef: mgr/dashboard: disable deleting bucket with objects

Reviewed-by: Afreen Misbah <afreen@ibm.com>
4 months agoMerge pull request #62078 from zdover23/wip-doc-2025-03-03-backport-62076-to-reef
Anthony D'Atri [Sun, 2 Mar 2025 21:10:40 +0000 (16:10 -0500)]
Merge pull request #62078 from zdover23/wip-doc-2025-03-03-backport-62076-to-reef

reef: doc/rados/operations: Clarify stretch mode vs device class

4 months agodoc/rados/operations: Clarify stretch mode vs device class 62078/head
Anthony D'Atri [Sun, 2 Mar 2025 15:43:18 +0000 (10:43 -0500)]
doc/rados/operations: Clarify stretch mode vs device class

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

4 months agoMerge pull request #61403 from ronen-fr/wip-rf-61289-reef
Ronen Friedman [Sat, 1 Mar 2025 07:43:09 +0000 (09:43 +0200)]
Merge pull request #61403 from ronen-fr/wip-rf-61289-reef

reef: common: fix md_config_cacher_t

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 months agoqa/workunits/rbd: add a test for force promote with a user snapshot 62045/head
Ilya Dryomov [Thu, 20 Feb 2025 15:38:41 +0000 (16:38 +0100)]
qa/workunits/rbd: add a test for force promote with a user snapshot

Add a reproducer for the crash on a bad variant access which was fixed
in commit 7d75161051da ("librbd: fix a crash in get_rollback_snap_id").

The reproducer deliberately works around many other issues with force
promote in snapshot-based mirroring: stopping rbd-mirror daemon
shouldn't be necessary (let alone with SIGKILL), get_rollback_snap_id()
and its caller can_create_primary_snapshot() are flawed and can pick
the wrong snapshot to roll back to or skip rollback when it's actually
required, the user snapshot in this scenario should be removed as part
of force promoting because it's incomplete and won't be usable after
the image is promoted, etc.

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

Conflicts:
qa/workunits/rbd/rbd_mirror_journal.sh [ commits 3fd8a0388735
  ("qa/workunits/rbd: merge journal and snapshot test scripts")
  and 3fdbc160bb21 ("rbd-mirror: allow mirroring to a different
  namespace") not in reef ]
qa/workunits/rbd/rbd_mirror_snapshot.sh [ duplicated/cloned for
  snapshot-based mirroring ]

4 months agoMerge pull request #62057 from zdover23/wip-doc-2025-02-28-backport-61626-to-reef
Anthony D'Atri [Fri, 28 Feb 2025 15:30:23 +0000 (10:30 -0500)]
Merge pull request #62057 from zdover23/wip-doc-2025-02-28-backport-61626-to-reef

reef: doc/rados: improve pg_num/pgp_num info

4 months agodoc/rados: improve pg_num/pgp_num info 62057/head
Zac Dover [Mon, 3 Feb 2025 13:37:34 +0000 (23:37 +1000)]
doc/rados: improve pg_num/pgp_num info

Improve the guidance around setting pg_num, and clear up confusion
around whether pgp_num should be set manually or, indeed, if it even can
be set manually.

This PR was raised in response to Mark Schouten's email here: https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/CBDJTLTTIEZVG7GVZBX37UAWGYNSSMPD/

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

4 months agomgr/dashboard: disable deleting bucket with objects 61973/head
Naman Munet [Wed, 19 Feb 2025 15:14:26 +0000 (20:44 +0530)]
mgr/dashboard: disable deleting bucket with objects

Fixes: https://tracker.ceph.com/issues/70078
Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit 11677c29ee6ee60d9191edfdbfbe37b5308eb45e)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts

4 months agoMerge pull request #61980 from rhcs-dashboard/wip-70139-reef
afreen23 [Fri, 28 Feb 2025 08:18:44 +0000 (13:48 +0530)]
Merge pull request #61980 from rhcs-dashboard/wip-70139-reef

reef: mgr/dashboard: critical confirmation modal changes

Reviewed-by: Afreen Misbah <afreen@ibm.com>
4 months ago[CVE-2024-48916] rgw/sts: fix to disallow unsupported JWT algorithms 62046/head
Pritha Srivastava [Tue, 5 Nov 2024 06:33:00 +0000 (12:03 +0530)]
[CVE-2024-48916] rgw/sts: fix to disallow unsupported JWT algorithms
while authenticating AssumeRoleWithWebIdentity using JWT obtained
from an external IDP.

fixes: https://tracker.ceph.com/issues/68836

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 919da3696668a07c6810dfa39301950c81c2eba4)

4 months agolibrbd: fix a crash in get_rollback_snap_id
N Balachandran [Wed, 19 Feb 2025 16:10:29 +0000 (21:40 +0530)]
librbd: fix a crash in get_rollback_snap_id

get_rollback_snap_id() did not check if the snapshot it was
accessing was a mirror snapshot, causing it to crash if it wasn't.

Fixes: https://tracker.ceph.com/issues/70075
Signed-off-by: N Balachandran <nithya.balachandran@ibm.com>
(cherry picked from commit 7d75161051dad8047925259555d7ddd1a3e98de2)

4 months agorbd-mirror: fix possible recursive lock of ImageReplayer::m_lock 62043/head
N Balachandran [Sat, 15 Feb 2025 13:26:31 +0000 (18:56 +0530)]
rbd-mirror: fix possible recursive lock of ImageReplayer::m_lock

If periodic status update (LambdaContext which is queued from
handle_update_mirror_image_replay_status()) races with shutdown and
ends up being the last in-flight operation that shutdown was pending
on, we attempt to recursively acquire m_lock in shut_down() because
m_in_flight_op_tracker.finish_op() is called with m_lock (and also
m_threads->timer_lock) held.  These locks are needed only for the call
to schedule_update_mirror_image_replay_status() and should be unlocked
immediately.

Fixes: https://tracker.ceph.com/issues/69978
Co-authored-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: N Balachandran <nithya.balachandran@ibm.com>
(cherry picked from commit c60514087bc29540d3babd7855c5a4e28f2bf1b0)

4 months agoMerge PR #57190 into reef
Patrick Donnelly [Fri, 28 Feb 2025 00:29:26 +0000 (19:29 -0500)]
Merge PR #57190 into reef

* refs/pull/57190/head:
pybind/mgr/mgr_module: turn off all automatic transactions
pybind/mgr: disable sqlite3/python autocommit
qa/tasks/mgr: add tests for sqlite autocommit
qa/tasks/vstart_runner: run daemons in foreground
qa/tasks/vstart_runner: add missing poll method
qa/suites/rados/mgr: add cli/devicehealth tasks
qa: reorganize mgr unit tests
qa: use position-independent link
qa: add missing terminating newline
pybind/mgr: add killpoint for sqlite3 database setup
mgr: allow specifying module option level
mon/MgrMonitor: promote standby when unsetting down flag
mon/MgrMonitor: only drop active if exists

Reviewed-by: Laura Flores <lflores@redhat.com>
4 months agoMerge pull request #61831 from idryomov/wip-69911-reef
Yuri Weinstein [Wed, 26 Feb 2025 15:59:50 +0000 (07:59 -0800)]
Merge pull request #61831 from idryomov/wip-69911-reef

reef: librbd: fix mirror image status summary in a namespace

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 months agoMerge pull request #61916 from adk3798/wip-68158-reef
Adam King [Wed, 26 Feb 2025 15:01:14 +0000 (10:01 -0500)]
Merge pull request #61916 from adk3798/wip-68158-reef

reef: cephadm: Support Docker Live Restore

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #62005 from zdover23/wip-doc-2025-02-26-backport-62001-to-reef
Zac Dover [Wed, 26 Feb 2025 13:17:01 +0000 (23:17 +1000)]
Merge pull request #62005 from zdover23/wip-doc-2025-02-26-backport-62001-to-reef

reef: doc: fix incorrect radosgw-admin subcommand

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
4 months agodoc: fix incorrect radosgw-admin subcommand 62005/head
Toshikuni Fukaya [Wed, 26 Feb 2025 04:34:23 +0000 (04:34 +0000)]
doc: fix incorrect radosgw-admin subcommand

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
(cherry picked from commit c3b7d6f19360af90ead61cd5ef8bc73ca1c7fe8f)

4 months agopybind/mgr/mgr_module: turn off all automatic transactions 57190/head
Patrick Donnelly [Wed, 12 Feb 2025 02:28:40 +0000 (21:28 -0500)]
pybind/mgr/mgr_module: turn off all automatic transactions

I misunderstood autocommit=False in prior patches. The sqlite3 binding will
still create transactions automatically which confused newer bindings using
autocommit.

So, turn off automatic transaction management completely to maintain backwards
compatibility.

Fixes: https://tracker.ceph.com/issues/69912
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit df49652987019d5eeec31c86332d8e69995d931a)

4 months agopybind/mgr: disable sqlite3/python autocommit
Patrick Donnelly [Wed, 17 Apr 2024 19:52:36 +0000 (15:52 -0400)]
pybind/mgr: disable sqlite3/python autocommit

SQLite3 and python's binding were both committing transactions at unintended
points. Turn it off and stop using executescript.

Fixes: https://tracker.ceph.com/issues/65494
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 6eacfe96625e272fdb9094ab8753e70ec163c04d)

4 months agoqa/tasks/mgr: add tests for sqlite autocommit
Patrick Donnelly [Fri, 19 Apr 2024 03:35:05 +0000 (23:35 -0400)]
qa/tasks/mgr: add tests for sqlite autocommit

That autocommit is properly turned off and that commits via context managers
work as expected.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit fb82b6d35a734cbf3c27e4dbc5e6eb2eceb30759)

4 months agoqa/tasks/vstart_runner: run daemons in foreground
Patrick Donnelly [Fri, 19 Apr 2024 03:34:16 +0000 (23:34 -0400)]
qa/tasks/vstart_runner: run daemons in foreground

This mirrors teuthology and makes it possible to check the exit status of a
daemon.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e2e2144a56bc71de739e7bc531b253a04a122b00)

4 months agoqa/tasks/vstart_runner: add missing poll method
Patrick Donnelly [Fri, 19 Apr 2024 03:31:07 +0000 (23:31 -0400)]
qa/tasks/vstart_runner: add missing poll method

Otherwise you cannot use LocalDaemon.check_status.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9748d0c465f88a5118bf3c694fc5e33116229d12)

4 months agoqa/suites/rados/mgr: add cli/devicehealth tasks
Patrick Donnelly [Thu, 18 Apr 2024 20:58:56 +0000 (16:58 -0400)]
qa/suites/rados/mgr: add cli/devicehealth tasks

These should have been part of the commit adding the tests.

Fixes: 9ebcbdbed0fbaf37d60fbd8db321742ee5721d8c
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 440f25e1eca4c3ffbe5c8451cfa0bae0502362da)

4 months agoqa: reorganize mgr unit tests
Patrick Donnelly [Tue, 23 Apr 2024 14:39:10 +0000 (10:39 -0400)]
qa: reorganize mgr unit tests

Refactor common tasks and allow loading mgrmodules before unittests start.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 2f48dc9a0034f28d06640fb6eb375aaf30d6b87d)

4 months agoqa: use position-independent link
Patrick Donnelly [Tue, 23 Apr 2024 14:26:11 +0000 (10:26 -0400)]
qa: use position-independent link

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 1749edd668060d8453933c5dbfc779f27640043c)

4 months agoqa: add missing terminating newline
Patrick Donnelly [Tue, 23 Apr 2024 14:22:00 +0000 (10:22 -0400)]
qa: add missing terminating newline

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8ac4bbc682b2e77a6402c10eca821b1c7412d631)

4 months agopybind/mgr: add killpoint for sqlite3 database setup
Patrick Donnelly [Wed, 17 Apr 2024 19:44:30 +0000 (15:44 -0400)]
pybind/mgr: add killpoint for sqlite3 database setup

To catch unintentional autocommit by sqlite3.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit fdd0dde62bbc4d84c6d77247315a5cf8eabfa13c)

4 months agomgr: allow specifying module option level
Patrick Donnelly [Fri, 19 Apr 2024 18:31:09 +0000 (14:31 -0400)]
mgr: allow specifying module option level

Some are for development purposes and should be filtered out by the dashboard.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0d94eebb0dd1b3e2afdde92e1c1051affded46f2)

4 months agomon/MgrMonitor: promote standby when unsetting down flag
Patrick Donnelly [Fri, 19 Apr 2024 02:18:57 +0000 (22:18 -0400)]
mon/MgrMonitor: promote standby when unsetting down flag

In the same epoch, to simplify testing.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e0441402d6691f68c3ea95ce60b6e3ba101a0a1e)

4 months agomon/MgrMonitor: only drop active if exists
Patrick Donnelly [Thu, 18 Apr 2024 19:40:19 +0000 (15:40 -0400)]
mon/MgrMonitor: only drop active if exists

This avoids an assertion in ::drop_active.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3fca1187460cdd05c08879b19840d78d787da9b0)

4 months agoMerge pull request #61953 from zdover23/wip-doc-2025-02-21-backport-61948-to-reef
Mike Perez [Tue, 25 Feb 2025 00:44:57 +0000 (16:44 -0800)]
Merge pull request #61953 from zdover23/wip-doc-2025-02-21-backport-61948-to-reef

reef: doc/cephadm/services: Re-improve osd.rst

4 months agoMerge pull request #61923 from adk3798/wip-69821-reef
Adam King [Mon, 24 Feb 2025 22:09:00 +0000 (17:09 -0500)]
Merge pull request #61923 from adk3798/wip-69821-reef

reef: mgr/cephadm: create OSD daemon deploy specs through make_daemon_spec

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #59457 from adk3798/wip-65725-reef
Adam King [Mon, 24 Feb 2025 22:07:44 +0000 (17:07 -0500)]
Merge pull request #59457 from adk3798/wip-65725-reef

reef: python-common: handle "anonymous_access: false" in to_json of Grafana spec

Reviewed-by: John Mulligan <jmulligan@redhat.com>
4 months agoMerge pull request #61405 from cbodley/wip-69183-reef
Yuri Weinstein [Mon, 24 Feb 2025 20:13:51 +0000 (12:13 -0800)]
Merge pull request #61405 from cbodley/wip-69183-reef

reef: Revert "rgw/auth: Fix the return code returned by AuthStrategy,"

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 months agoMerge pull request #59125 from k0ste/wip-64796-reef
Yuri Weinstein [Mon, 24 Feb 2025 19:54:22 +0000 (11:54 -0800)]
Merge pull request #59125 from k0ste/wip-64796-reef

reef: rgw: compatibility issues on BucketPublicAccessBlock

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 months agoMerge pull request #61915 from adk3798/wip-68137-reef
Adam King [Mon, 24 Feb 2025 16:54:06 +0000 (11:54 -0500)]
Merge pull request #61915 from adk3798/wip-68137-reef

reef: mgr/cephadm: add command to expose systemd units of all daemons

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

reef: mgr/cephadm: use double quotes for NFSv4 RecoveryBackend in ganesha conf

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 months agoMerge pull request #61922 from adk3798/wip-69711-reef
Adam King [Mon, 24 Feb 2025 16:51:36 +0000 (11:51 -0500)]
Merge pull request #61922 from adk3798/wip-69711-reef

reef: cephadm: rgw: allow specifying the ssl_certificate by filepath

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

reef: mgr/cephadm: mgr orchestrator module raise exception if there is trailing tab in yaml file

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

reef: mgr/cephadm: ceph orch host drain command to return error for invalid hostname

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

reef: cephadm: make bootstrap default to "global" section for public_network setting

Reviewed-by: John Mulligan <jmulligan@redhat.com>
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 agomgr/dashboard: renaming critical-confirmation-modal to delete-confirmation-modal... 61980/head
Naman Munet [Mon, 10 Feb 2025 03:34:19 +0000 (09:04 +0530)]
mgr/dashboard: renaming critical-confirmation-modal to delete-confirmation-modal and keeping default deletion impact as medium

Fixes: https://tracker.ceph.com/issues/69628
Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit 6866d6a3fe72a62b5239267d2efa42729c9aa4a4)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-initiators-list/nvmeof-initiators-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-listeners-list/nvmeof-listeners-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-namespaces-list/nvmeof-namespaces-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/nvmeof-subsystems/nvmeof-subsystems.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-group/cephfs-subvolume-group.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-list/cephfs-subvolume-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-subvolume-snapshots-list/cephfs-subvolume-snapshots-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/multi-cluster/multi-cluster-list/multi-cluster-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-progress/upgrade-progress.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-details/rgw-multisite-details.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy-details/rgw-multisite-sync-policy-details.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-sync-policy/rgw-multisite-sync-policy.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-list/rgw-storage-class-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-accounts/rgw-user-accounts.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/smb/smb-cluster-list/smb-cluster-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/delete-confirmation-modal/delete-confirmation-modal.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/crud-table/crud-table.component.ts

4 months agomgr/dashboard: Add confirmation textbox for resource name on delete action
Naman Munet [Wed, 22 Jan 2025 10:59:20 +0000 (16:29 +0530)]
mgr/dashboard: Add confirmation textbox for resource name on delete action

Before:
=====
User was able to delete a single or multiple critical resources like (  images, snapshots, subvolumes, subvolume-groups, pools, hosts , OSDs, buckets, file system, services ) by just clicking on a checkbox.

After:
=====
User now has to type the resource name that they are deleting in the textbox on the delete modal, and then only they will be able to delete the critical resource.
Also from now onwards multiple selection for deletions of critical resources is not possible. Hence, user can delete only single resource at a time. On the other side, non-critical resources can be deleted in one go.

fixes: https://tracker.ceph.com/issues/69628

Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit ed222df10900198707d7708518e02af5c06c912b)

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 agodoc/cephadm/services: Re-improve osd.rst 61953/head
Anthony D'Atri [Thu, 20 Feb 2025 21:13:44 +0000 (16:13 -0500)]
doc/cephadm/services: Re-improve osd.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.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 agomgr/cephadm: use double quotes for NFSv4 RecoveryBackend in ganesha conf 61924/head
Adam King [Wed, 12 Feb 2025 16:32:24 +0000 (11:32 -0500)]
mgr/cephadm: use double quotes for NFSv4 RecoveryBackend in ganesha conf

This came directly from someone on the ganesha team. We've actually had
this use single quotes for a long time (at least since mid 2020) but I
believe recent feature work on the ganesha side exposed the issue

ganesha.nfsd-2[main] config_errs_to_log :CONFIG :WARN :Config File (/etc/ganesha/ganesha.conf:13): Unknown token ('rados_cluster')

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

4 months agomgr/cephadm: create OSD daemon deploy specs through make_daemon_spec 61923/head
Adam King [Thu, 30 Jan 2025 14:15:37 +0000 (09:15 -0500)]
mgr/cephadm: create OSD daemon deploy specs through make_daemon_spec

That function handles setting up the extra container/entrypoint
args for the daemon during initial deployment. Having the
CephadmDaemonDeploySpec made directly in the OSD deployment
workflow means initial deployments of OSDs won't have the
extra container/entrypoint args from the spec

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

4 months agoAllow passing ssl_certificate as an rgw_frontend_extra_arg. 61922/head
aza547 [Sun, 26 Jan 2025 18:10:59 +0000 (18:10 +0000)]
Allow passing ssl_certificate as an rgw_frontend_extra_arg.

Fixes: https://tracker.ceph.com/issues/69567
Signed-off-by: Alexander Hussein-Kershaw <alexhus@microsoft.com>
fix markup

(cherry picked from commit 154307e817a0646e7171906d34353c6af0e82dee)

Conflicts:
src/pybind/mgr/cephadm/services/cephadmservice.py

4 months agomgr/cephadm: mgr orchestrator module raise exception if there is trailing tab in... 61921/head
Shweta Bhosale [Wed, 11 Dec 2024 07:37:15 +0000 (13:07 +0530)]
mgr/cephadm: mgr orchestrator module raise exception if there is trailing tab in yaml file

Fixes: https://tracker.ceph.com/issues/69192
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
(cherry picked from commit dfa632b42558278d26cabb88248aa7ae8ba8fcfc)

4 months agomgr/cephadm: orch host drain command does not return error for invalid hostname 61919/head
Shweta Bhosale [Tue, 22 Oct 2024 11:25:08 +0000 (16:55 +0530)]
mgr/cephadm: orch host drain command does not return error for invalid hostname

Fixes: https://tracker.ceph.com/issues/68681
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
(cherry picked from commit ab8d7095979322613e5cfcdd6f96befc299b408e)

4 months agocephadm: make bootstrap default to "global" section for public_network setting 61918/head
Adam King [Tue, 24 Sep 2024 16:16:14 +0000 (12:16 -0400)]
cephadm: make bootstrap default to "global" section for public_network setting

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

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 agocephadm: Support Docker Live Restore 61916/head
Michal Nasiadka [Wed, 11 Sep 2024 12:26:37 +0000 (14:26 +0200)]
cephadm: Support Docker Live Restore

Currently with Docker Live Restore [1] enabled and while restarting
Docker Engine - all Ceph container images will get restarted,
while the feature allows restarting docker.service without
containers downtime.

This is due to Requires=docker.service in systemd units templates,
which mandates that on docker.service restart - the ceph container
systemd units will be restarted as well.

Reworking Requires= to Wants= that is a weaker version of the former,
see [2].

Leaving After= entries, because they should allow systemd to correctly
order the startup (first docker, then ceph containers).

[1]: https://docs.docker.com/engine/daemon/live-restore/
[2]: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#Wants=

Fixes: https://tracker.ceph.com/issues/68028
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
(cherry picked from commit e0f77686523337f37e3ddbbe40eaa92c68947195)

Conflicts:
src/cephadm/cephadmlib/templates/ceph.service.j2
src/cephadm/cephadmlib/templates/init_ctr.service.j2
src/cephadm/cephadmlib/templates/sidecar.service.j2
src/cephadm/tests/test_unit_file.py

4 months agomgr/cephadm: add command to list systemd units of dameons 61915/head
Adam King [Thu, 1 Feb 2024 12:28:04 +0000 (07:28 -0500)]
mgr/cephadm: add command to list systemd units of dameons

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

4 months agomgr/cephadm: add systemd unit to stored info about daemons
Adam King [Wed, 31 Jan 2024 18:37:40 +0000 (13:37 -0500)]
mgr/cephadm: add systemd unit to stored info about daemons

We already collect this in `cephadm ls` but don't
store it currently. Storing it will allow us to expose
it to users who want that information.

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

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>