Merge pull request #2601 from michael-berlin/export_buffer_nil_err

Do not return OK error code for buffer errors.
vitessio · Feb 27, 2017 · 3b4f863 · 3b4f863
2 parents 04326af + 5bd6a7f
commit 3b4f863
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/go/vt/vtgate/gateway/discoverygateway.go b/go/vt/vtgate/gateway/discoverygateway.go
@@ -179,7 +179,7 @@ func (dg *discoveryGateway) withRetry(ctx context.Context, target *querypb.Targe
  if bufferErr != nil {
  // Buffering failed e.g. buffer is already full. Do not retry.
  err = vterrors.Errorf(
- vterrors.Code(err),
+ vterrors.Code(bufferErr),
  "failed to automatically buffer and retry failed request during failover: %v original err (type=%T): %v",
  bufferErr, err, err)
  break