fix(bigtable): Retry RST stream errors (#11477)

bhshkh · web-flow · commit df43b4af7529 · 2025-05-05T13:04:36.000-04:00
diff --git a/bigtable/bigtable.go b/bigtable/bigtable.go
@@ -193,6 +193,11 @@ var (
 	}
 	retryableInternalErrMsgs = []string{
 		"stream terminated by RST_STREAM", // Retry similar to spanner client. Special case due to https://github.com/googleapis/google-cloud-go/issues/6476
+
+		// Special cases due to: https://github.com/googleapis/google-cloud-go/issues/10207#issuecomment-2307562026
+		"Received Rst stream",
+		"RST_STREAM closed stream",
+		"Received RST_STREAM",
 	}
 
 	executeQueryRetryOptions = []gax.CallOption{
diff --git a/bigtable/retry_test.go b/bigtable/retry_test.go
@@ -124,18 +124,20 @@ func TestRetryApply(t *testing.T) {
 		t.Errorf("conditionally mutating row with no retries: no error")
 	}
 
-	errCount = 0
-	code = codes.Internal // Will be retried
-	errMsg = "stream terminated by RST_STREAM"
-	if err := tbl.Apply(ctx, "row", mut); err != nil {
-		t.Errorf("applying single mutation with retries: %v", err)
-	}
-	row, err = tbl.ReadRow(ctx, "row")
-	if err != nil {
-		t.Errorf("reading single value with retries: %v", err)
-	}
-	if row == nil {
-		t.Errorf("applying single mutation with retries: could not read back row")
+	for _, msg := range retryableInternalErrMsgs {
+		errCount = 0
+		code = codes.Internal // Will be retried
+		errMsg = msg
+		if err := tbl.Apply(ctx, "row", mut); err != nil {
+			t.Errorf("applying single mutation with retries: %v, errMsg: %v", err, errMsg)
+		}
+		row, err = tbl.ReadRow(ctx, "row")
+		if err != nil {
+			t.Errorf("reading single value with retries: %v, errMsg: %v", err, errMsg)
+		}
+		if row == nil {
+			t.Errorf("applying single mutation with retries: could not read back row. errMsg: %v", errMsg)
+		}
 	}
 
 	errCount = 0

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,11 @@ var (`
`193`	`193`	`}`
`194`	`194`	`retryableInternalErrMsgs = []string{`
`195`	`195`	`"stream terminated by RST_STREAM", // Retry similar to spanner client. Special case due to https://github.com/googleapis/google-cloud-go/issues/6476`
	`196`	`+`
	`197`	`+ // Special cases due to: https://github.com/googleapis/google-cloud-go/issues/10207#issuecomment-2307562026`
	`198`	`+ "Received Rst stream",`
	`199`	`+ "RST_STREAM closed stream",`
	`200`	`+ "Received RST_STREAM",`
`196`	`201`	`}`
`197`	`202`
`198`	`203`	`executeQueryRetryOptions = []gax.CallOption{`