cfs: reduce logging on forced GC.

Sokolov Yura · Sokolov Yura · commit 9bf3d8bacdd6 · 2017-06-23T23:21:50.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1681,9 +1681,10 @@ Datum cfs_gc_relation(PG_FUNCTION_ARGS)
 }
 
 
-void cfs_gc_segment(char const* fileName, bool optional)
+void cfs_gc_segment(char const* fileName, uint32 pos)
 {
 	char* mapFileName;
+	bool optional = pos < CFS_RED_LINE;
 
 	if (optional)
 	{
@@ -1693,6 +1694,8 @@ void cfs_gc_segment(char const* fileName, bool optional)
     else
 		LWLockAcquire(CfsGcLock, LW_EXCLUSIVE); /* Prevent interaction with background GC */
 
+	elog(LOG, "CFS: backend %d forced to perform GC on file %s because it's size exceed %u bytes",
+		 MyProcPid, fileName, pos);
 	mapFileName = psprintf("%s.cfm", fileName);
 
 	cfs_gc_file(mapFileName, optional ? CFS_IMPLICIT : CFS_EXPLICIT);
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -2155,9 +2155,7 @@ FileWrite(File file, char *buffer, int amount)
 		 */
 		if (pos + amount > CFS_IMPLICIT_GC_THRESHOLD)
 		{
-			elog(LOG, "CFS: backend %d forced to perform 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, pos + amount < CFS_RED_LINE);
+			cfs_gc_segment(VfdCache[file].fileName, pos + amount);
 		}
 	}
 	return returnCode;
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -136,7 +136,7 @@ int      cfs_shmem_size(void);
 void     cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size);
 void     cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size);
 
-void     cfs_gc_segment(char const* name, bool optional);
+void     cfs_gc_segment(char const* name, uint32 pos);
 void     cfs_recover_map(FileMap* map);
 
 extern CfsState* cfs_state;

Original file line number	Diff line number	Diff line change
`@@ -1681,9 +1681,10 @@ Datum cfs_gc_relation(PG_FUNCTION_ARGS)`
`1681`	`1681`	`}`
`1682`	`1682`
`1683`	`1683`
`1684`		`-void cfs_gc_segment(char const* fileName, bool optional)`
	`1684`	`+void cfs_gc_segment(char const* fileName, uint32 pos)`
`1685`	`1685`	`{`
`1686`	`1686`	`char* mapFileName;`
	`1687`	`+ bool optional = pos < CFS_RED_LINE;`
`1687`	`1688`
`1688`	`1689`	`if (optional)`
`1689`	`1690`	`{`
`@@ -1693,6 +1694,8 @@ void cfs_gc_segment(char const* fileName, bool optional)`
`1693`	`1694`	`else`
`1694`	`1695`	`LWLockAcquire(CfsGcLock, LW_EXCLUSIVE); /* Prevent interaction with background GC */`
`1695`	`1696`
	`1697`	`+ elog(LOG, "CFS: backend %d forced to perform GC on file %s because it's size exceed %u bytes",`
	`1698`	`+ MyProcPid, fileName, pos);`
`1696`	`1699`	`mapFileName = psprintf("%s.cfm", fileName);`
`1697`	`1700`
`1698`	`1701`	`cfs_gc_file(mapFileName, optional ? CFS_IMPLICIT : CFS_EXPLICIT);`
Original file line number	Diff line number	Diff line change
`@@ -2155,9 +2155,7 @@ FileWrite(File file, char *buffer, int amount)`
`2155`	`2155`	`*/`
`2156`	`2156`	`if (pos + amount > CFS_IMPLICIT_GC_THRESHOLD)`
`2157`	`2157`	`{`
`2158`		`- elog(LOG, "CFS: backend %d forced to perform GC on file %s block %u because it's size exceed %u bytes",`
`2159`		`- MyProcPid, VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos / BLCKSZ), pos);`
`2160`		`- cfs_gc_segment(VfdCache[file].fileName, pos + amount < CFS_RED_LINE);`
	`2158`	`+ cfs_gc_segment(VfdCache[file].fileName, pos + amount);`
`2161`	`2159`	`}`
`2162`	`2160`	`}`
`2163`	`2161`	`return returnCode;`