fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

config/samples/config.yaml

@@ -7,10 +7,10 @@ controller_name: apisix.apache.org/api7-ingress-controller  # The controller nam
 leader_election_id: "api7-ingress-controller-leader" # The leader election ID for the API7 Ingress Controller.
                                                         # The default value is "api7-ingress-controller-leader".
 leader_election:
-  lease_duration: 15s                   # lease_duration is the duration that non-leader candidates will wait
+  lease_duration: 30s                   # lease_duration is the duration that non-leader candidates will wait
                                         # after observing a leadership renewal until attempting to acquire leadership of a
                                         # leader election.
-  renew_deadline: 10s                   # renew_deadline is the time in seconds that the acting controller
+  renew_deadline: 20s                   # renew_deadline is the time in seconds that the acting controller
                                         # will retry refreshing leadership before giving up.
   retry_period: 2s                      # retry_period is the time in seconds that the acting controller
                                         # will wait between tries of actions with the controller.

internal/controller/config/config.go

@@ -37,8 +37,8 @@ func NewDefaultConfig() *Config {
 
 func NewLeaderElection() *LeaderElection {
 	return &LeaderElection{
-		LeaseDuration: types.TimeDuration{Duration: 15 * time.Second},
-		RenewDeadline: types.TimeDuration{Duration: 10 * time.Second},
+		LeaseDuration: types.TimeDuration{Duration: 30 * time.Second},
+		RenewDeadline: types.TimeDuration{Duration: 20 * time.Second},
 		RetryPeriod:   types.TimeDuration{Duration: 2 * time.Second},
 		Disable:       false,
 	}

internal/controller/config/types.go

@@ -50,8 +50,8 @@ type ControlPlaneConfig struct {
 }
 
 type LeaderElection struct {
-	LeaseDuration types.TimeDuration `json:"leaseDuration,omitempty" yaml:"leaseDuration,omitempty"`
-	RenewDeadline types.TimeDuration `json:"renewDeadline,omitempty" yaml:"renewDeadline,omitempty"`
-	RetryPeriod   types.TimeDuration `json:"retryPeriod,omitempty" yaml:"retryPeriod,omitempty"`
+	LeaseDuration types.TimeDuration `json:"lease_duration,omitempty" yaml:"lease_duration,omitempty"`
+	RenewDeadline types.TimeDuration `json:"renew_deadline,omitempty" yaml:"renew_deadline,omitempty"`
+	RetryPeriod   types.TimeDuration `json:"retry_period,omitempty" yaml:"retry_period,omitempty"`
 	Disable       bool               `json:"disable,omitempty" yaml:"disable,omitempty"`
 }

internal/provider/adc/adc.go

@@ -32,6 +32,8 @@ type adcConfig struct {
 type adcClient struct {
 	sync.Mutex
 
+	execLock sync.Mutex
+
 	translator *translator.Translator
 	// gateway/ingressclass -> adcConfig
 	configs map[provider.ResourceKind]adcConfig
@@ -227,6 +229,9 @@ func (d *adcClient) sync(ctx context.Context, task Task) error {
 }
 
 func (d *adcClient) execADC(ctx context.Context, config adcConfig, args []string) error {
+	d.execLock.Lock()
+	defer d.execLock.Unlock()
+
 	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.syncTimeout)
 	defer cancel()
 	// todo: use adc config