hcq/CM
hcq/CM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复环境变量文件为相对路径导致monitor无法启动的问题

Browse Source
This commit is contained in:
xue_meng_en 2022-11-01 19:48:29 +08:00
parent 5e80e13dcb
commit 2b88920078
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tool/cm_tool/cm_install
View File

@ -60,9 +60,6 @@ class Install:
self.toolPath = getEnvParam(self.envFile, "GPHOME")
self.tmpPath = getEnvParam(self.envFile, "PGHOST")
def checkXMLFile(self):
checkXMLFile(self.xmlFile)
def checkExeUser(self):
if os.getuid() == 0:
CMLog.exitWithError(ErrorCode.GAUSS_501["GAUSS_50105"])
@ -107,13 +104,23 @@ General options:
def checkParam(self):
if self.xmlFile == "":
CMLog.exitWithError(ErrorCode.GAUSS_500["GAUSS_50001"] % 'X or xml' + ".")
CMLog.exitWithError(ErrorCode.GAUSS_500["GAUSS_50001"] % 'X' + ".")
checkXMLFile(self.xmlFile)
if self.cmpkg == "":
CMLog.exitWithError(ErrorCode.GAUSS_500["GAUSS_50001"] % 'cmpkg' + ".")
CMLog.exitWithError(ErrorCode.GAUSS_500["GAUSS_50001"] % '-cmpkg' + ".")
if not os.path.exists(self.cmpkg):
CMLog.exitWithError(ErrorCode.GAUSS_502["GAUSS_50201"] % self.cmpkg)
if self.envFile == "":
self.envFile = "~/.bashrc"
self.envFile = os.path.join(os.environ['HOME'], ".bashrc")
if not os.path.exists(self.envFile):
CMLog.exitWithError(ErrorCode.GAUSS_502["GAUSS_50201"] % ("envFile " + self.envFile))
if not os.path.isfile(self.envFile):
CMLog.exitWithError(ErrorCode.GAUSS_502["GAUSS_50210"] % ("envFile " + self.envFile))
self.envFile = getEnvParam(self.envFile, "MPPDB_ENV_SEPARATE_PATH")
if self.envFile == "" or not os.path.exists(self.envFile) or not os.path.isfile(self.envFile):
CMLog.exitWithError(ErrorCode.GAUSS_518["GAUSS_51802"] % 'MPPDB_ENV_SEPARATE_PATH' + ".")
def checkOm(self):
"""
@ -239,7 +246,6 @@ General options:
self.checkParam()
self.checkOm()
self.checkCM()
self.checkXMLFile()
self.getEnvParams()
self.initLogger()
self.getLocalhostName()

21
tool/cm_tool/cm_uninstall
View File

@ -82,23 +82,26 @@ General options:
def checkParam(self):
if self.xmlFile == "":
CMLog.exitWithError(
ErrorCode.GAUSS_500["GAUSS_50001"] % 'X' + ".")
CMLog.exitWithError(ErrorCode.GAUSS_500["GAUSS_50001"] % 'X' + ".")
checkXMLFile(self.xmlFile)
if self.envFile == "":
self.envFile = "~/.bashrc"
self.envFile = os.path.join(os.environ['HOME'], ".bashrc")
if not os.path.exists(self.envFile):
CMLog.exitWithError(ErrorCode.GAUSS_502["GAUSS_50201"] % ("envFile " + self.envFile))
if not os.path.isfile(self.envFile):
CMLog.exitWithError(ErrorCode.GAUSS_502["GAUSS_50210"] % ("envFile " + self.envFile))
self.envFile = getEnvParam(self.envFile, "MPPDB_ENV_SEPARATE_PATH")
if self.envFile == "" or not os.path.exists(self.envFile) or not os.path.isfile(self.envFile):
CMLog.exitWithError(ErrorCode.GAUSS_518["GAUSS_51802"] % 'MPPDB_ENV_SEPARATE_PATH' + ".")
def _checkXMLContainCMInfo(self):
def checkXMLContainCMInfo(self):
cmd = "grep -E 'cmDir|cmsNum|cmServerPortBase|cmServerPortStandby|cmServerlevel|" \
"cmServerListenIp1|cmServerRelation' " + self.xmlFile
status, output = subprocess.getstatusoutput(cmd)
if status == 0:
CMLog.exitWithError("%s should not contain CM infos.\nDetail:\n%s" % (self.xmlFile, output))
def checkXMLFile(self):
checkXMLFile(self.xmlFile)
self._checkXMLContainCMInfo()
def getHostnames(self):
"""
Get hostnames of all nodes from static file.
@ -248,7 +251,7 @@ General options:
self.checkExeUser()
self.parseCommandLine()
self.checkParam()
self.checkXMLFile()
self.checkXMLContainCMInfo()
self.initLogger()
self.logger.log("Start to uninstall CM.")
self.getHostnames()