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

!5750 修复6.0.0资源池化gs_probackup vgname如果只配置数据目录，不配置日志目录，还原后，日志目录会丢失原有的软连接

Browse Source 
Merge pull request !5750 from hejiahuan11/vgname-log
This commit is contained in:
opengauss_bot
2024-07-17 06:11:16 +00:00
committed by Gitee
parent aef5305f8d 6b2e0b8786
commit 2e7732d72d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/pg_probackup/util.cpp
View File

@ -532,18 +532,20 @@ get_redo(const char *pgdata_path, RedoParams *redo)
}
void
parse_vgname_args(const char* args)
void parse_vgname_args(const char* args)
{
char *vgname = xstrdup(args);
if (strstr(vgname, "/") != NULL)
elog(ERROR, "invalid token \"/\" in vgname");
/* Check vgname args */
char *comma = strstr(vgname, ",");
if (comma == NULL) {
instance_config.dss.vgdata = vgname;
instance_config.dss.vglog = const_cast<char*>("");
return;
elog(ERROR, "invalid vgname args, there is at least one \",\" in vgname\n"
"insufficient vgname args, check the number of args, example: --vgname=\"+data,+log\"");
}
if (*(comma + 1) == '\0' ){
elog(ERROR, "insufficient vgname args, check the number of args, example: --vgname=\"+data,+log\"");
}
instance_config.dss.vgdata = xstrdup(vgname);
@ -556,8 +558,7 @@ parse_vgname_args(const char* args)
elog(ERROR, "invalid vgname args, should be two volume group names, example: \"+data,+log\"");
}
bool
is_ss_xlog(const char *ss_dir)
bool is_ss_xlog(const char *ss_dir)
{
char ss_xlog[MAXPGPATH] = {0};
char ss_notify[MAXPGPATH] = {0};