fix: sync performance degradation caused by lock competition

Author: AlinsRan

internal/adc/client/client.go

@@ -39,7 +39,8 @@ import (
 )
 
 type Client struct {
-	mu sync.Mutex
+	syncMu sync.Mutex
+	mu     sync.Mutex
 	*cache.Store
 
 	executor    ADCExecutor
@@ -74,9 +75,7 @@ type Task struct {
 
 func (d *Client) Update(ctx context.Context, args Task) error {
 	d.mu.Lock()
-	defer d.mu.Unlock()
 	deleteConfigs := d.ConfigManager.Update(args.Key, args.Configs)
-
 	for _, config := range deleteConfigs {
 		if err := d.Store.Delete(config.Name, args.ResourceTypes, args.Labels); err != nil {
 			log.Errorw("failed to delete resources from store",
@@ -96,6 +95,7 @@ func (d *Client) Update(ctx context.Context, args Task) error {
 			return err
 		}
 	}
+	d.mu.Unlock()
 
 	if len(deleteConfigs) > 0 {
 		err := d.sync(ctx, Task{
@@ -140,8 +140,6 @@ func (d *Client) UpdateConfig(ctx context.Context, args Task) error {
 
 func (d *Client) Delete(ctx context.Context, args Task) error {
 	d.mu.Lock()
-	defer d.mu.Unlock()
-
 	configs := d.ConfigManager.Get(args.Key)
 	d.ConfigManager.Delete(args.Key)
 
@@ -154,6 +152,7 @@ func (d *Client) Delete(ctx context.Context, args Task) error {
 			return err
 		}
 	}
+	d.mu.Unlock()
 
 	return d.sync(ctx, Task{
 		Labels:        args.Labels,
@@ -183,8 +182,8 @@ func (d *Client) DeleteConfig(ctx context.Context, args Task) error {
 }
 
 func (c *Client) Sync(ctx context.Context) (map[string]types.ADCExecutionErrors, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
+	c.syncMu.Lock()
+	defer c.syncMu.Unlock()
 	log.Debug("syncing all resources")
 
 	configs := c.ConfigManager.List()
@@ -194,16 +193,12 @@ func (c *Client) Sync(ctx context.Context) (map[string]types.ADCExecutionErrors,
 		return nil, nil
 	}
 
-	cfg := map[string]adctypes.Config{}
-	for _, config := range configs {
-		cfg[config.Name] = config
-	}
-
-	log.Debugw("syncing resources with multiple configs", zap.Any("configs", cfg))
+	log.Debugw("syncing resources with multiple configs", zap.Any("configs", configs))
 
 	failedMap := map[string]types.ADCExecutionErrors{}
 	var failedConfigs []string
-	for name, config := range cfg {
+	for _, config := range configs {
+		name := config.Name
 		resources, err := c.GetResources(name)
 		if err != nil {
 			log.Errorw("failed to get resources from store", zap.String("name", name), zap.Error(err))

internal/adc/client/executor.go

@@ -52,9 +52,6 @@ type DefaultADCExecutor struct {
 }
 
 func (e *DefaultADCExecutor) Execute(ctx context.Context, mode string, config adctypes.Config, args []string) error {
-	e.Lock()
-	defer e.Unlock()
-
 	return e.runADC(ctx, mode, config, args)
 }
 
@@ -225,7 +222,6 @@ type ADCServerOpts struct {
 
 // HTTPADCExecutor implements ADCExecutor interface using HTTP calls to ADC Server
 type HTTPADCExecutor struct {
-	sync.Mutex
 	httpClient *http.Client
 	serverURL  string
 }
@@ -242,9 +238,6 @@ func NewHTTPADCExecutor(serverURL string, timeout time.Duration) *HTTPADCExecuto
 
 // Execute implements the ADCExecutor interface using HTTP calls
 func (e *HTTPADCExecutor) Execute(ctx context.Context, mode string, config adctypes.Config, args []string) error {
-	e.Lock()
-	defer e.Unlock()
-
 	return e.runHTTPSync(ctx, mode, config, args)
 }