Skip the error if forced to enter maintenance mode

Signed-off-by: Chi Wai Chan <[email protected]>
canonical · Jan 3, 2025 · 81663ad · 81663ad
1 parent 5d850e1
commit 81663ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/microceph/ceph/operations.go b/microceph/ceph/operations.go
@@ -11,13 +11,18 @@ import (
 )
 
 // RunOperations runs the provided operations or prints out the action plan.
-func RunOperations(name string, operations []Operation, dryRun bool) error {
+func RunOperations(name string, operations []Operation, dryRun, force bool) error {
 	for _, ops := range operations {
 		if dryRun {
 			fmt.Println(ops.DryRun(name))
 		} else {
 			err := ops.Run(name)
 			if err != nil {
+				logger.Errorf("%v", err)
+				// Skip the error if forced
+				if force {
+					return nil
+				}
 				return err
 			}
 		}

diff --git a/microceph/cmd/microceph/cluster_maintenance_enter.go b/microceph/cmd/microceph/cluster_maintenance_enter.go
@@ -51,14 +51,8 @@ func (c *cmdClusterMaintenanceEnter) Run(cmd *cobra.Command, args []string) erro
 	clusterOps := ceph.ClusterOps{CephClient: client.MClient, ClusterClient: cli}
 	operations := []ceph.Operation{
 		&ceph.CheckNodeInClusterOps{ClusterOps: clusterOps},
-	}
-
-	// pre-flight checks
-	if !c.flagForce {
-		operations = append(operations, []ceph.Operation{
-			&ceph.CheckOsdOkToStopOps{ClusterOps: clusterOps},
-			&ceph.CheckNonOsdSvcEnoughOps{ClusterOps: clusterOps, MinMon: 3, MinMds: 1, MinMgr: 1},
-		}...)
+		&ceph.CheckOsdOkToStopOps{ClusterOps: clusterOps},
+		&ceph.CheckNonOsdSvcEnoughOps{ClusterOps: clusterOps, MinMon: 3, MinMds: 1, MinMgr: 1},
 	}
 
 	// optionally set noout
@@ -76,9 +70,9 @@ func (c *cmdClusterMaintenanceEnter) Run(cmd *cobra.Command, args []string) erro
 		}...)
 	}
 
-	err = ceph.RunOperations(name, operations, c.flagDryRun)
+	err = ceph.RunOperations(name, operations, c.flagDryRun, c.flagForce)
 	if err != nil {
-		return fmt.Errorf("Failed to enter maintenance mode: %v", err)
+		return fmt.Errorf("failed to enter maintenance mode: %v", err)
 	}
 
 	return nil

diff --git a/microceph/cmd/microceph/cluster_maintenance_exit.go b/microceph/cmd/microceph/cluster_maintenance_exit.go
@@ -55,9 +55,9 @@ func (c *cmdClusterMaintenanceExit) Run(cmd *cobra.Command, args []string) error
 		&ceph.StartOsdOps{ClusterOps: clusterOps},
 	}...)
 
-	err = ceph.RunOperations(name, operations, c.flagDryRun)
+	err = ceph.RunOperations(name, operations, c.flagDryRun, false)
 	if err != nil {
-		return fmt.Errorf("Failed to exit maintenance mode: %v", err)
+		return fmt.Errorf("failed to exit maintenance mode: %v", err)
 	}
 
 	return nil