Commitd9378f7

committed

CFS GC should ignore directories of other instances

1 parentcad66d9 commitd9378f7Copy full SHA for d9378f7

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1361,7 +1361,7 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1361`	`1361`	`* Perform garbage collection on each compressed file`
`1362`	`1362`	`* in the pg_tblspc directory.`
`1363`	`1363`	`*/`
`1364`		`-staticboolcfs_gc_directory(intworker_id,charconst*path)`
	`1364`	`+staticboolcfs_gc_directory(intworker_id,charconst*path,intdepth)`
`1365`	`1365`	`{`
`1366`	`1366`	`DIR*dir=AllocateDir(path);`
`1367`	`1367`	`boolsuccess= true;`
`@@ -1393,7 +1393,7 @@ static bool cfs_gc_directory(int worker_id, char const* path)`
`1393`	`1393`	`break;`
`1394`	`1394`	`}`
`1395`	`1395`	`}`
`1396`		`-elseif (!cfs_gc_directory(worker_id,file_path))`
	`1396`	`+elseif ((depth!=1\|\|strcmp(entry->d_name,TABLESPACE_VERSION_DIRECTORY)==0)&& !cfs_gc_directory(worker_id,file_path,depth+1))`
`1397`	`1397`	`{`
`1398`	`1398`	`success= false;`
`1399`	`1399`	`break;`
`@@ -1426,7 +1426,7 @@ static void cfs_sighup(SIGNAL_ARGS)`
`1426`	`1426`	`*/`
`1427`	`1427`	`staticboolcfs_gc_scan_tablespace(intworker_id)`
`1428`	`1428`	`{`
`1429`		`-returncfs_gc_directory(worker_id,"pg_tblspc");`
	`1429`	`+returncfs_gc_directory(worker_id,"pg_tblspc",0);`
`1430`	`1430`	`}`
`1431`	`1431`
`1432`	`1432`	`staticvoidcfs_gc_bgworker_main(Datumarg)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include"port/atomics.h"`
`7`	`7`	`#include"storage/rijndael.h"`
`8`	`8`
`9`		`-#defineCFS_VERSION "0.47"`
	`9`	`+#defineCFS_VERSION "0.48"`
`10`	`10`
`11`	`11`	`#defineCFS_GC_LOCK (MAX_BACKENDS+1)`
`12`	`12`

Comments

(0)