util: gatekeep autoUnfence in GetFenceClient req

This commit modifies code to make use of enableFence
config to determine whether to auto unfence or not.

Signed-off-by: Rakshith R <[email protected]>

Author: Rakshith-R

internal/cephfs/driver.go

@@ -233,7 +233,7 @@ func (fs *cephfsDriver) setupCSIAddonsServer(conf *util.Config) error {
 	fs.cas.RegisterService(is)
 
 	if conf.IsControllerServer || conf.IsNodeServer {
-		fcs := casceph.NewFenceControllerServer()
+		fcs := casceph.NewFenceControllerServer(conf.EnableFencing)
 		fs.cas.RegisterService(fcs)
 	}
 

internal/csi-addons/cephfs/network_fence.go

@@ -33,12 +33,15 @@ import (
 // of CSI-Addons networkfence controller service spec.
 type FenceControllerServer struct {
 	*fence.UnimplementedFenceControllerServer
+	enableFencing bool
 }
 
 // NewFenceControllerServer creates a new FenceControllerServer which handles
 // the FenceController Service requests from the CSI-Addons specification.
-func NewFenceControllerServer() *FenceControllerServer {
-	return &FenceControllerServer{}
+func NewFenceControllerServer(enableFencing bool) *FenceControllerServer {
+	return &FenceControllerServer{
+		enableFencing: enableFencing,
+	}
 }
 
 // RegisterService registers the FenceControllerServer's service
@@ -124,5 +127,5 @@ func (fcs *FenceControllerServer) GetFenceClients(
 	ctx context.Context,
 	req *fence.GetFenceClientsRequest,
 ) (*fence.GetFenceClientsResponse, error) {
-	return nf.GetFenceClients(ctx, req)
+	return nf.GetFenceClients(ctx, req, fcs.enableFencing)
 }

internal/csi-addons/cephfs/network_fence_test.go

@@ -29,7 +29,7 @@ import (
 func TestFenceClusterNetwork(t *testing.T) {
 	t.Parallel()
 
-	controller := NewFenceControllerServer()
+	controller := NewFenceControllerServer(true)
 
 	req := &fence.FenceClusterNetworkRequest{
 		Parameters: map[string]string{},
@@ -46,7 +46,7 @@ func TestFenceClusterNetwork(t *testing.T) {
 // operations can not be performed.
 func TestUnfenceClusterNetwork(t *testing.T) {
 	t.Parallel()
-	controller := NewFenceControllerServer()
+	controller := NewFenceControllerServer(true)
 
 	req := &fence.UnfenceClusterNetworkRequest{
 		Parameters: map[string]string{},

internal/csi-addons/networkfence/fencing.go

@@ -461,6 +461,7 @@ func (nf *NetworkFence) parseBlocklistForCIDR(ctx context.Context, blocklist, ci
 func GetFenceClients(
 	ctx context.Context,
 	req *fence.GetFenceClientsRequest,
+	enableFencing bool,
 ) (*fence.GetFenceClientsResponse, error) {
 	options := req.GetParameters()
 	clusterID, err := util.GetClusterID(options)
@@ -509,12 +510,14 @@ func GetFenceClients(
 		return nil, status.Errorf(codes.Internal, "failed to convert IP to CIDR: %s", err)
 	}
 
-	err = autoUnfenceClientOnMatch(ctx, conn, addr)
-	if err != nil {
-		log.ErrorLog(ctx, "failed to auto unfence client: %s", err)
+	if enableFencing {
+		err = autoUnfenceClientOnMatch(ctx, conn, addr)
+		if err != nil {
+			log.ErrorLog(ctx, "failed to auto unfence client: %s", err)
 
-		return nil, status.Errorf(codes.Internal,
-			"failed to unfence client: %s", err)
+			return nil, status.Errorf(codes.Internal,
+				"failed to unfence client: %s", err)
+		}
 	}
 
 	resp := &fence.GetFenceClientsResponse{

internal/csi-addons/rbd/network_fence.go

@@ -30,12 +30,15 @@ import (
 // of CSI-addons networkfence controller service spec.
 type FenceControllerServer struct {
 	*fence.UnimplementedFenceControllerServer
+	enableFencing bool
 }
 
 // NewFenceControllerServer creates a new FenceControllerServer which handles
 // the FenceController Service requests from the CSI-Addons specification.
-func NewFenceControllerServer() *FenceControllerServer {
-	return &FenceControllerServer{}
+func NewFenceControllerServer(enableFencing bool) *FenceControllerServer {
+	return &FenceControllerServer{
+		enableFencing: enableFencing,
+	}
 }
 
 func (fcs *FenceControllerServer) RegisterService(server grpc.ServiceRegistrar) {
@@ -120,5 +123,5 @@ func (fcs *FenceControllerServer) GetFenceClients(
 	ctx context.Context,
 	req *fence.GetFenceClientsRequest,
 ) (*fence.GetFenceClientsResponse, error) {
-	return nf.GetFenceClients(ctx, req)
+	return nf.GetFenceClients(ctx, req, fcs.enableFencing)
 }

internal/csi-addons/rbd/network_fence_test.go

@@ -26,7 +26,7 @@ import (
 func TestFenceClusterNetwork(t *testing.T) {
 	t.Parallel()
 
-	controller := NewFenceControllerServer()
+	controller := NewFenceControllerServer(true)
 
 	req := &fence.FenceClusterNetworkRequest{
 		Parameters: map[string]string{},
@@ -43,7 +43,7 @@ func TestFenceClusterNetwork(t *testing.T) {
 // operations can not be performed.
 func TestUnfenceClusterNetwork(t *testing.T) {
 	t.Parallel()
-	controller := NewFenceControllerServer()
+	controller := NewFenceControllerServer(true)
 
 	req := &fence.UnfenceClusterNetworkRequest{
 		Parameters: map[string]string{},

internal/rbd/driver/driver.go

@@ -238,7 +238,7 @@ func (r *rbdDriver) setupCSIAddonsServer(conf *util.Config) error {
 
 	if conf.IsControllerServer || conf.IsNodeServer {
 		// Register FenceController only once
-		fcs := casrbd.NewFenceControllerServer()
+		fcs := casrbd.NewFenceControllerServer(conf.EnableFencing)
 		r.cas.RegisterService(fcs)
 	}
 	if conf.IsControllerServer {