cfs.c: fix stop background worker on restart.

Sokolov Yura · Sokolov Yura · commit 163a4c44b34a · 2017-10-01T17:17:44.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1408,6 +1408,7 @@ static bool cfs_gc_directory(int worker_id, char const* path)
 static void cfs_gc_cancel(int sig)
 {
 	cfs_gc_stop = true;
+	SetLatch(MyLatch);
 }
 
 static void cfs_sighup(SIGNAL_ARGS)
@@ -1464,7 +1465,7 @@ static void cfs_gc_bgworker_main(Datum arg)
 		rc = WaitLatch(MyLatch,
 					   WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
 					   timeout /* ms */ );
-		if (rc & WL_POSTMASTER_DEATH)
+		if ((rc & WL_POSTMASTER_DEATH) || cfs_gc_stop)
 			exit(1);
 
 		ResetLatch(MyLatch);

Original file line number	Diff line number	Diff line change
`@@ -1408,6 +1408,7 @@ static bool cfs_gc_directory(int worker_id, char const* path)`
`1408`	`1408`	`static void cfs_gc_cancel(int sig)`
`1409`	`1409`	`{`
`1410`	`1410`	`cfs_gc_stop = true;`
	`1411`	`+ SetLatch(MyLatch);`
`1411`	`1412`	`}`
`1412`	`1413`
`1413`	`1414`	`static void cfs_sighup(SIGNAL_ARGS)`
`@@ -1464,7 +1465,7 @@ static void cfs_gc_bgworker_main(Datum arg)`
`1464`	`1465`	`rc = WaitLatch(MyLatch,`
`1465`	`1466`	`WL_LATCH_SET \| WL_TIMEOUT \| WL_POSTMASTER_DEATH,`
`1466`	`1467`	`timeout /* ms */ );`
`1467`		`- if (rc & WL_POSTMASTER_DEATH)`
	`1468`	`+ if ((rc & WL_POSTMASTER_DEATH) \|\| cfs_gc_stop)`
`1468`	`1469`	`exit(1);`
`1469`	`1470`
`1470`	`1471`	`ResetLatch(MyLatch);`