cfs: order write gc completion

Sokolov Yura · Sokolov Yura · commit 069d5ba5960b · 2017-06-26T14:58:11.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1200,7 +1200,6 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 		memcpy(map->inodes, newMap->inodes, n_pages * sizeof(inode_t));
 		pg_atomic_write_u32(&map->hdr.usedSize, newUsed);
 		pg_atomic_write_u32(&map->hdr.physSize, newSize);
-		pg_atomic_write_u32(&map->gc_active, false);
 		map->generation += 1; /* force all backends to reopen the file */
 
 		/* Before removing backup files and releasing locks
@@ -1210,6 +1209,14 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 			elog(WARNING, "CFS failed to sync map %s: %m", map_path);
 			goto Cleanup;
 		}
+		/* now we can safely set gc completion */
+		pg_atomic_write_u32(&map->gc_active, false);
+		/* and need to sync it again */
+		if (cfs_msync(map) < 0)
+		{
+			elog(WARNING, "CFS failed to sync map %s: %m", map_path);
+			goto Cleanup;
+		}
 		if (pg_fsync(md) < 0)
 		{
 			elog(WARNING, "CFS failed to sync file %s: %m", map_path);
