This is an automated cherry-pick of pingcap#60144

Signed-off-by: ti-chi-bot <[email protected]>

Author: joechenrh

br/pkg/storage/gcs.go

@@ -514,6 +514,12 @@ func shouldRetry(err error) bool {
 	retryableErrMsg := []string{
 		"http2: client connection force closed via ClientConn.Close",
 		"broken pipe",
+<<<<<<< HEAD
+=======
+		"http2: client connection lost",
+		// See https://stackoverflow.com/questions/45209168/http2-server-sent-goaway-and-closed-the-connection-laststreamid-1999 for details.
+		"http2: server sent GOAWAY",
+>>>>>>> ddfd52a8151 (objstore: retry on "server sent GOAWAY" http2 error (#60144))
 	}
 
 	for _, msg := range retryableErrMsg {

br/pkg/storage/gcs_test.go

@@ -573,6 +573,7 @@ func TestSpeedReadManyFiles(t *testing.T) {
 	t.Logf("read %d large files cost %v", len(testFiles), time.Since(now))
 }
 
+<<<<<<< HEAD
 func TestCtxUsage(t *testing.T) {
 	httpSvr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
 	defer httpSvr.Close()
@@ -598,4 +599,10 @@ func TestCtxUsage(t *testing.T) {
 	_, err = stg.FileExists(ctx, "key")
 	// before the fix, it's context canceled error
 	require.ErrorContains(t, err, "invalid_request")
+=======
+func TestGCSShouldRetry(t *testing.T) {
+	require.True(t, shouldRetry(&url.Error{Err: goerrors.New("http2: server sent GOAWAY and closed the connectiont"), Op: "Get", URL: "https://storage.googleapis.com/storage/v1/"}))
+	require.True(t, shouldRetry(&url.Error{Err: goerrors.New("http2: client connection lost"), Op: "Get", URL: "https://storage.googleapis.com/storage/v1/"}))
+	require.True(t, shouldRetry(&url.Error{Err: io.EOF, Op: "Get", URL: "https://storage.googleapis.com/storage/v1/"}))
+>>>>>>> ddfd52a8151 (objstore: retry on "server sent GOAWAY" http2 error (#60144))
 }