NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitfe395b3

committed

Add noerror parameter to cfs_gc_file to avoid logging of message about absent file when cfs_gc_file is called by cfs_gc_relation

1 parente6c29f0 commitfe395b3Copy full SHA for fe395b3

File tree

1 file changed

-4

lines changed

src/backend/storage/file
- cfs.c

1 file changed

-4

lines changed

`‎src/backend/storage/file/cfs.c`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -646,8 +646,9 @@ static int cfs_cmp_page_offs(void const* p1, void const* p2)`
`646`	`646`	`/*`
`647`	`647`	`* Perform garbage collection (if required) on the file`
`648`	`648`	`* @param map_path - path to the map file (*.cfm).`
	`649`	`+ * @param noerror - surpress error message (when this function is called by cfs_gc_relation until there are available segments)`
`649`	`650`	`*/`
`650`		`-staticboolcfs_gc_file(char*map_path)`
	`651`	`+staticboolcfs_gc_file(char*map_path,boolnoerror)`
`651`	`652`	`{`
`652`	`653`	`intmd=open(map_path,O_RDWR\|PG_BINARY,0);`
`653`	`654`	`FileMap*map;`
`@@ -679,7 +680,9 @@ static bool cfs_gc_file(char* map_path)`
`679`	`680`
`680`	`681`	`if (md<0)`
`681`	`682`	`{`
`682`		`-elog(LOG,"CFS failed to open map file %s: %m",map_path);`
	`683`	`+if (!noerror) {`
	`684`	`+elog(LOG,"CFS failed to open map file %s: %m",map_path);`
	`685`	`+}`
`683`	`686`	`gotoFinishGC;`
`684`	`687`	`}`
`685`	`688`
`@@ -1059,7 +1062,7 @@ static bool cfs_gc_directory(int worker_id, char const* path)`
`1059`	`1062`	`strcmp(file_path+len-4,".cfm")==0)`
`1060`	`1063`	`{`
`1061`	`1064`	`if (entry->d_ino %cfs_state->n_workers==worker_id`
`1062`		`-&& !cfs_gc_file(file_path))`
	`1065`	`+&& !cfs_gc_file(file_path, false))`
`1063`	`1066`	`{`
`1064`	`1067`	`success= false;`
`1065`	`1068`	`break;`
`@@ -1395,7 +1398,7 @@ Datum cfs_gc_relation(PG_FUNCTION_ARGS)`
`1395`	`1398`
`1396`	`1399`	`while (true)`
`1397`	`1400`	`{`
`1398`		`-if (!cfs_gc_file(map_path))`
	`1401`	`+if (!cfs_gc_file(map_path, true))`
`1399`	`1402`	`break;`
`1400`	`1403`	`sprintf(map_path,"%s.%u.cfm",path,++i);`
`1401`	`1404`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfe395b3

File tree

1 file changed

1 file changed

`‎src/backend/storage/file/cfs.c`

0 commit comments