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

修复子用户环境分离找不到GPHOME

Browse Source
This commit is contained in:
liuheng
2024-02-02 11:33:51 +08:00
parent 8a4fd42f13
commit bf18c05cbf
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
script/gspylib/threads/SshTool.py
View File

@ -269,12 +269,18 @@ class SshTool():
output: output
"""
try:
cmd = "source %s && echo $GPHOME" % osProfile
(status, output) = subprocess.getstatusoutput(cmd)
if status != 0 or not output or output.strip() == "":
raise Exception(ErrorCode.GAUSS_518["GAUSS_51802"] % "GPHOME"
+ "The cmd is %s" % cmd)
return output.strip()
gp_home = ""
# osProfile if exists
if osProfile and os.path.isfile(osProfile):
cmd = "source %s && echo $GPHOME" % osProfile
(status, output) = subprocess.getstatusoutput(cmd)
if status == 0:
gp_home = output.strip()
if not gp_home:
gp_home = os.environ.get('GPHOME')
if not gp_home:
raise Exception(ErrorCode.GAUSS_518["GAUSS_51802"] % "GPHOME")
return gp_home
except Exception as e:
raise Exception(str(e))
@ -727,6 +733,7 @@ class SshTool():
input : srcFile, targetDir, hostList, env_file, gp_path, parallel_num
output: NA
"""
gp_home = ""
outputCollect = ""
localMode = False
resultMap = {}
@ -742,11 +749,9 @@ class SshTool():
if mpprcFile and os.path.isfile(mpprcFile):
cmd = "source %s && echo $GPHOME" % mpprcFile
(status, output) = subprocess.getstatusoutput(cmd)
if status != 0 or not output or output.strip() == "":
raise Exception(ErrorCode.GAUSS_518["GAUSS_51802"]
% "GPHOME" + "The cmd is %s" % cmd)
gp_home = output.strip()
else:
if status == 0:
gp_home = output.strip()
if not gp_home:
gp_home = os.environ.get('GPHOME')
if gp_path != "":
gp_home = gp_path.strip()