Do not stop CFS GC in case of errors

Author: knizhnik

src/backend/storage/file/cfs.c

@@ -1107,13 +1107,22 @@ static void cfs_gc_bgworker_main(Datum arg)
 
 	elog(INFO, "Start CFS garbage collector %d", MyProcPid);
 
-	while (cfs_gc_scan_tablespace(worker_id)
-		   && !cfs_gc_stop
-		   && --cfs_state->max_iterations >= 0)
+	while (true)
 	{
-		int rc = WaitLatch(MyLatch,
-						   WL_TIMEOUT | WL_POSTMASTER_DEATH,
-						   cfs_gc_period /* ms */ );
+		int timeout = cfs_gc_period;
+		int rc;
+
+		if (!cfs_gc_scan_tablespace(worker_id)) 
+		{
+			timeout = CFS_RETRY_TIMEOUT;
+		}
+		if (cfs_gc_stop || --cfs_state->max_iterations <= 0)
+		{
+			break;
+		}
+		rc = WaitLatch(MyLatch,
+					   WL_TIMEOUT | WL_POSTMASTER_DEATH,
+					   timeout /* ms */ );
 		if (rc & WL_POSTMASTER_DEATH)
 			exit(1);
 	}

src/include/storage/cfs.h

@@ -10,9 +10,10 @@
 
 #define CFS_GC_LOCK  0x10000000
 
-#define CFS_LOCK_MIN_TIMEOUT 100    /* microseconds */
+#define CFS_LOCK_MIN_TIMEOUT 100    /* microseconds: initial timeout of GC lock acquisition */
 #define CFS_LOCK_MAX_TIMEOUT 10000  /* microseconds */
-#define CFS_DISABLE_TIMEOUT  1000   /* milliseconds */
+#define CFS_DISABLE_TIMEOUT  1000   /* milliseconds: timeout of waiting for enabling GC */
+#define CFS_RETRY_TIMEOUT    10000  /* milliseconds: delay between GC iterations in case of error */
 #define CFS_ESTIMATE_PROBES  10
 
 /*