rgw: skip non-raw commands on object deletion path when pools not exists

Signed-off-by: Artem Torubarov <artem.torubarov@sap.com>
This commit is contained in:
Artem Torubarov committed 2026-02-26 09:48:15 +01:00
1 parent b47d2c2f79
commit a7f176b366
6 files changed
+46 -24

No files matched your search

+14 -13
View File
@@ -382,22 +382,23 @@ func (r *ReconcileCephObjectStore) reconcile(request reconcile.Request) (reconci
// Check dependents only if we have a working multisite context.
// Context may be nil when zone/zonegroup/realm CRDs are already deleted.
if objCtx != nil {
opsCtx, err := NewMultisiteAdminOpsContext(objCtx, &cephObjectStore.Spec)
if err != nil {
// If admin ops context fails during deletion, skip dependency check.
// The store may never have been fully created (e.g. pools didn't exist),
// so there can't be any dependents.
log.NamedWarning(request.NamespacedName, logger, "failed to get admin ops context during deletion, skipping dependency check: %v", err)
if !poolsExistForNonRawOps(objCtx) {
log.NamedInfo(request.NamespacedName, logger, "skipping bucket dependency check during deletion")
} else {
deps, err := cephObjectStoreDependents(r.context, r.clusterInfo, cephObjectStore, objCtx, opsCtx)
opsCtx, err := NewMultisiteAdminOpsContext(objCtx, &cephObjectStore.Spec)
if err != nil {
return reconcile.Result{}, *cephObjectStore, err
log.NamedWarning(request.NamespacedName, logger, "failed to get admin ops context during deletion, skipping dependency check: %v", err)
} else {
deps, err := cephObjectStoreDependents(r.context, r.clusterInfo, cephObjectStore, objCtx, opsCtx)
if err != nil {
return reconcile.Result{}, *cephObjectStore, err
}
if !deps.Empty() {
err := reporting.ReportDeletionBlockedDueToDependents(r.opManagerContext, logger, r.client, cephObjectStore, deps)
return opcontroller.WaitForRequeueIfFinalizerBlocked, *cephObjectStore, err
}
reporting.ReportDeletionNotBlockedDueToDependents(r.opManagerContext, logger, r.client, r.recorder, cephObjectStore)
}
if !deps.Empty() {
err := reporting.ReportDeletionBlockedDueToDependents(r.opManagerContext, logger, r.client, cephObjectStore, deps)
return opcontroller.WaitForRequeueIfFinalizerBlocked, *cephObjectStore, err
}
reporting.ReportDeletionNotBlockedDueToDependents(r.opManagerContext, logger, r.client, r.recorder, cephObjectStore)
}
}
@@ -669,6 +669,9 @@ func TestCephObjectStoreControllerMultisite(t *testing.T) {
if args[0] == "osd" && args[1] == "pool" && args[2] == "get" {
return "", errors.New("test pool does not exit yet")
}
if args[0] == "osd" && args[1] == "lspools" {
return `[{"poolnum":1,"poolname":"zone-a.rgw.control"},{"poolnum":2,"poolname":"zone-a.rgw.meta"},{"poolnum":3,"poolname":"zone-a.rgw.log"},{"poolnum":4,"poolname":"zone-a.rgw.buckets.index"},{"poolnum":5,"poolname":"zone-a.rgw.buckets.non-ec"},{"poolnum":6,"poolname":"zone-a.rgw.otp"},{"poolnum":7,"poolname":"zone-a.rgw.buckets.data"},{"poolnum":8,"poolname":".rgw.root"}]`, nil
}
if args[0] == "versions" {
return dummyVersionsRaw, nil
}
@@ -761,6 +764,8 @@ func TestCephObjectStoreControllerMultisite(t *testing.T) {
})
t.Run("delete the same store", func(t *testing.T) {
calledCommitConfigChanges = false
// Simulate that the store was already created and has endpoints in the zone
zoneGroupGetMultisiteJSON = zoneGroupGetMultisiteJSONWithEndpoint
// no dependents
dependentsChecked := false
@@ -1040,6 +1045,9 @@ func TestCephObjectExternalStoreController(t *testing.T) {
if args[0] == "osd" && args[1] == "pool" && args[2] == "get" {
return "", errors.New("test pool does not exit yet")
}
if args[0] == "osd" && args[1] == "lspools" {
return `[{"poolnum":1,"poolname":"default.rgw.control"},{"poolnum":2,"poolname":"default.rgw.meta"},{"poolnum":3,"poolname":"default.rgw.log"},{"poolnum":4,"poolname":"default.rgw.buckets.index"},{"poolnum":5,"poolname":"default.rgw.buckets.non-ec"},{"poolnum":6,"poolname":"default.rgw.otp"},{"poolnum":7,"poolname":"default.rgw.buckets.data"},{"poolnum":8,"poolname":".rgw.root"}]`, nil
}
if args[0] == "versions" {
return dummyVersionsRaw, nil
}
+21 -10
View File
@@ -189,16 +189,7 @@ func deleteSingleSiteRealmAndPools(objContext *Context, spec cephv1.ObjectStoreS
if !spec.PreservePoolsOnDelete {
if EmptyPool(spec.DataPool) && EmptyPool(spec.MetadataPool) {
if !IsNeedToCreateObjectStorePools(spec.SharedPools) {
// When shared pools are configured, "radosgw-admin zone delete" may leave behind
// per-zone pools (e.g., store-a.rgw.control, store-a.rgw.meta).
log.NamedInfo(objContext.NsName(), logger, "cleaning up per-zone ghost pools left by realm deletion")
if err := DeletePools(objContext, lastStore, objContext.Name); err != nil {
log.NamedWarning(objContext.NsName(), logger, "failed to clean up ghost pools: %v", err)
}
} else {
log.NamedInfo(objContext.NsName(), logger, "skipping removal of pools since not specified in the object store")
}
log.NamedInfo(objContext.NsName(), logger, "skipping removal of pools since not specified in the object store")
return nil
}
err = DeletePools(objContext, lastStore, objContext.Name)
@@ -758,6 +749,26 @@ func missingPools(context *Context) ([]string, error) {
return missingPools, nil
}
// poolsExistForNonRawOps checks whether all object store pools exist.
// Non-raw radosgw-admin commands (ones not in RGW raw_storage_ops_list, see:
// https://github.com/ceph/ceph/blob/649c3131862d310ce0b273dcbe08ebca0c2ec7ec/src/rgw/radosgw-admin/radosgw-admin.cc#L4540-L4567
// )
// trigger full RGW initialization which auto-creates default pools — for example user info called by disableRGWDashboard and
// user create called by NewMultisiteAdminOpsContext during store deletion.
// Use this function on delete reconciliation path to skip non-raw commands if pools were not created.
func poolsExistForNonRawOps(context *Context) bool {
missing, err := missingPools(context)
if err != nil {
log.NamedWarning(context.NsName(), logger, "failed to check for missing pools, assuming they don't exist to avoid ghost pool creation: %v", err)
return false
}
if len(missing) > 0 {
log.NamedInfo(context.NsName(), logger, "some object store pools are missing, skipping non-raw radosgw-admin operations to avoid ghost pool creation: %v", missing)
return false
}
return true
}
func CreateObjectStorePools(context *Context, cluster *cephv1.ClusterSpec, metadataPool, dataPool cephv1.PoolSpec) error {
if EmptyPool(dataPool) || EmptyPool(metadataPool) {
log.NamedInfo(context.NsName(), logger, "no pools specified for the CR, checking for their existence...")
+3 -1
View File
@@ -283,7 +283,9 @@ func (c *clusterConfig) deleteStore() {
if objContext != nil {
objContext.Endpoint = c.store.Status.Info["endpoint"]
go disableRGWDashboard(objContext)
if poolsExistForNonRawOps(objContext) {
go disableRGWDashboard(objContext)
}
err = deleteRealmAndPools(objContext, c.store.Spec)
if err != nil {