client: properly disable retry if GRPC_GO_RETRY=off (#4899)

dfawley · web-flow · commit f1d87c14c216 · 2021-10-26T10:33:08.000-07:00
diff --git a/internal/envconfig/envconfig.go b/internal/envconfig/envconfig.go
@@ -33,8 +33,9 @@ const (
 )
 
 var (
-	// Retry is set if retry is explicitly enabled via "GRPC_GO_RETRY=on" or if XDS retry support is enabled.
-	Retry = strings.EqualFold(os.Getenv(retryStr), "on") || xdsenv.RetrySupport
+	// Retry is enabled unless explicitly disabled via "GRPC_GO_RETRY=off" or
+	// if XDS retry support is explicitly disabled.
+	Retry = !strings.EqualFold(os.Getenv(retryStr), "off") && xdsenv.RetrySupport
 	// TXTErrIgnore is set if TXT errors should be ignored ("GRPC_GO_IGNORE_TXT_ERRORS" is not "false").
 	TXTErrIgnore = !strings.EqualFold(os.Getenv(txtErrIgnoreStr), "false")
 )

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,9 @@ const (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`var (`
`36`		`- // Retry is set if retry is explicitly enabled via "GRPC_GO_RETRY=on" or if XDS retry support is enabled.`
`37`		`- Retry = strings.EqualFold(os.Getenv(retryStr), "on") \|\| xdsenv.RetrySupport`
	`36`	`+ // Retry is enabled unless explicitly disabled via "GRPC_GO_RETRY=off" or`
	`37`	`+ // if XDS retry support is explicitly disabled.`
	`38`	`+ Retry = !strings.EqualFold(os.Getenv(retryStr), "off") && xdsenv.RetrySupport`
`38`	`39`	`// TXTErrIgnore is set if TXT errors should be ignored ("GRPC_GO_IGNORE_TXT_ERRORS" is not "false").`
`39`	`40`	`TXTErrIgnore = !strings.EqualFold(os.Getenv(txtErrIgnoreStr), "false")`
`40`	`41`	`)`