This is an automated cherry-pick of pingcap#60402

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

Author: lance6716

br/pkg/storage/gcs.go

@@ -112,6 +112,40 @@ type GCSStorage struct {
 	handles      []*storage.BucketHandle
 	clients      []*storage.Client
 	clientCancel context.CancelFunc
+<<<<<<< HEAD
+=======
+}
+
+// CopyFrom implements Copier.
+func (s *GCSStorage) CopyFrom(ctx context.Context, e ExternalStorage, spec CopySpec) error {
+	es, ok := e.(*GCSStorage)
+	if !ok {
+		return errors.Annotatef(berrors.ErrStorageInvalidConfig, "GCSStorage.CopyFrom supports only GCSStorage, get %T", e)
+	}
+	dstName := s.objectName(spec.To)
+	srcName := es.objectName(spec.From)
+	// A note here:
+	// https://cloud.google.com/storage/docs/json_api/v1/objects/rewrite
+	// It seems extra configuration is needed when doing cross-region copying.
+	copier := s.GetBucketHandle().Object(dstName).CopierFrom(es.GetBucketHandle().Object(srcName))
+	_, err := copier.Run(ctx)
+	if err != nil {
+		return errors.Annotatef(
+			err,
+			"failed to copy %s/%s to %s/%s",
+			es.gcs.Bucket,
+			srcName,
+			s.gcs.Bucket,
+			dstName,
+		)
+	}
+
+	return nil
+}
+
+func (s *GCSStorage) MarkStrongConsistency() {
+	// See https://cloud.google.com/storage/docs/consistency#strongly_consistent_operations
+>>>>>>> 7424255fef7 (external store: use separate ctx for GCS clients (#60402))
 }
 
 // GetBucketHandle gets the handle to the GCS API on the bucket.

br/pkg/storage/gcs_test.go

@@ -11,6 +11,10 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+<<<<<<< HEAD
+=======
+	"net/url"
+>>>>>>> 7424255fef7 (external store: use separate ctx for GCS clients (#60402))
 	"os"
 	"testing"
 	"time"
@@ -599,3 +603,30 @@ func TestCtxUsage(t *testing.T) {
 	// before the fix, it's context canceled error
 	require.ErrorContains(t, err, "invalid_request")
 }
+
+func TestCtxUsage(t *testing.T) {
+	httpSvr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
+	defer httpSvr.Close()
+
+	ctx := context.Background()
+	gcs := &backuppb.GCS{
+		Endpoint:      httpSvr.URL,
+		Bucket:        "test",
+		Prefix:        "prefix",
+		StorageClass:  "NEARLINE",
+		PredefinedAcl: "private",
+		CredentialsBlob: fmt.Sprintf(`
+{
+	"type":"external_account",
+	"audience":"//iam.googleapis.com/projects/1234567890123/locations/global/workloadIdentityPools/my-pool/providers/my-provider",
+	"subject_token_type":"urn:ietf:params:oauth:token-type:access_token",
+	"credential_source":{"url":"%s"}
+}`, httpSvr.URL),
+	}
+	stg, err := NewGCSStorage(ctx, gcs, &ExternalStorageOptions{})
+	require.NoError(t, err)
+
+	_, err = stg.FileExists(ctx, "key")
+	// before the fix, it's context canceled error
+	require.ErrorContains(t, err, "invalid_request")
+}