Correctly return number of proceed segments in cfs_gc_relation

knizhnik · knizhnik · commit 93d08b2d9a2b · 2017-06-13T10:41:40.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -928,7 +928,8 @@ static bool cfs_gc_file(char* map_path, bool background)
 					if (res != BLCKSZ)
 					{
 						pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */
-						elog(ERROR, "Verification failed for block %d position %d size %d of relation %s: error code %d",
+						pg_atomic_fetch_sub_u32(&cfs_state->n_active_gc, 1);
+						elog(ERROR, "CFS: verification failed for block %d position %d size %d of relation %s: error code %d",
 							 i, (int)CFS_INODE_OFFS(inode), size, file_bck_path, (int)res);
 					}
 				}
@@ -1429,11 +1430,11 @@ Datum cfs_gc_relation(PG_FUNCTION_ARGS)
 		pfree(map_path);
 		relation_close(rel, AccessShareLock);
 
-		processed_segments -= cfs_gc_processed_segments;
+		processed_segments = cfs_gc_processed_segments - processed_segments;
 
 		LWLockRelease(CfsGcLock);
 	}
-	PG_RETURN_INT32(cfs_gc_processed_segments);
+	PG_RETURN_INT32(processed_segments);
 }
 
 
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1770,7 +1770,7 @@ FileRead(File file, char *buffer, int amount)
 				INIT_TRADITIONAL_CRC32(crc);
 				COMP_TRADITIONAL_CRC32(crc, compressedBuffer, amount);
 				FIN_TRADITIONAL_CRC32(crc);
-				elog(LOG, "Decompress error: %d for file %s block %u position %u compressed size %u crc %x", 
+				elog(LOG, "CFS: decompress error: %d for file %s block %u position %u compressed size %u crc %x", 
 					 returnCode, VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, amount, crc);
 				VfdCache[file].seekPos = FileUnknownPos;
 				returnCode = -1;
@@ -2015,6 +2015,8 @@ FileWrite(File file, char *buffer, int amount)
 		 */
 		if ((int32)pos >= 0 && (int32)(pos + amount) < 0) 
 		{ 
+			elog(LOG, "CFS: backend %d forced to performe GC on file %s block %u because it's size exceed %u bytes", 
+				 MyProcPid, VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos / BLCKSZ),  pos);
 			cfs_gc_segment(VfdCache[file].fileName);
 		}
 	}
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -6,7 +6,7 @@
 #include "port/atomics.h"
 #include "storage/rijndael.h"
 
-#define CFS_VERSION "0.25"
+#define CFS_VERSION "0.29"
 
 #define CFS_GC_LOCK  0x10000000
 

Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,8 @@ static bool cfs_gc_file(char* map_path, bool background)`
`928`	`928`	`if (res != BLCKSZ)`
`929`	`929`	`{`
`930`	`930`	`pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */`
`931`		`- elog(ERROR, "Verification failed for block %d position %d size %d of relation %s: error code %d",`
	`931`	`+ pg_atomic_fetch_sub_u32(&cfs_state->n_active_gc, 1);`
	`932`	`+ elog(ERROR, "CFS: verification failed for block %d position %d size %d of relation %s: error code %d",`
`932`	`933`	`i, (int)CFS_INODE_OFFS(inode), size, file_bck_path, (int)res);`
`933`	`934`	`}`
`934`	`935`	`}`
`@@ -1429,11 +1430,11 @@ Datum cfs_gc_relation(PG_FUNCTION_ARGS)`
`1429`	`1430`	`pfree(map_path);`
`1430`	`1431`	`relation_close(rel, AccessShareLock);`
`1431`	`1432`
`1432`		`- processed_segments -= cfs_gc_processed_segments;`
	`1433`	`+ processed_segments = cfs_gc_processed_segments - processed_segments;`
`1433`	`1434`
`1434`	`1435`	`LWLockRelease(CfsGcLock);`
`1435`	`1436`	`}`
`1436`		`- PG_RETURN_INT32(cfs_gc_processed_segments);`
	`1437`	`+ PG_RETURN_INT32(processed_segments);`
`1437`	`1438`	`}`
`1438`	`1439`
`1439`	`1440`
Original file line number	Diff line number	Diff line change
`@@ -1770,7 +1770,7 @@ FileRead(File file, char *buffer, int amount)`
`1770`	`1770`	`INIT_TRADITIONAL_CRC32(crc);`
`1771`	`1771`	`COMP_TRADITIONAL_CRC32(crc, compressedBuffer, amount);`
`1772`	`1772`	`FIN_TRADITIONAL_CRC32(crc);`
`1773`		`- elog(LOG, "Decompress error: %d for file %s block %u position %u compressed size %u crc %x",`
	`1773`	`+ elog(LOG, "CFS: decompress error: %d for file %s block %u position %u compressed size %u crc %x",`
`1774`	`1774`	`returnCode, VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, amount, crc);`
`1775`	`1775`	`VfdCache[file].seekPos = FileUnknownPos;`
`1776`	`1776`	`returnCode = -1;`
`@@ -2015,6 +2015,8 @@ FileWrite(File file, char *buffer, int amount)`
`2015`	`2015`	`*/`
`2016`	`2016`	`if ((int32)pos >= 0 && (int32)(pos + amount) < 0)`
`2017`	`2017`	`{`
	`2018`	`+ elog(LOG, "CFS: backend %d forced to performe GC on file %s block %u because it's size exceed %u bytes",`
	`2019`	`+ MyProcPid, VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos / BLCKSZ), pos);`
`2018`	`2020`	`cfs_gc_segment(VfdCache[file].fileName);`
`2019`	`2021`	`}`
`2020`	`2022`	`}`