From ef0ed93134267f7b5dbe852fabb58ad028f506eb Mon Sep 17 00:00:00 2001 From: Brian Dowling Date: Thu, 23 May 2024 02:30:56 -0400 Subject: [PATCH] osd: reduce safe-to-destroy retry timeout to 15s This reduces the safe-to-remove retry interval from 1m to 15s. Closes #14247 Signed-off-by: Brian Dowling --- pkg/daemon/ceph/osd/remove.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/daemon/ceph/osd/remove.go b/pkg/daemon/ceph/osd/remove.go index d48b78f1a..a788d51f3 100644 --- a/pkg/daemon/ceph/osd/remove.go +++ b/pkg/daemon/ceph/osd/remove.go @@ -84,7 +84,7 @@ func removeOSD(clusterdContext *clusterd.Context, clusterInfo *client.ClusterInf logger.Errorf("failed to exclude osd.%d out of the crush map. %v", osdID, err) } - // Check we can remove the OSD + // Check if we can safely remove the OSD // Loop forever until the osd is safe-to-destroy for { isSafeToDestroy, err := client.OsdSafeToDestroy(clusterdContext, clusterInfo, osdID) @@ -112,8 +112,8 @@ func removeOSD(clusterdContext *clusterd.Context, clusterInfo *client.ClusterInf break } // Else we wait until the OSD can be removed - logger.Warningf("osd.%d is NOT ok to destroy, retrying in 1m until success", osdID) - time.Sleep(1 * time.Minute) + logger.Warningf("osd.%d is NOT ok to destroy, retrying in 15s until success", osdID) + time.Sleep(15 * time.Second) } }