bump worker threads for node-vm attachment and batch attachment

Author: divyenpatel

manifests/supervisorcluster/1.29/cns-csi.yaml

@@ -485,6 +485,10 @@ spec:
               value: "30"
             - name: VOLUME_HEALTH_INTERVAL_MINUTES
               value: "5"
+            - name: WORKER_THREADS_NODEVM_ATTACH
+              value: "20"
+            - name: WORKER_THREADS_NODEVM_BATCH_ATTACH
+              value: "20"
             - name: POD_POLL_INTERVAL_SECONDS
               value: "2"
             - name: POD_LISTENER_SERVICE_PORT

manifests/supervisorcluster/1.30/cns-csi.yaml

@@ -488,6 +488,10 @@ spec:
               value: "30"
             - name: VOLUME_HEALTH_INTERVAL_MINUTES
               value: "5"
+            - name: WORKER_THREADS_NODEVM_ATTACH
+              value: "20"
+            - name: WORKER_THREADS_NODEVM_BATCH_ATTACH
+              value: "20"
             - name: POD_POLL_INTERVAL_SECONDS
               value: "2"
             - name: POD_LISTENER_SERVICE_PORT

manifests/supervisorcluster/1.31/cns-csi.yaml

@@ -488,6 +488,10 @@ spec:
               value: "30"
             - name: VOLUME_HEALTH_INTERVAL_MINUTES
               value: "5"
+            - name: WORKER_THREADS_NODEVM_ATTACH
+              value: "20"
+            - name: WORKER_THREADS_NODEVM_BATCH_ATTACH
+              value: "20"
             - name: POD_POLL_INTERVAL_SECONDS
               value: "2"
             - name: POD_LISTENER_SERVICE_PORT

manifests/supervisorcluster/1.32/cns-csi.yaml

@@ -488,6 +488,10 @@ spec:
               value: "30"
             - name: VOLUME_HEALTH_INTERVAL_MINUTES
               value: "5"
+            - name: WORKER_THREADS_NODEVM_ATTACH
+              value: "20"
+            - name: WORKER_THREADS_NODEVM_BATCH_ATTACH
+              value: "20"
             - name: POD_POLL_INTERVAL_SECONDS
               value: "2"
             - name: POD_LISTENER_SERVICE_PORT

pkg/syncer/cnsoperator/controller/cnsnodevmattachment/cnsnodevmattachment_controller.go

@@ -58,7 +58,7 @@ import (
 
 const (
 	workerThreadsEnvVar     = "WORKER_THREADS_NODEVM_ATTACH"
-	defaultMaxWorkerThreads = 10
+	defaultMaxWorkerThreads = 20
 )
 
 // backOffDuration is a map of cnsnodevmattachment name's to the time after

pkg/syncer/cnsoperator/controller/cnsnodevmbatchattachment/cnsnodevmbatchattachment_controller.go

@@ -69,7 +69,7 @@ var (
 
 const (
 	workerThreadsEnvVar     = "WORKER_THREADS_NODEVM_BATCH_ATTACH"
-	defaultMaxWorkerThreads = 10
+	defaultMaxWorkerThreads = 20
 )
 
 func Add(mgr manager.Manager, clusterFlavor cnstypes.CnsClusterFlavor,

pkg/syncer/cnsoperator/util/util.go

@@ -368,8 +368,7 @@ func GetDatacenterObjectList(ctx context.Context,
 // spawned by a controller to reconciler instances of a CRD. It reads the
 // value from an environment variable identified by 'key'. If the environment
 // variable is not set or has an invalid value, it returns the 'defaultVal'.
-// The value of the environment variable should be a positive integer less
-// than or equal to 'defaultVal'.
+// The value of the environment variable should be a positive integer
 func GetMaxWorkerThreads(ctx context.Context, key string, defaultVal int) int {
 	log := logger.GetLogger(ctx).With("field", key)
 	workerThreads := defaultVal
@@ -388,7 +387,7 @@ func GetMaxWorkerThreads(ctx context.Context, key string, defaultVal int) int {
 	}
 
 	switch {
-	case val <= 0 || val > defaultVal:
+	case val <= 0:
 		log.Warnf("Value %d for environment variable is invalid. Using default value %d",
 			val, defaultVal)
 	default:

pkg/syncer/cnsoperator/util/util_test.go

@@ -185,20 +185,4 @@ func TestGetMaxWorkerThreads(t *testing.T) {
 		// Assert
 		assert.Equal(t, expVal, val)
 	})
-
-	t.Run("WhenEnvValid", func(t *testing.T) {
-		// Setup
-		err := os.Setenv(envVar, "10")
-		if err != nil {
-			t.Fatalf("Failed to set env var: %v", err)
-		}
-
-		defVal, expVal := 50, 10
-
-		// Execute
-		val := GetMaxWorkerThreads(context.Background(), envVar, defVal)
-
-		// Assert
-		assert.Equal(t, expVal, val)
-	})
 }