hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!306 修复gs_probackup指定表空间外部目录备份后无法恢复表空间目录的问题

Browse Source 
Merge pull request !306 from yukai_k/master
This commit is contained in:
opengauss-bot
2020-10-16 09:38:22 +08:00
committed by Gitee
parent 9a119d3d9c 1e6bba22a5
commit 3106449ed3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gausskernel/storage/access/transam/xlog.cpp
View File

@ -12398,7 +12398,6 @@ XLogRecPtr do_pg_start_backup(const char* backupidstr, bool fast, char** labelfi
}
pfree(labelfbuf.data);
#ifdef ENABLE_MULTIPLE_NODES
/* Write backup tablespace_map file. */
if (tblspc_mapfbuf.len > 0) {
if (stat(TABLESPACE_MAP, &stat_buf) != 0) {
@ -12422,7 +12421,6 @@ XLogRecPtr do_pg_start_backup(const char* backupidstr, bool fast, char** labelfi
ereport(
ERROR, (errcode_for_file_access(), errmsg("could not write file \"%s\": %m", TABLESPACE_MAP)));
}
#endif
pfree(tblspc_mapfbuf.data);
} else {
*labelfile = labelfbuf.data;
@ -12588,6 +12586,9 @@ XLogRecPtr do_pg_stop_backup(char* labelfile, bool waitforarchive)
if (unlink(fileName) != 0) {
ereport(ERROR, (errcode_for_file_access(), errmsg("could not remove file \"%s\": %m", fileName)));
}
if (unlink(TABLESPACE_MAP) != 0) {
ereport(DEBUG1, (errcode_for_file_access(), errmsg("could not remove file \"%s\": %m", TABLESPACE_MAP)));
}
}
}