cfs: pg_flush_data on second pass

Sokolov Yura · Sokolov Yura · commit 220f6373e414 · 2017-06-26T17:59:01.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1053,6 +1053,13 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 					goto Cleanup;
 				}
 				newMap->inodes[i] = CFS_INODE(size, offs);
+
+				if (writeback + 16*1024*1024 < newSize)
+				{
+					uint32 newwb = (newSize - 128*1024) & ~(128*1024-1);
+					pg_flush_data(fd2, writeback, newwb - writeback);
+					writeback = newwb;
+				}
 			}
 			else
 			{
@@ -1061,6 +1068,7 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 			cfs_state->gc_stat.processedBytes += size;
 			cfs_state->gc_stat.processedPages += 1;
 		}
+		pg_flush_data(fd2, writeback, newSize);
 
 		if (close(fd) < 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1053,6 +1053,13 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1053`	`1053`	`goto Cleanup;`
`1054`	`1054`	`}`
`1055`	`1055`	`newMap->inodes[i] = CFS_INODE(size, offs);`
	`1056`	`+`
	`1057`	`+ if (writeback + 1610241024 < newSize)`
	`1058`	`+ {`
	`1059`	`+ uint32 newwb = (newSize - 1281024) & ~(1281024-1);`
	`1060`	`+ pg_flush_data(fd2, writeback, newwb - writeback);`
	`1061`	`+ writeback = newwb;`
	`1062`	`+ }`
`1056`	`1063`	`}`
`1057`	`1064`	`else`
`1058`	`1065`	`{`
`@@ -1061,6 +1068,7 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1061`	`1068`	`cfs_state->gc_stat.processedBytes += size;`
`1062`	`1069`	`cfs_state->gc_stat.processedPages += 1;`
`1063`	`1070`	`}`
	`1071`	`+ pg_flush_data(fd2, writeback, newSize);`
`1064`	`1072`
`1065`	`1073`	`if (close(fd) < 0)`
`1066`	`1074`	`{`