Removed Timeout in StorageClient from all packages in integration_tests

GoogleCloudPlatform · Aug 22, 2024 · ba670ae · ba670ae
1 parent 574b76c
commit ba670ae
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 41 deletions.
diff --git a/tools/integration_tests/concurrent_operations/setup_test.go b/tools/integration_tests/concurrent_operations/setup_test.go
@@ -20,7 +20,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -47,7 +46,7 @@ func TestMain(m *testing.M) {
 
  // Create common storage client to be used in test.
  ctx = context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/implicit_dir/implicit_dir_test.go b/tools/integration_tests/implicit_dir/implicit_dir_test.go
@@ -21,7 +21,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -47,7 +46,7 @@ func TestMain(m *testing.M) {
 
  // Create storage client before running tests.
  ctx = context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/interrupt/interrupt_test.go b/tools/integration_tests/interrupt/interrupt_test.go
@@ -20,7 +20,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -41,7 +40,7 @@ func TestMain(m *testing.M) {
 
  var storageClient *storage.Client
  ctx := context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/kernel_list_cache/setup_test.go b/tools/integration_tests/kernel_list_cache/setup_test.go
@@ -20,7 +20,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -70,7 +69,7 @@ func TestMain(m *testing.M) {
 
  // Create common storage client to be used in test.
  ctx = context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/local_file/local_file_test.go b/tools/integration_tests/local_file/local_file_test.go
@@ -22,7 +22,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -78,7 +77,7 @@ func TestMain(m *testing.M) {
 
  // Create storage client before running tests.
  ctx = context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/log_rotation/log_rotation_test.go b/tools/integration_tests/log_rotation/log_rotation_test.go
@@ -22,7 +22,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -69,7 +68,7 @@ func TestMain(m *testing.M) {
 
  var storageClient *storage.Client
  ctx := context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/managed_folders/managed_folders_test.go b/tools/integration_tests/managed_folders/managed_folders_test.go
@@ -21,7 +21,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -56,7 +55,7 @@ func TestMain(m *testing.M) {
  setup.ParseSetUpFlags()
 
  ctx = context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*25)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/operations/operations_test.go b/tools/integration_tests/operations/operations_test.go
@@ -21,7 +21,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -88,7 +87,6 @@ const FileInDirThreeInCreateThreeLevelDirTest = "fileInDirThreeInCreateThreeLeve
 const ContentInFileInDirThreeInCreateThreeLevelDirTest = "Hello world!!"
 const Content = "line 1\nline 2\n"
 const onlyDirMounted = "OnlyDirMountOperations"
-const storageClientTimeout = time.Minute * 50
 
 func createMountConfigsAndEquivalentFlags() (flags [][]string) {
  cacheDirPath := path.Join(os.Getenv("HOME"), "operations-cache-dir")
@@ -141,7 +139,7 @@ func TestMain(m *testing.M) {
  // Create storage client before running tests.
  ctx := context.Background()
  var storageClient *storage.Client
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, storageClientTimeout)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/operations/write_test.go b/tools/integration_tests/operations/write_test.go
@@ -43,7 +43,7 @@ const tempFileContent = "line 1\nline 2\n"
 func validateExtendedObjectAttributesNonEmpty(objectName string, t *testing.T) *storage.ObjectAttrs {
  ctx := context.Background()
  var storageClient *storage.Client
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*2)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/cache_file_for_range_read_false_test.go b/tools/integration_tests/read_cache/cache_file_for_range_read_false_test.go
@@ -20,7 +20,6 @@ import (
  "path"
  "sync"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -129,7 +128,7 @@ func (s *cacheFileForRangeReadFalseTest) TestConcurrentReads_ReadIsTreatedNonSeq
 func TestCacheFileForRangeReadFalseTest(t *testing.T) {
  ts := &cacheFileForRangeReadFalseTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/cache_file_for_range_read_true_test.go b/tools/integration_tests/read_cache/cache_file_for_range_read_true_test.go
@@ -80,7 +80,7 @@ func (s *cacheFileForRangeReadTrueTest) TestRangeReadsWithCacheHit(t *testing.T)
 func TestCacheFileForRangeReadTrueTest(t *testing.T) {
  ts := &cacheFileForRangeReadTrueTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/disabled_cache_ttl_test.go b/tools/integration_tests/read_cache/disabled_cache_ttl_test.go
@@ -18,7 +18,6 @@ import (
  "context"
  "log"
  "testing"
- "time"
 
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/operations"
@@ -80,7 +79,7 @@ func (s *disabledCacheTTLTest) TestReadAfterObjectUpdateIsCacheMiss(t *testing.T
 func TestDisabledCacheTTLTest(t *testing.T) {
  ts := &disabledCacheTTLTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/job_chunk_test.go b/tools/integration_tests/read_cache/job_chunk_test.go
@@ -20,7 +20,6 @@ import (
  "path"
  "sync"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/internal/cache/util"
@@ -161,7 +160,7 @@ func (s *jobChunkTest) TestJobChunkSizeForMultipleFileReads(t *testing.T) {
 func TestJobChunkTest(t *testing.T) {
  ts := &jobChunkTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/local_modification_test.go b/tools/integration_tests/read_cache/local_modification_test.go
@@ -19,7 +19,6 @@ import (
  "log"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -84,7 +83,7 @@ func (s *localModificationTest) TestReadAfterLocalGCSFuseWriteIsCacheMiss(t *tes
 func TestLocalModificationTest(t *testing.T) {
  ts := &localModificationTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/range_read_test.go b/tools/integration_tests/read_cache/range_read_test.go
@@ -18,7 +18,6 @@ import (
  "context"
  "log"
  "testing"
- "time"
 
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/operations"
@@ -92,7 +91,7 @@ func (s *rangeReadTest) TestRangeReadsBeyondReadChunkSizeWithFileCached(t *testi
 func TestRangeReadTest(t *testing.T) {
  ts := &rangeReadTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/read_only_test.go b/tools/integration_tests/read_cache/read_only_test.go
@@ -18,7 +18,6 @@ import (
  "context"
  "log"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -149,7 +148,7 @@ func (s *readOnlyTest) TestReadMultipleFilesWithinCacheLimit(t *testing.T) {
 func TestReadOnlyTest(t *testing.T) {
  ts := &readOnlyTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/remount_test.go b/tools/integration_tests/read_cache/remount_test.go
@@ -138,7 +138,7 @@ func TestRemountTest(t *testing.T) {
 
  // Create storage client before running tests.
  ts := &remountTest{ctx: context.Background()}
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/setup_test.go b/tools/integration_tests/read_cache/setup_test.go
@@ -20,7 +20,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/internal/cache/util"
@@ -131,7 +130,7 @@ func TestMain(m *testing.M) {
  setup.ParseSetUpFlags()
 
  ctx = context.Background()
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/read_cache/small_cache_ttl_test.go b/tools/integration_tests/read_cache/small_cache_ttl_test.go
@@ -105,7 +105,7 @@ func (s *smallCacheTTLTest) TestReadForLowMetaDataCacheTTLIsCacheHit(t *testing.
 func TestSmallCacheTTLTest(t *testing.T) {
  ts := &smallCacheTTLTest{ctx: context.Background()}
  // Create storage client before running tests.
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ts.ctx, &ts.storageClient, 15*time.Minute)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ts.ctx, &ts.storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/readonly_creds/readonly_creds_test.go b/tools/integration_tests/readonly_creds/readonly_creds_test.go
@@ -20,7 +20,6 @@ import (
  "os"
  "path"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/client"
@@ -51,7 +50,7 @@ func TestMain(m *testing.M) {
  // Create test directory.
  ctx := context.Background()
  var storageClient *storage.Client
- closeStorageClient := client.CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*15)
+ closeStorageClient := client.CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {

diff --git a/tools/integration_tests/util/client/storage_client.go b/tools/integration_tests/util/client/storage_client.go
@@ -22,7 +22,6 @@ import (
  "os"
  "reflect"
  "testing"
- "time"
 
  "cloud.google.com/go/storage"
  "github.com/googlecloudplatform/gcsfuse/v2/tools/integration_tests/util/operations"
@@ -132,10 +131,10 @@ func CreateObjectOnGCS(ctx context.Context, client *storage.Client, object, cont
 }
 
 // CreateStorageClientWithTimeOut creates storage client with a configurable timeout and return a function to cancel the storage client
-func CreateStorageClientWithTimeOut(ctx *context.Context, storageClient **storage.Client, time time.Duration) func() error {
+func CreateStorageClientWithCancel(ctx *context.Context, storageClient **storage.Client) func() error {
  var err error
  var cancel context.CancelFunc
- *ctx, cancel = context.WithTimeout(*ctx, time)
+ *ctx, cancel = context.WithCancel(*ctx)
  *storageClient, err = CreateStorageClient(*ctx)
  if err != nil {
  log.Fatalf("client.CreateStorageClient: %v", err)
@@ -157,7 +156,7 @@ func DownloadObjectFromGCS(gcsFile string, destFileName string, t *testing.T) er
 
  ctx := context.Background()
  var storageClient *storage.Client
- closeStorageClient := CreateStorageClientWithTimeOut(&ctx, &storageClient, time.Minute*5)
+ closeStorageClient := CreateStorageClientWithCancel(&ctx, &storageClient)
  defer func() {
  err := closeStorageClient()
  if err != nil {