NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2f3e234

committed

Fix pg_rewind to handle relation data files in tablespaces properly.

pg_rewind checks whether each file is a relation data file, from its path.Previously this check logic had the bug which made pg_rewind fail torecognize any relation data files in tablespaces. Which also causedan assertion failure in pg_rewind.Back-patch to 9.5 where pg_rewind was added.Author: Takayuki TsunakawaReviewed-by: Michael PaquierDiscussion:https://postgr.es/m/0A3221C70F24FB45833433255569204D1F8D6C7A@G01JPEXMBYT05

1 parent09230e5 commit2f3e234Copy full SHA for 2f3e234

File tree

1 file changed

-10

lines changed

src/bin/pg_rewind
- filemap.c

1 file changed

-10

lines changed

`‎src/bin/pg_rewind/filemap.c`

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include"pg_rewind.h"`
`20`	`20`
`21`	`21`	`#include"common/string.h"`
	`22`	`+#include"catalog/catalog.h"`
`22`	`23`	`#include"catalog/pg_tablespace.h"`
`23`	`24`	`#include"storage/fd.h"`
`24`	`25`
`@@ -554,7 +555,6 @@ print_filemap(void)`
`554`	`555`	`staticbool`
`555`	`556`	`isRelDataFile(constchar*path)`
`556`	`557`	`{`
`557`		`-charbuf[20+1];`
`558`	`558`	`RelFileNodernode;`
`559`	`559`	`unsignedintsegNo;`
`560`	`560`	`intnmatch;`
`@@ -569,7 +569,7 @@ isRelDataFile(const char *path)`
`569`	`569`	`* base/<db oid>/`
`570`	`570`	`*regular relations, default tablespace`
`571`	`571`	`*`
`572`		`- * pg_tblspc/<tblspc oid>/PG_9.4_201403261/`
	`572`	`+ * pg_tblspc/<tblspc oid>/<tblspc version>/`
`573`	`573`	`*within a non-default tablespace (the name of the directory`
`574`	`574`	`*depends on version)`
`575`	`575`	`*`
`@@ -603,21 +603,19 @@ isRelDataFile(const char *path)`
`603`	`603`	`}`
`604`	`604`	`else`
`605`	`605`	`{`
`606`		`-nmatch=sscanf(path,"pg_tblspc/%u/PG_%20s/%u/%u.%u",`
`607`		`-&rnode.spcNode,buf,&rnode.dbNode,&rnode.relNode,`
	`606`	`+nmatch=sscanf(path,"pg_tblspc/%u/"TABLESPACE_VERSION_DIRECTORY"/%u/%u.%u",`
	`607`	`+&rnode.spcNode,&rnode.dbNode,&rnode.relNode,`
`608`	`608`	`&segNo);`
`609`		`-if (nmatch==4\|\|nmatch==5)`
	`609`	`+if (nmatch==3\|\|nmatch==4)`
`610`	`610`	`matched= true;`
`611`	`611`	`}`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`/*`
`615`	`615`	`* The sscanf tests above can match files that have extra characters at`
`616`		`- * the end, and the last check can also match a path belonging to a`
`617`		`- * different version (different TABLESPACE_VERSION_DIRECTORY). To make`
`618`		`- * eliminate such cases, cross-check that GetRelationPath creates the`
`619`		`- * exact same filename, when passed the RelFileNode information we`
`620`		`- * extracted from the filename.`
	`616`	`+ * the end. To eliminate such cases, cross-check that GetRelationPath`
	`617`	`+ * creates the exact same filename, when passed the RelFileNode information`
	`618`	`+ * we extracted from the filename.`
`621`	`619`	`*/`
`622`	`620`	`if (matched)`
`623`	`621`	`{`

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!

Commit2f3e234

File tree

1 file changed

1 file changed

`‎src/bin/pg_rewind/filemap.c`

0 commit comments