resolving merge conflict

Author: raj-prince

storage/client_test.go

@@ -3373,6 +3373,7 @@ func TestGRPCRetryReadStallEmulated(t *testing.T) {
 				t.Fatalf("storage.NewGRPCClient: %v", err)
 			}
 			defer client.Close()
+			client.SetRetry(WithBackoff(gax.Backoff{Initial: 10 * time.Millisecond}))
 
 			project := "fake-project"
 			bucket := fmt.Sprintf("grpc-bucket-%d", time.Now().Nanosecond())

storage/option.go

@@ -250,12 +250,6 @@ func (w *withTestMetricReaderConfig) ApplyStorageOpt(c *storageConfig) {
 //
 // This is supported for read operations on HTTP (XML) and gRPC clients (not implemented for HTTP JSON client).
 func withReadStallTimeout(rstc *experimental.ReadStallTimeoutConfig) option.ClientOption {
-	// TODO (raj-prince): To keep separate dynamicDelay instance for different BucketHandle.
-	// Currently, dynamicTimeout is kept at the client and hence shared across all the
-	// BucketHandle, which is not the ideal state. As latency depends on location of VM
-	// and Bucket, and read latency of different buckets may lie in different range.
-	// Hence having a separate dynamicTimeout instance at BucketHandle level will
-	// be better
 	if rstc.Min == time.Duration(0) {
 		rstc.Min = defaultDynamicReadReqMinTimeout
 	}