mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-18 22:14:29 +00:00
473f7529e1
Run the E2E test on kind / setup-test-matrix (push) Failing after 3s
e2e-test-kind.yaml / extract (push) Failing after 5s
Run the E2E test on kind / get-go-version (push) Failing after 6s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Failing after 5s
Main CI / get-go-version (push) Failing after 6s
Main CI / Build (push) Skipped
Scorecard supply-chain security / Scorecard analysis (push) Skipped
* Fix backup queue permanently stuck when a dequeued backup completes during the patch Motivation: backupQueueReconciler patched a dequeued backup to ReadyToStart and only called backupTracker.AddReadyToStart on the next line. If backupReconciler picked up that patch and completed the backup (e.g. immediate FailedValidation while a BackupStorageLocation is briefly unavailable) before the queue controller reached that line, backupReconciler's Add + deferred Delete ran first, and the later AddReadyToStart re-inserted a tracker key nothing would ever delete again. backupTracker is in-memory and never reconciled against actual Backup phases, so RunningCount() stayed stuck at concurrentBackups and every later reconcile, including the periodic recheck, was refused at that gate -- the queue stopped dequeuing permanently until the deployment restarted. Approach: record the backup as ReadyToStart in the tracker before patching it, and roll that back if the patch itself fails, so the tracker entry always exists before the backup can become visible to any other reconciler. Also folds in two related fixes: the concurrency-refusal log line is now Info instead of Debug so a stuck queue is visible at the default log level, and the queue-position renumbering loop's error log (which built a logrus.Entry via log.WithError(errors.Wrapf(...)) but never called a terminal method on it, so it never actually logged anything) now emits properly. Validation: go build ./pkg/controller/..., go vet ./pkg/controller/..., and gofmt -l on both changed files are all clean. golangci-lint run ./pkg/controller/... reports no findings. go mod tidy produces a zero diff to go.mod/go.sum, matching this repo's verify-modules check. Mirrored this repo's own hack/test.sh invocation for this package (-short -vet=... -skip TestAPIs) and it passes; TestAPIs is a separate envtest suite that needs a local kubebuilder etcd binary not installed on this machine and fails identically on an unmodified checkout, so it is a pre-existing environment gap, not a regression. Added TestBackupQueueReconcilerTrackerNotLeakedWhenBackupCompletesDuringPatch, which uses a controller-runtime fake client with a Patch interceptor to simulate a racing reconciler completing the backup right after the ReadyToStart patch lands; it fails (RunningCount leaks to 1) against the pre-fix ordering and passes (RunningCount returns to 0) against the fix. Report: https://github.com/velero-io/velero/issues/10519 Signed-off-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com> Assisted-by: claude-sonnet-5 (via Claude Code) * Add changelog file for PR #10521 Signed-off-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com> * Add test covering tracker rollback when ReadyToStart patch fails Addresses review comment: verify backupTracker.RunningCount() returns to 0 when the ReadyToStart patch itself errors, covering the Delete rollback path alongside the existing race-condition regression test. Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> --------- Signed-off-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com> Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Co-authored-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com> Co-authored-by: Tiger Kaovilai <tkaovila@redhat.com>