PWX-39064: Allow force option to be passed to CanNodeRemove (libopens…

…torage#2485) Signed-off-by: Priyanshu Pandey <[email protected]>
twang-ps · Sep 20, 2024 · 6a0a59b · 6a0a59b
1 parent 24e88ce
commit 6a0a59b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -219,7 +219,7 @@ type ClusterListenerNodeOps interface {
 	CanNodeJoin(node *api.Node, clusterInfo *ClusterInfo, nodeInitialized bool) error
 
 	// CanNodeRemove test to see if we can remove this node
-	CanNodeRemove(node *api.Node) (string, error)
+	CanNodeRemove(node *api.Node, forceRemove bool) (string, error)
 
 	// MarkNodeForRemoval instructs the listeners that the ClusterManager
 	// is going ahead with the node removal. The API does not expect any
@@ -481,7 +481,7 @@ func (nc *NullClusterListener) Remove(node *api.Node, forceRemove bool) error {
 	return nil
 }
 
-func (nc *NullClusterListener) CanNodeRemove(node *api.Node) (string, error) {
+func (nc *NullClusterListener) CanNodeRemove(node *api.Node, forceRemove bool) (string, error) {
 	return "", nil
 }
 

diff --git a/cluster/manager/manager.go b/cluster/manager/manager.go
@@ -1858,7 +1858,7 @@ func (c *ClusterManager) Remove(nodes []api.Node, forceRemove bool) error {
 			logrus.Infof("Remove node: ask cluster listener: "+
 				"can we remove node ID %s, %s",
 				nodes[i].Id, e.Value.(cluster.ClusterListener).String())
-			additionalMsg, err := e.Value.(cluster.ClusterListener).CanNodeRemove(&nodes[i])
+			additionalMsg, err := e.Value.(cluster.ClusterListener).CanNodeRemove(&nodes[i], forceRemove)
 			if err != nil && !(err == cluster.ErrRemoveCausesDataLoss && forceRemove) {
 				msg := fmt.Sprintf("Cannot remove node ID %s: %s.", nodes[i].Id, err)
 				if additionalMsg != "" {

diff --git a/cluster/mock/cluster_listener.mock.go b/cluster/mock/cluster_listener.mock.go