chore: add reconcile workers for cluster and component controller.

apecloud · Mar 11, 2024 · ee3c1bb · ee3c1bb
1 parent f46b068
commit ee3c1bb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -24,6 +24,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"runtime"
 	"strings"
 	"time"
 
@@ -34,7 +35,7 @@ import (
 	snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
 	"github.com/spf13/pflag"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	discoverycli "k8s.io/client-go/discovery"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -70,7 +71,7 @@ const (
 )
 
 var (
-	scheme   = runtime.NewScheme()
+	scheme   = k8sruntime.NewScheme()
 	setupLog = ctrl.Log.WithName("setup")
 )
 
@@ -109,6 +110,7 @@ func init() {
 	viper.SetDefault(constant.KBDataScriptClientsImage, "apecloud/kubeblocks-datascript:latest")
 	viper.SetDefault(constant.KubernetesClusterDomainEnv, constant.DefaultDNSDomain)
 	viper.SetDefault(rsm.FeatureGateRSMCompatibilityMode, true)
+	viper.SetDefault(constant.CfgKBReconcileWorkers, runtime.NumCPU())
 }
 
 type flagName string

diff --git a/controllers/apps/cluster_controller.go b/controllers/apps/cluster_controller.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -223,6 +224,9 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	// TODO: add filter predicate for core API objects
 	b := ctrl.NewControllerManagedBy(mgr).
 		For(&appsv1alpha1.Cluster{}).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: viper.GetInt(constant.CfgKBReconcileWorkers),
+		}).
 		Owns(&appsv1.StatefulSet{}).
 		Owns(&appsv1.Deployment{}).
 		Owns(&workloads.ReplicatedStateMachine{}).

diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml
@@ -69,6 +69,10 @@ spec:
             - name: CM_AFFINITY
               value: {{ toJson . | quote }}
             {{- end }}
+            {{- if .Values.reconcileWorkers }}
+            - name: KUBEBLOCKS_RECONCILE_WORKERS
+              values: {{ .Values.reconcileWorkers }}
+            {{- end }}
             {{- with .Values.nodeSelector }}
             - name: CM_NODE_SELECTOR
               value: {{ toJson . | quote }}

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -27,6 +27,10 @@ image:
 ##
 replicaCount: 1
 
+## MaxConcurrentReconciles for cluster and component controllers.
+##
+reconcileWorkers: ""
+
 ## @param nameOverride
 ##
 nameOverride: ""

diff --git a/pkg/constant/const.go b/pkg/constant/const.go
@@ -49,6 +49,8 @@ const (
 
 	// customized encryption key for encrypting the password of connection credential.
 	CfgKeyDPEncryptionKey = "DP_ENCRYPTION_KEY"
+
+	CfgKBReconcileWorkers = "KUBEBLOCKS_RECONCILE_WORKERS"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,8 @@ const ( @@
     	// customized encryption key for encrypting the password of connection credential.
     	CfgKeyDPEncryptionKey = "DP_ENCRYPTION_KEY"
+    	CfgKBReconcileWorkers = "KUBEBLOCKS_RECONCILE_WORKERS"
     )
     const (
@@ Expand Down @@