Merge 7883d8e into e670e4d

uber · Nov 5, 2019 · ca23ece · ca23ece
2 parents e670e4d + 7883d8e
commit ca23ece
Show file tree

Hide file tree

Showing 11 changed files with 682 additions and 90 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/http_client.tmpl b/codegen/templates/http_client.tmpl
@@ -238,10 +238,18 @@ func (c *{{$clientName}}) {{$methodName}}(
 	if (c.circuitBreakerDisabled) {
 		res, err = req.Do()
 	} else {
+		var realErr error
 		err = hystrix.DoC(ctx, "{{$clientID}}", func(ctx context.Context) error {
-			res, err = req.Do()
-			return err
+			res, realErr = req.Do()
+			if res.StatusCode < 500 {
+				return nil
+			}
+			return realErr
 		}, nil)
+		if err == nil {
+			// Bad request or equivalent error, bubble it up
+			err = realErr
+		}
 	}
 	if err != nil {
 		return {{if eq .ResponseType ""}}nil, err{{else}}defaultRes, nil, err{{end}}

diff --git a/codegen/templates/tchannel_client.tmpl b/codegen/templates/tchannel_client.tmpl
@@ -264,12 +264,20 @@ type {{$clientName}} struct {
 				ctx, "{{$svc.Name}}", "{{.Name}}", reqHeaders, args, &result,
 			)
 		} else {
+			var realErr error
 			err = hystrix.DoC(ctx, "{{$clientID}}", func(ctx context.Context) error {
 				success, respHeaders, err = c.client.Call(
 					ctx, "{{$svc.Name}}", "{{.Name}}", reqHeaders, args, &result,
 				)
+				if _, isSysErr := err.(tchannel.SystemError); !isSysErr {
+					return nil
+				}
 				return err
 			}, nil)
+			if err == nil {
+				// Bad request or equivalent error, bubble it up
+				err = realErr
+			}
 		}