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

!4078 【代码回合】issue修复：gs_basebackup命令写入stdout执行失败修复 #2984

Browse Source 
Merge pull request !4078 from zhangxubo/master-sync
This commit is contained in:
opengauss_bot
2023-09-13 06:38:16 +00:00
committed by Gitee
parent 6713c7e5ef eb2a65822c
commit 02c92d5e6f
2 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/bin/pg_basebackup/pg_basebackup.cpp
View File

@ -635,8 +635,6 @@ static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
duplicatedfd = -1;
disconnect_and_exit(1);
}
close(duplicatedfd);
duplicatedfd = -1;
} else
#endif
tarfile = stdout;
@ -692,6 +690,10 @@ static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
/* Compression is in use */
pg_log(stderr, _("%s: could not create compressed file \"%s\": %s\n"), progname, filename,
get_gz_error(ztarfile));
if(duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
disconnect_and_exit(1);
}
} else
@ -734,6 +736,10 @@ static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
progname,
filename,
get_gz_error(ztarfile));
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
disconnect_and_exit(1);
}
} else
@ -764,6 +770,10 @@ static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
progname,
filename,
get_gz_error(ztarfile));
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
disconnect_and_exit(1);
}
} else
@ -779,6 +789,12 @@ static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
progress_report(rownum, filename);
} /* while (1) */
#ifdef HAVE_LIBZ
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
#endif
if (copybuf != NULL) {
PQfreemem(copybuf);
copybuf = NULL;
@ -1985,11 +2001,16 @@ static int GsBaseBackup(int argc, char** argv)
GS_FREE(basedir);
check_env_value_c(optarg);
char realDir[PATH_MAX] = {0};
if (realpath(optarg, realDir) == nullptr) {
bool argIsMinus = (strcmp(optarg, "-") == 0);
if (!argIsMinus && realpath(optarg, realDir) == nullptr) {
pg_log(stderr, _("%s: realpath dir \"%s\" failed: %m\n"), progname, optarg);
exit(1);
}
basedir = xstrdup(realDir);
if (argIsMinus) {
basedir = xstrdup(optarg);
} else {
basedir = xstrdup(realDir);
}
break;
}
case 'F':

20
src/bin/pg_ctl/fetchmot.cpp
View File

@ -107,8 +107,6 @@ static void MotReceiveAndAppendTarFile(const char* basedir, const char* chkptNam
duplicatedfd = -1;
disconnect_and_exit(1);
}
close(duplicatedfd);
duplicatedfd = -1;
} else
#endif
tarfile = stdout;
@ -158,6 +156,10 @@ static void MotReceiveAndAppendTarFile(const char* basedir, const char* chkptNam
if (gzclose(ztarfile) != 0) {
fprintf(stderr, _("%s: could not close compressed file \"%s\": %s\n"), progname, filename,
get_gz_error(ztarfile));
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
disconnect_and_exit(1);
}
} else
@ -229,6 +231,10 @@ static void MotReceiveAndAppendTarFile(const char* basedir, const char* chkptNam
if (ztarfile != NULL) {
if (!writeGzFile(ztarfile, copybuf, r)) {
fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"), progname, filename, strerror(errno));
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
disconnect_and_exit(1);
}
} else
@ -271,6 +277,10 @@ static void MotReceiveAndAppendTarFile(const char* basedir, const char* chkptNam
if (ztarfile != NULL) {
if (!writeGzFile(ztarfile, copybuf, r)) {
fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"), progname, filename, strerror(errno));
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
disconnect_and_exit(1);
}
} else
@ -290,6 +300,12 @@ static void MotReceiveAndAppendTarFile(const char* basedir, const char* chkptNam
}
} /* continuing data in existing file */
} /* loop over all data blocks */
#ifdef HAVE_LIBZ
if (duplicatedfd != -1) {
close(duplicatedfd);
duplicatedfd = -1;
}
#endif
if (tarfile != NULL) {
fclose(tarfile);
tarfile = NULL;