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

!1228 bug_fix gs_ctl build备机重建时指定不存在的实例目录, 失败报错信息不一致

Browse Source 
Merge pull request !1228 from cchen676/new_master
This commit is contained in:
opengauss-bot
2021-08-28 03:49:06 +00:00
committed by Gitee
parent 079e63b7f6 cc7f1929ee
commit 7792edfa36
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/pg_ctl/pg_ctl.cpp
View File

@ -3963,11 +3963,11 @@ static void find_nested_pgconf(const char** optlines, char* opt_name)
while (isspace((unsigned char)*p)) {
p++;
}
pg_fatal(
_("There is nested config file in postgresql.conf: %sWhich is not supported by full build. "
pg_log(PG_WARNING,
_("There is nested config file in postgresql.conf: %sWhich is not supported by build. "
"Please move out the nested config files from %s and comment the 'include' config in postgresql.conf.\n"
"You can add option '-q' to disable autostart during full build and restore the change manually "
"before starting gaussdb."),
"You can add option '-q' to disable autostart during build and restore the change manually "
"before starting gaussdb.\n"),
p,
pg_data);
exit(1);
@ -3986,6 +3986,11 @@ static void check_nested_pgconf(void)
config_file[MAXPGPATH - 1] = '\0';
optlines = readfile(config_file);
if (optlines == NULL) {
pg_log(PG_WARNING, _("%s cannot be opened.\n"), config_file);
exit(1);
}
for (int i = 0; i < (int)lengthof(optname); i++) {
find_nested_pgconf((const char**)optlines, optname[i]);
}