From 8a334de51c5f2a6f57d4d2171fd74454eb2a2b92 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 1 Dec 2021 14:41:28 -0700 Subject: [PATCH] osd: honor skipUpgradeChecks for osds Skipping upgrade checks was not being honored for OSDs. Now the flag will be checked and allow the OSDs to be upgraded without checking for the ok-to-stop condition. Signed-off-by: Travis Nielsen (cherry picked from commit 32a884ac18ec30b751e839a7747e29d35d955463) --- pkg/operator/ceph/cluster/osd/update.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/operator/ceph/cluster/osd/update.go b/pkg/operator/ceph/cluster/osd/update.go index d3e68b4feeb1..763aaa86aea4 100644 --- a/pkg/operator/ceph/cluster/osd/update.go +++ b/pkg/operator/ceph/cluster/osd/update.go @@ -79,9 +79,10 @@ func (c *updateConfig) updateExistingOSDs(errs *provisionErrors) { var osdIDs []int var err error - if !shouldCheckOkToStopFunc(c.cluster.context, c.cluster.clusterInfo) { + if c.cluster.spec.SkipUpgradeChecks || !shouldCheckOkToStopFunc(c.cluster.context, c.cluster.clusterInfo) { // If we should not check ok-to-stop, then only process one OSD at a time. There are likely // less than 3 OSDs in the cluster or the cluster is on a single node. E.g., in CI :wink:. + logger.Infof("skipping osd checks for ok-to-stop") osdIDs = []int{osdIDQuery} } else { osdIDs, err = cephclient.OSDOkToStop(c.cluster.context, c.cluster.clusterInfo, osdIDQuery, maxUpdatesInParallel)