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

!296 启动超时参数调用错误修复

Browse Source 
Merge pull request !296 from hangjin2020/for_lib
This commit is contained in:
opengauss-bot 2022-06-14 02:50:05 +00:00 committed by Gitee
commit 90c4dc07ba
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/gspylib/common/Common.py
View File

@ -2241,7 +2241,7 @@ class DefaultValue():
or "cluster_state : Degraded" in output):
break
if count == 2:
start_cmd = "source {0} && gs_om -t start --timeout 30".format(userProfile)
start_cmd = "source {0} && gs_om -t start --time-out 30".format(userProfile)
_, output = subprocess.getstatusoutput(start_cmd)
if logger:
logger.debug("Start cluster for get current primary datanode, "

4
script/gspylib/common/DbClusterInfo.py
View File

@ -2496,7 +2496,7 @@ class dbClusterInfo():
% xmlFile + " Error:\n%s" % str(e))
self.__readClusterGlobalInfo()
if self.__read_and_check_config_item(xmlRootNode, "clusterType", "cluster") == \
if self.__read_and_check_config_item(xmlRootNode, "clusterType", "cluster", True) == \
"single-inst-one-node":
self.__read_cluster_node_info_for_one()
else:
@ -2526,7 +2526,7 @@ class dbClusterInfo():
self.dbNodes.append(db_node)
# Get datanode info
for i in range(db_node.dataNum):
db_inst = instanceInfo(BASE_ID_DUMMYDATANODE + i, 1)
db_inst = instanceInfo(BASE_ID_DATANODE + i, 1)
db_inst.hostname = node_name
db_inst.datadir = self.__readNodeStrValue(node_name, "dataNode%s" % (i+1))
db_inst.instanceType = MASTER_INSTANCE if i == 0 else STANDBY_INSTANCE