feat: improve configuration of concurrent yurtappdaemon workers (#1912)…

… (#1981) Signed-off-by: Chenzhao Huang <[email protected]>
openyurtio · vie-serendipity · Mar 6, 2024 · Mar 7, 2024 · Mar 7, 2024 · Mar 7, 2024
commit f0a74455e0e12f8f9540e697c9e4c582b8ed9cb8
diff --git a/cmd/yurt-manager/app/options/yurtappdaemoncontroller.go b/cmd/yurt-manager/app/options/yurtappdaemoncontroller.go
@@ -28,7  28,9 @@ type YurtAppDaemonControllerOptions struct {
 
 func NewYurtAppDaemonControllerOptions() *YurtAppDaemonControllerOptions {
 	return &YurtAppDaemonControllerOptions{
-		&config.YurtAppDaemonControllerConfiguration{},
 		&config.YurtAppDaemonControllerConfiguration{
 			ConcurrentYurtAppDaemonWorkers: 3,
 		},
 	}
 }
 
@@ -39,14  41,15 @@ func (o *YurtAppDaemonControllerOptions) AddFlags(fs *pflag.FlagSet) {
 	}
 
 	//fs.BoolVar(&n.CreateDefaultPool, "create-default-pool", n.CreateDefaultPool, "Create default cloud/edge pools if indicated.")
 	fs.Int32Var(&o.ConcurrentYurtAppDaemonWorkers, "concurrent-yurtappdaemon-workers", o.ConcurrentYurtAppDaemonWorkers, "The number of yurtappdaemon objects that are allowed to reconcile concurrently. Larger number = more responsive yurtappdaemons, but more CPU (and network) load")
 }
 
 // ApplyTo fills up YurtAppDaemon config with options.
 func (o *YurtAppDaemonControllerOptions) ApplyTo(cfg *config.YurtAppDaemonControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}
-
 	cfg.ConcurrentYurtAppDaemonWorkers = o.ConcurrentYurtAppDaemonWorkers
 	return nil
 }
 

diff --git a/pkg/yurtmanager/controller/yurtappdaemon/config/types.go b/pkg/yurtmanager/controller/yurtappdaemon/config/types.go
@@ -18,4  18,5 @@ package config
 
 // YurtAppDaemonControllerConfiguration contains elements describing YurtAppDaemonController.
 type YurtAppDaemonControllerConfiguration struct {
 	ConcurrentYurtAppDaemonWorkers int32
 }
diff --git a/pkg/yurtmanager/controller/yurtappdaemon/yurtappdaemon_controller.go b/pkg/yurtmanager/controller/yurtappdaemon/yurtappdaemon_controller.go
@@ -18,7  18,6 @@ package yurtappdaemon
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"reflect"
 
@@ -45,8  44,7 @@ import (
 )
 
 var (
-	concurrentReconciles = 3
-	controllerResource   = unitv1alpha1.SchemeGroupVersion.WithResource("yurtappdaemons")
 	controllerResource = unitv1alpha1.SchemeGroupVersion.WithResource("yurtappdaemons")
 )
 
 const (
@@ -60,10  58,6 @@ const (
 	eventTypeWorkloadsDeleted = "DeleteWorkload"
 )
 
-func init() {
-	flag.IntVar(&concurrentReconciles, "yurtappdaemon-workers", concurrentReconciles, "Max concurrent workers for YurtAppDaemon controller.")
-}
-
 func Format(format string, args ...interface{}) string {
 	s := fmt.Sprintf(format, args...)
 	return fmt.Sprintf("%s: %s", names.YurtAppDaemonController, s)
@@ -79,13  73,13 @@ func Add(ctx context.Context, c *config.CompletedConfig, mgr manager.Manager) er
 	}
 
 	klog.Infof("yurtappdaemon-controller add controller %s", controllerResource.String())
-	return add(mgr, newReconciler(mgr))
 	return add(mgr, c, newReconciler(mgr))
 }
 
 // add adds a new Controller to mgr with r as the reconcile.Reconciler
-func add(mgr manager.Manager, r reconcile.Reconciler) error {
 func add(mgr manager.Manager, cfg *config.CompletedConfig, r reconcile.Reconciler) error {
 	// Create a new controller
-	c, err := controller.New(names.YurtAppDaemonController, mgr, controller.Options{Reconciler: r, MaxConcurrentReconciles: concurrentReconciles})
 	c, err := controller.New(names.YurtAppDaemonController, mgr, controller.Options{Reconciler: r, MaxConcurrentReconciles: int(cfg.Config.ComponentConfig.YurtAppDaemonController.ConcurrentYurtAppDaemonWorkers)})
 	if err != nil {
 		return err
 	}