cfs: sleep a bit before first retry, so write heavy load may finish.

Sokolov Yura · Sokolov Yura · commit 9b03e0c304b0 · 2017-06-28T16:34:37.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -987,13 +987,13 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 		cfs_state->gc_stat.processedFiles += 1;
 		cfs_gc_processed_segments += 1;
 
+retry:
 		/* temporary lock file for fetching map snapshot */
 		cfs_gc_lock(lock);
 
 		/* Reread variables after locking file */
 		virtSize = pg_atomic_read_u32(&map->hdr.virtSize);
 		n_pages = virtSize / BLCKSZ;
-retry:
 		for (i = 0; i < n_pages; i++)
 		{
 			newMap->inodes[i] = map->inodes[i];
@@ -1026,10 +1026,9 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 
 		/* Reread variables after locking file */
 		n_pages1 = n_pages;
+		physSize = pg_atomic_read_u32(&map->hdr.physSize);
 		virtSize = pg_atomic_read_u32(&map->hdr.virtSize);
 		n_pages = virtSize / BLCKSZ;
-		second_pass = 0;
-		second_pass_bytes = 0;
 
 		for (i = 0; i < n_pages; i++)
 		{
@@ -1074,8 +1073,13 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 			memset(newMap->inodes, 0, sizeof(newMap->inodes));
 			elog(LOG, "CFS: retry %d whole gc file %s", second_pass_whole,
 					file_path);
-			if (second_pass_whole == 1)
+			if (second_pass_whole == 1 && physSize < CFS_IMPLICIT_GC_THRESHOLD)
 			{
+				cfs_gc_unlock(lock);
+				/* sleep, cause there is possibly checkpoint is on a way */
+				pg_usleep(CFS_LOCK_MAX_TIMEOUT);
+				second_pass = 0;
+				second_pass_bytes = 0;
 				goto retry;
 			}
 			for (i = 0; i < n_pages; i++)
