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

!893 修该gs_basebackup错误消息不清晰问题

Browse Source 
Merge pull request !893 from xiepy/master
This commit is contained in:
opengauss-bot
2021-04-09 14:12:39 +08:00
committed by Gitee
parent 551710134c 992cadba2e
commit 5af8c3d0d3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/pg_basebackup/receivelog.cpp
View File

@ -283,17 +283,17 @@ static bool close_walfile(int walfile, const char* basedir, char* walname, bool
off_t currpos = lseek(walfile, 0, SEEK_CUR);
if (currpos == -1) {
pg_log(PG_PRINT, _("%s: could not get current position in file %s: %s\n"), progname, walname, strerror(errno));
pg_log(PG_PRINT, _("%s: could not get current position in file \"%s/%s\": %s\n"), progname, basedir, walname, strerror(errno));
return false;
}
if (fsync(walfile) != 0) {
pg_log(PG_PRINT, _("%s: could not fsync file %s: %s\n"), progname, walname, strerror(errno));
pg_log(PG_PRINT, _("%s: could not fsync file \"%s/%s\": %s\n"), progname, basedir, walname, strerror(errno));
return false;
}
if (close(walfile) != 0) {
pg_log(PG_PRINT, _("%s: could not close file %s: %s\n"), progname, walname, strerror(errno));
pg_log(PG_PRINT, _("%s: could not close file \"%s/%s\": %s\n"), progname, basedir, walname, strerror(errno));
return false;
}
@ -311,11 +311,11 @@ static bool close_walfile(int walfile, const char* basedir, char* walname, bool
nRet = snprintf_s(newfn, sizeof(newfn), sizeof(newfn) - 1, "%s/%s", basedir, walname);
securec_check_ss_c(nRet, "", "");
if (rename(oldfn, newfn) != 0) {
pg_log(PG_PRINT, _("%s: could not rename file %s: %s\n"), progname, walname, strerror(errno));
pg_log(PG_PRINT, _("%s: could not rename file \"%s/%s\": %s\n"), progname, basedir, walname, strerror(errno));
return false;
}
} else {
pg_log(PG_PRINT, _("%s: not renaming %s, segment is not complete.\n"), progname, walname);
pg_log(PG_PRINT, _("%s: not renaming \"%s/%s\", segment is not complete.\n"), progname, basedir, walname);
}
lastFlushPosition = pos;