Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade: retry errors when dialing instances #109514

Merged
merged 1 commit into from
Sep 6, 2023

Conversation

healthy-pod
Copy link
Contributor

Release note: None
Epic: none
Closes #108860

@blathers-crl
Copy link

blathers-crl bot commented Aug 25, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@ajstorm ajstorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @healthy-pod and @stevendanna)


pkg/upgrade/upgradecluster/tenant_cluster.go line 238 at r1 (raw file):

				MaxBackoff:     10 * time.Millisecond,
			}
			if err := retry.WithMaxAttempts(ctx, retryOpts, retryOpts.MaxRetries+1, func() error {

Nit: you can save the +1 here by making MaxRetries above 3.

Can you also add a comment here which describes that we're adding this retry to make our tests succeed and that, strictly speaking, it's not a change that is likely to benefit customers as much as it benefits us?

@healthy-pod
Copy link
Contributor Author

Nit: you can save the +1 here by making MaxRetries above 3.

The value above is the number of retries but the value passed to the function call is the number of attempts hence why it's maxRetries+1.

@healthy-pod
Copy link
Contributor Author

bors r=ajstorm

@craig
Copy link
Contributor

craig bot commented Sep 6, 2023

Timed out.

@stevendanna
Copy link
Collaborator

bors retry

@craig
Copy link
Contributor

craig bot commented Sep 6, 2023

Build succeeded:

@craig craig bot merged commit 8b47bf4 into cockroachdb:master Sep 6, 2023
@knz knz mentioned this pull request Sep 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

upgradeinterlockccl: failure in TestTenantUpgradeInterlock
4 participants