PGPRO-102 #comment Add cfs_gc_activity function

knizhnik · knizhnik · commit 839090dd6bad · 2016-11-10T19:05:38.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -279,6 +279,7 @@ void cfs_decrypt(void* block, uint32 offs, uint32 size)
 void cfs_initialize()
 {
 	cfs_state = (CfsState*)ShmemAlloc(sizeof(CfsState));
+	memset(&cfs_state->gc_stat, 0, sizeof cfs_state->gc_stat);
 	pg_atomic_init_flag(&cfs_state->gc_started);
 	cfs_state->n_workers = 0;
 	cfs_state->gc_enabled = true;
@@ -492,7 +493,9 @@ static bool cfs_gc_file(char* map_path)
 	usedSize = pg_atomic_read_u32(&map->usedSize);
 	physSize = pg_atomic_read_u32(&map->physSize);
 	virtSize = pg_atomic_read_u32(&map->virtSize);
-		
+	
+	cfs_state->gc_stat.scannedFiles += 1;
+
 	if ((physSize - usedSize)*100 > physSize*cfs_gc_threshold) /* do we need to perform defragmentation? */
 	{ 
 		long delay = CFS_LOCK_MIN_TIMEOUT;		
@@ -577,7 +580,8 @@ static bool cfs_gc_file(char* map_path)
 		if (fd2 < 0) { 
 			goto Cleanup;
 		}
-		
+		cfs_state->gc_stat.processedFiles += 1;
+
 		for (i = 0; i < n_pages; i++) { 
 			int size = CFS_INODE_SIZE(*inodes[i]);
 			if (size != 0) { 
@@ -587,7 +591,7 @@ static bool cfs_gc_file(char* map_path)
 				Assert(size <= BLCKSZ);	
 				rc = lseek(fd, offs, SEEK_SET);
 				Assert(rc == offs);
-				
+
 				if (!cfs_read_file(fd, block, size)) { 
 					elog(LOG, "Failed to read file %s: %m", file_path);
 					goto Cleanup;
@@ -597,6 +601,9 @@ static bool cfs_gc_file(char* map_path)
 					elog(LOG, "Failed to write file %s: %m", file_bck_path);
 					goto Cleanup;
 				}
+				cfs_state->gc_stat.processedBytes += size;
+				cfs_state->gc_stat.processedPages += 1;
+
 				offs = newSize;
 				newSize += size;
 				*inodes[i] = CFS_INODE(size, offs);
@@ -832,6 +839,7 @@ PG_FUNCTION_INFO_V1(cfs_enable_gc);
 PG_FUNCTION_INFO_V1(cfs_version);
 PG_FUNCTION_INFO_V1(cfs_estimate);
 PG_FUNCTION_INFO_V1(cfs_compression_ratio);
+PG_FUNCTION_INFO_V1(cfs_gc_activity);
 
 Datum cfs_start_gc(PG_FUNCTION_ARGS)
 {
@@ -974,3 +982,7 @@ Datum cfs_compression_ratio(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8((double)virtSize/physSize);
 }
 
+Datum cfs_gc_activity(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(cfs_state->gc_stat.processedBytes);
+}
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -5350,6 +5350,8 @@ DATA(insert OID = 6103 (  cfs_estimate		   PGNSP PGUID 12 1 0 0 0 f f f f t f v
 DESCR("Estimate relation compression ratio");
 DATA(insert OID = 6019 (  cfs_compression_ratio  PGNSP PGUID 12 1 0 0 0 f f f f t f v s 1 0 701 "2205" _null_ _null_ _null_ _null_ _null_ cfs_compression_ratio _null_ _null_ _null_ ));
 DESCR("Compression ration of relation");
+DATA(insert OID = 6020 (  cfs_gc_activity		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 20 "" _null_ _null_ _null_ _null_ _null_ cfs_gc_activity _null_ _null_ _null_ ));
+DESCR("Number of bytes proceeded by CFS garbage collectors since system start");
 
 /* distance functions */
 DATA(insert OID = 3343 ( int2_dist		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0   21 "21 21"		_null_ _null_ _null_ _null_ _null_	int2_dist	_null_ _null_ _null_ ));
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -39,12 +39,26 @@ size_t cfs_compress(void* dst, size_t dst_size, void const* src, size_t src_size
 size_t cfs_decompress(void* dst, size_t dst_size, void const* src, size_t src_size);
 char const* cfs_algorithm(void);
 
+/* 
+ * This structure is concurrently updated by several workers,
+ * but since we collect this information only for statistic - do not use atomics here
+ * Some inaccuracy is less critical than extra synchronization overhead.
+ */
+typedef struct
+{
+	uint64 scannedFiles;
+	uint64 processedFiles;
+	uint64 processedPages;
+	uint64 processedBytes;
+} CfsStatistic;
+
 typedef struct
 {
 	pg_atomic_flag gc_started;
 	int            n_workers;
 	int            max_iterations;
 	bool           gc_enabled;
+	CfsStatistic   gc_stat;
 	uint8          rc4_init_state[CFS_CIPHER_KEY_SIZE];
 } CfsState;
 
