PS-1491: Fix double retry issue for k8s mode bootstrap #3628
Conversation
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
DrJosh9000
reviewed
Dec 11, 2025
zhming0
force-pushed
the
ming/ps-1491
branch
from
037bd62 to
2f1bb6b
Compare
zhming0
commented
Dec 11, 2025
internal/job/executor.go
Outdated
| return stdoutRedactor, logger | ||
| } | ||
|
|
||
| func (e *Executor) kubernetesSetup(ctx context.Context, environ *env.Environment, k8sAgentSocket *kubernetes.Client) error { |
Contributor
Author
There was a problem hiding this comment.
This is dead code. To be removed in #3629
DrJosh9000
reviewed
Dec 11, 2025
kubernetes/client.go
Outdated
|
|
||
| const retryInterval = time.Second | ||
| maxAttempts := max(int(timeout.Seconds()/retryInterval.Seconds()), 1) | ||
|
|
Contributor
There was a problem hiding this comment.
This can be simplified a bit. It doesn't matter if maxAttempts is fixed at 120 - if the context times out after 120 seconds then the last few attempts won't happen (roko is context aware).
Contributor
Author
There was a problem hiding this comment.
Can do but the issue is that I can't predict how high people will set the timeout to be 😬 . I set a 3600 max attempt as safety net, wdyt?
Contributor
There was a problem hiding this comment.
3600 sounds reasonable. The other path would be roko.TryForever, if a user wants to configure the option arbitrarily poorly we could allow that.
DrJosh9000
approved these changes
Dec 11, 2025
Contributor
DrJosh9000
left a comment
DrJosh9000
left a comment
There was a problem hiding this comment.
Aside from my latest comment, LGTM
zhming0
force-pushed
the
ming/ps-1491
branch
from
2f1bb6b to
ab3b35c
Compare
zhming0
force-pushed
the
ming/ps-1491
branch
from
ab3b35c to
09db586
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Starting #3306 and subsequently worsen by #3398, we have created a double retry mechanism that will make k8s agent to spend 1200 seconds on retry when it's unable to connect to the coordinating agent container.
This PR remove double retry mechanism, centralize the retry logic to socket.Connect.
Context
PS-1491
Testing
go test ./...). Buildkite employees may check this if the pipeline has run automatically.go tool gofumpt -extra -w .)Disclosures / Credits
Human