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

Fix envoy config when both RetryOn* values are set #7280

Merged
merged 1 commit into from
Feb 18, 2020

Conversation

crhino
Copy link
Contributor

@crhino crhino commented Feb 12, 2020

Fixes #7209

@crhino crhino requested a review from a team February 12, 2020 19:24
@crhino crhino changed the title Fixes envoy config when both RetryOn* values are set Fix envoy config when both RetryOn* values are set Feb 12, 2020
@crhino
Copy link
Contributor Author

crhino commented Feb 12, 2020

Decided against adding an Envoy integration test for this since the setup/testing would be fairly complex, and hopefully the golden envoy config testdata will be enough to stop regressions.

Copy link
Member

@banks banks left a comment

Choose a reason for hiding this comment

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

I'm OK with no integration test for now as it's a super obvious fix diff and testing it no worse than before. It's worth noting that golden tests didn't catch this the first time though so there is still some assumption that this is the right config here.

@@ -129,7 +129,7 @@ func makeUpstreamRouteForDiscoveryChain(
}
if len(destination.RetryOnStatusCodes) > 0 {
if retryPolicy.RetryOn != "" {
retryPolicy.RetryOn = ",retriable-status-codes"
retryPolicy.RetryOn = retryPolicy.RetryOn + ",retriable-status-codes"
Copy link
Member

Choose a reason for hiding this comment

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

I guess the original intent was to use +=... It's easier to see it's correct with the more explicit concatenation though.

@crhino crhino merged commit 47ff532 into master Feb 18, 2020
@crhino crhino deleted the bug/connect-envoy-retry-on-list branch February 18, 2020 15:25
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.

Consul connect conflict with RetryOnConnectFailure and RetryOnStatusCodes
2 participants