Copilot commented on code in PR #2534: URL: https://github.com/apache/apisix-ingress-controller/pull/2534#discussion_r2313602954
########## internal/provider/common/retrier.go: ########## @@ -0,0 +1,96 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package common + +import ( + "sync" + "time" +) + +type Backoff interface { + Next() time.Duration + Reset() +} + +type ExponentialBackoff struct { + base, max, current time.Duration +} + +func NewExponentialBackoff(base, max time.Duration) *ExponentialBackoff { + return &ExponentialBackoff{base: base, max: max, current: base} +} + +func (b *ExponentialBackoff) Next() time.Duration { + delay := b.current + b.current *= 2 + if b.current > b.max { + b.current = b.max + } + return delay +} + +func (b *ExponentialBackoff) Reset() { + b.current = b.base +} + +type Retrier struct { + mu sync.Mutex + ch chan struct{} + timer *time.Timer + backoff Backoff +} + +func NewRetrier(b Backoff) *Retrier { + return &Retrier{ + ch: make(chan struct{}, 1), + backoff: b, + } +} + +func (r *Retrier) Reset() { + r.mu.Lock() + defer r.mu.Unlock() + + if r.timer != nil { + r.timer.Stop() + r.timer = nil + } + r.backoff.Reset() +} + +func (r *Retrier) Next() { + r.mu.Lock() + defer r.mu.Unlock() + + if r.timer != nil { + r.timer.Stop() + r.timer = nil + } + + delay := r.backoff.Next() + r.timer = time.AfterFunc(delay, func() { + select { + case r.ch <- struct{}{}: + default: + } + }) Review Comment: Potential race condition: the timer callback accesses r.ch without holding the mutex, while Reset() and Next() methods modify r.timer under mutex protection. This could lead to inconsistent state if Reset() is called while the timer callback is executing. ########## internal/provider/apisix/provider.go: ########## @@ -223,33 +231,32 @@ func (d *apisixProvider) Start(ctx context.Context) error { initalSyncDelay := d.InitSyncDelay if initalSyncDelay > 0 { - time.AfterFunc(initalSyncDelay, func() { - if err := d.sync(ctx); err != nil { - log.Error(err) - return - } - }) + time.AfterFunc(initalSyncDelay, d.syncNotify) } - if d.SyncPeriod < 1 { - return nil + syncPeriod := d.SyncPeriod + if syncPeriod < MinSyncPeriod { + syncPeriod = MinSyncPeriod } - ticker := time.NewTicker(d.SyncPeriod) + ticker := time.NewTicker(syncPeriod) defer ticker.Stop() + + retrier := common.NewRetrier(common.NewExponentialBackoff(RetryBaseDelay, RetryMaxDelay)) + for { - synced := false select { case <-d.syncCh: - synced = true case <-ticker.C: - synced = true + case <-retrier.C(): case <-ctx.Done(): + retrier.Reset() return nil Review Comment: The SyncPeriod validation logic is incorrect. The original code returned early when SyncPeriod < 1, meaning no periodic syncing would occur. This change forces a minimum sync period of 1 second even when the user explicitly disables periodic syncing by setting it to 0. ########## test/e2e/framework/manifests/ingress.yaml: ########## @@ -333,7 +333,7 @@ data: # The period between two consecutive syncs. # The default value is 0 seconds, which means the controller will not sync. # If you want to enable the sync, set it to a positive value. - init_sync_delay: {{ .InitSyncDelay | default "1m" }} + init_sync_delay: {{ .InitSyncDelay | default "20m" }} Review Comment: [nitpick] Increasing the default init_sync_delay from 1m to 20m significantly impacts test execution time and may not be necessary for all test scenarios. Consider making this configurable per test case instead of changing the global default. ```suggestion init_sync_delay: {{ .InitSyncDelay | default "1m" }} ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
