status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes envoy config when both RetryOn* values are set (#7280)

This commit is contained in:
Chris Piraino 2020-02-18 09:25:47 -06:00 committed by GitHub
parent b83c190f0c
commit 47ff532735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/xds/routes.go
View File

@ -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"
} else {
retryPolicy.RetryOn = "retriable-status-codes"
}

2
agent/xds/testdata/routes/connect-proxy-with-chain-and-router.golden vendored
View File

@ -281,7 +281,7 @@
"route": {
"cluster": "retry-both.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"retryPolicy": {
"retryOn": ",retriable-status-codes",
"retryOn": "connect-failure,retriable-status-codes",
"retriableStatusCodes": [
401,
409,