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

fix expansion error

Browse Source
This commit is contained in:
zhangxubo
2021-05-25 22:19:46 +08:00
parent 56407518a3
commit 00a2ad6fff
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
script/impl/expansion/ExpansionImpl.py
View File

@ -823,8 +823,8 @@ gs_guc set -D {dn} -c "available_zone='{azName}'"
if not os.path.exists(static_config_dir): if not os.path.exists(static_config_dir):
os.makedirs(static_config_dir) os.makedirs(static_config_dir)
# valid if dynamic config file exists. # valid if dynamic config file exists on primary node.
dynamic_file = "%s/bin/cluster_dynamic_config" % appPath dynamic_file = os.path.join(appPath, "bin", "cluster_dynamic_config")
dynamic_file_exist = False dynamic_file_exist = False
if os.path.exists(dynamic_file): if os.path.exists(dynamic_file):
dynamic_file_exist = True dynamic_file_exist = True
@ -840,10 +840,15 @@ gs_guc set -D {dn} -c "available_zone='{azName}'"
hostSsh = SshTool([hostName]) hostSsh = SshTool([hostName])
targetFile = "%s/bin/cluster_static_config" % appPath targetFile = "%s/bin/cluster_static_config" % appPath
hostSsh.scpFiles(srcFile, targetFile, [hostName], self.envFile) hostSsh.scpFiles(srcFile, targetFile, [hostName], self.envFile)
# if dynamic config file exists, freshconfig it. # if dynamic config file exists on primary node, refreshconf on each host.
# if not, remove it on standby nodes if exists.
dynamic_opt_cmd = ""
if dynamic_file_exist: if dynamic_file_exist:
refresh_cmd = "gs_om -t refreshconf" dynamic_opt_cmd = "gs_om -t refreshconf"
hostSsh.getSshStatusOutput(refresh_cmd, [hostName], self.envFile) else:
dynamic_opt_cmd = "if [ -f '%s' ];then rm %s;fi" % \
(dynamic_file, dynamic_file)
hostSsh.getSshStatusOutput(dynamic_opt_cmd, [hostName], self.envFile)
self.cleanSshToolFile(hostSsh) self.cleanSshToolFile(hostSsh)
self.logger.log("End to generate and send cluster static file.\n") self.logger.log("End to generate and send cluster static file.\n")