database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Fix pg_rewind to handle relation data files in tablespaces properly.

Browse Source 
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 to
recognize any relation data files in tablespaces. Which also caused
an assertion failure in pg_rewind.

Back-patch to 9.5 where pg_rewind was added.

Author: Takayuki Tsunakawa
Reviewed-by: Michael Paquier
Discussion: https://postgr.es/m/0A3221C70F24FB45833433255569204D1F8D6C7A@G01JPEXMBYT05
This commit is contained in:
Fujii Masao 2018-03-06 02:08:18 +09:00
parent 09230e54fb
commit 2f3e2340cd
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/pg_rewind/filemap.c
View File

@ -19,6 +19,7 @@
#include "pg_rewind.h"
#include "common/string.h"
#include "catalog/catalog.h"
#include "catalog/pg_tablespace.h"
#include "storage/fd.h"
@ -554,7 +555,6 @@ print_filemap(void)
static bool
isRelDataFile(const char *path)
{
char buf[20 + 1];
RelFileNode rnode;
unsigned int segNo;
int nmatch;
@ -569,7 +569,7 @@ isRelDataFile(const char *path)
* base/<db oid>/
* regular relations, default tablespace
*
* pg_tblspc/<tblspc oid>/PG_9.4_201403261/
* pg_tblspc/<tblspc oid>/<tblspc version>/
* within a non-default tablespace (the name of the directory
* depends on version)
*
@ -603,21 +603,19 @@ isRelDataFile(const char *path)
}
else
{
nmatch = sscanf(path, "pg_tblspc/%u/PG_%20s/%u/%u.%u",
&rnode.spcNode, buf, &rnode.dbNode, &rnode.relNode,
nmatch = sscanf(path, "pg_tblspc/%u/" TABLESPACE_VERSION_DIRECTORY "/%u/%u.%u",
&rnode.spcNode, &rnode.dbNode, &rnode.relNode,
&segNo);
if (nmatch == 4 || nmatch == 5)
if (nmatch == 3 || nmatch == 4)
matched = true;
}
}
/*
* The sscanf tests above can match files that have extra characters at
* the end, and the last check can also match a path belonging to a
* different version (different TABLESPACE_VERSION_DIRECTORY). To make
* eliminate such cases, cross-check that GetRelationPath creates the
* exact same filename, when passed the RelFileNode information we
* extracted from the filename.
* the end. To eliminate such cases, cross-check that GetRelationPath
* creates the exact same filename, when passed the RelFileNode information
* we extracted from the filename.
*/
if (matched)
{