PWX-37595: honour force flag over node status

Signed-off-by: sanjain <[email protected]>
libopenstorage · Aug 29, 2024 · 01748bf · 01748bf
1 parent 2d20853
commit 01748bf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cluster/manager/manager.go b/cluster/manager/manager.go
@@ -1830,7 +1830,8 @@ func (c *ClusterManager) Remove(nodes []api.Node, forceRemove bool) error {
 			// If node is not down, do not remove it
 			if nodeCacheStatus != api.Status_STATUS_OFFLINE &&
 				nodeCacheStatus != api.Status_STATUS_MAINTENANCE &&
-				nodeCacheStatus != api.Status_STATUS_DECOMMISSION {
+				nodeCacheStatus != api.Status_STATUS_DECOMMISSION &&
+				!forceRemove {
 
 				msg := fmt.Sprintf(decommissionErrMsg, nodes[i].Id)
 				logrus.Errorf(msg+", node status: %s", nodeCacheStatus)