reduce file size, adjust chunk size accordingly and increase retries …

…as it takes longer to cache while running this test concurrently with other tests. (#2549)
GoogleCloudPlatform · Oct 7, 2024 · 3b6804a · 3b6804a
1 parent 1ad2eb5
commit 3b6804a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tools/integration_tests/read_cache/helpers_test.go b/tools/integration_tests/read_cache/helpers_test.go
@@ -110,7 +110,7 @@ func getCachedFilePath(fileName string) string {
 }
 
 func validateFileSizeInCacheDirectory(fileName string, filesize int64, t *testing.T) {
-	maxRetries := 20
+	maxRetries := 25
 	retryDelay := 500 * time.Millisecond
 	expectedPathOfCachedFile := getCachedFilePath(fileName)
 	var err error

diff --git a/tools/integration_tests/read_cache/job_chunk_test.go b/tools/integration_tests/read_cache/job_chunk_test.go
@@ -79,7 +79,7 @@ func createConfigFileForJobChunkTest(cacheSize int64, cacheFileForRangeRead bool
 ////////////////////////////////////////////////////////////////////////
 
 func (s *jobChunkTest) TestJobChunkSizeForSingleFileReads(t *testing.T) {
-	var fileSize int64 = 24 * util.MiB
+	var fileSize int64 = 16 * util.MiB
 	testFileName := setupFileInTestDir(s.ctx, s.storageClient, testDirName, fileSize, t)
 
 	expectedOutcome := readFileAndValidateCacheWithGCS(s.ctx, s.storageClient, testFileName, fileSize, false, t)
@@ -104,7 +104,7 @@ func (s *jobChunkTest) TestJobChunkSizeForSingleFileReads(t *testing.T) {
 }
 
 func (s *jobChunkTest) TestJobChunkSizeForMultipleFileReads(t *testing.T) {
-	var fileSize int64 = 24 * util.MiB
+	var fileSize int64 = 16 * util.MiB
 	var testFileNames [2]string
 	var expectedOutcome [2]*Expected
 	testFileNames[0] = setupFileInTestDir(s.ctx, s.storageClient, testDirName, fileSize, t)
@@ -195,7 +195,7 @@ func TestJobChunkTest(t *testing.T) {
 	// with go-routines not limited by max parallel downloads.
 	parallelDownloadsPerFile := 4
 	maxParallelDownloads := 9 // maxParallelDownloads > parallelDownloadsPerFile * number of files being accessed concurrently.
-	downloadChunkSizeMB := 3
+	downloadChunkSizeMB := 4
 	ts.flags = []string{"--config-file=" +
 		createConfigFileForJobChunkTest(cacheSizeMB, false, "limitedMaxParallelDownloadsNotEffectingChunkSize", parallelDownloadsPerFile, maxParallelDownloads, downloadChunkSizeMB)}
 	ts.chunkSize = int64(downloadChunkSizeMB) * util.MiB
@@ -206,7 +206,7 @@ func TestJobChunkTest(t *testing.T) {
 	// with go-routines limited by max parallel downloads.
 	parallelDownloadsPerFile = 4
 	maxParallelDownloads = 2
-	downloadChunkSizeMB = 3
+	downloadChunkSizeMB = 4
 	ts.flags = []string{"--config-file=" +
 		createConfigFileForJobChunkTest(cacheSizeMB, false, "limitedMaxParallelDownloadsEffectingChunkSize", parallelDownloadsPerFile, maxParallelDownloads, downloadChunkSizeMB)}
 	ts.chunkSize = int64(downloadChunkSizeMB) * util.MiB

diff --git a/tools/integration_tests/read_cache/setup_test.go b/tools/integration_tests/read_cache/setup_test.go
@@ -64,7 +64,7 @@ const (
 	logFileNameForMountedDirectoryTests    = "/tmp/gcsfuse_read_cache_test_logs/log.json"
 	parallelDownloadsPerFile               = 4
 	maxParallelDownloads                   = -1
-	downloadChunkSizeMB                    = 3
+	downloadChunkSizeMB                    = 4
 	enableCrcCheck                         = true
 )