fix(restore_finalizer): bound WaitRestoreExecHook poll with resourceT… - #10280
Open
nitishmalang wants to merge 1 commit into
Open
fix(restore_finalizer): bound WaitRestoreExecHook poll with resourceT…#10280nitishmalang wants to merge 1 commit into
nitishmalang wants to merge 1 commit into
Conversation
👷 Deploy request for velero pending review.Visit the deploys page to approve it
|
nitishmalang
force-pushed
the
fix/wait-restore-exec-hook-timeout-9744
branch
from
August 14, 2026 20:14
cdbe6d2 to
1d3c240
Compare
kaovilai
reviewed
Aug 15, 2026
| // and blocked every other restore on the cluster. | ||
| timeout := ctx.resourceTimeout | ||
| if timeout <= 0 { | ||
| timeout = 10 * time.Minute |
Member
There was a problem hiding this comment.
velero/pkg/cmd/server/config/config.go
Line 29 in 293f6f6
Please write the time out here or reuse one of these.
Author
There was a problem hiding this comment.
@kaovilai addressed this by reusing DefaultResourceTimeout from server config
go test ./pkg/controller -run TestWaitRestoreExecHook -count=1
ok github.com/vmware-tanzu/velero/pkg/controller 5.169s
nitishmalang
force-pushed
the
fix/wait-restore-exec-hook-timeout-9744
branch
from
August 15, 2026 05:41
1d3c240 to
10753b1
Compare
Signed-off-by: Nitish Malang <71919457+nitishmalang@users.noreply.github.com>
nitishmalang
force-pushed
the
fix/wait-restore-exec-hook-timeout-9744
branch
from
August 15, 2026 06:15
10753b1 to
6658f3a
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
ywk253100
approved these changes
Aug 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #9744
Summary
WaitRestoreExecHookhad no deadline. If hook was added to tracker but never marked complete, so restore stayed in finalizing and blocked other restores on cluster.This uses existing
resourceTimeout(10 min fallback) so the wait eventually fails instead of hanging forever.Testing
go test ./pkg/controller -run TestWaitRestoreExecHook -count=1— PASS (5.21s)