Skip to content

Commit

Permalink
osd: honor skipUpgradeChecks for osds
Browse files Browse the repository at this point in the history
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 <tnielsen@redhat.com>
  • Loading branch information
travisn committed Dec 1, 2021
1 parent baa67c8 commit 32a884a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/operator/ceph/cluster/osd/update.go
Expand Up @@ -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)
Expand Down

0 comments on commit 32a884a

Please sign in to comment.