db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-21 11:42:02 +02:00
Code Issues Releases Activity

parse tablespace_map correctly

Browse Source
This commit is contained in:
Grigory Smolkin 2021-04-15 15:12:25 +03:00
parent 0e6e9a45e9
commit 6e2e78c494
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dir.c
View File

@ -1153,7 +1153,7 @@ read_tablespace_map(parray *links, const char *backup_dir)
path[MAXPGPATH];
pgFile *file;
if (sscanf(buf, "%1023s %1023s", link_name, path) != 2)
if (sscanf(buf, "%s %n", link_name, path) != 2)
elog(ERROR, "invalid format found in \"%s\"", map_path);
file = pgut_new(pgFile);
@ -1279,13 +1279,19 @@ check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pg
TablespaceListCell *cell;
bool remapped = false;
elog(INFO, "Linked path: \"%s\"", linked_path);
for (cell = tablespace_dirs.head; cell; cell = cell->next)
{
elog(INFO, "Remap dir: \"%s\"", cell->old_dir);
if (strcmp(link->linked, cell->old_dir) == 0)
{
linked_path = cell->new_dir;
remapped = true;
break;
}
}
if (!is_absolute_path(linked_path))
elog(ERROR, "Tablespace directory path must be an absolute path: %s\n",