fix 环境不分离root用户校验hostname问题

This commit is contained in:
liuheng
2024-04-25 11:19:11 +08:00
parent 53d0a7f0cf
commit 5edc1782b7
3 changed files with 31 additions and 60 deletions

View File

@ -212,57 +212,6 @@ class OMCommand():
TempfileManagement.removeTempFile(statusFile)
return clusterStatus
@staticmethod
def checkHostname(nodename):
"""
function: check host name
input : NA
output: NA
"""
try:
retry = 1
cmd = "pssh -s -H %s hostname" % (nodename)
while True:
(status, output) = subprocess.getstatusoutput(cmd)
if status == 0 and output.find("%s" % nodename) >= 0:
break
if retry >= 3:
raise Exception(ErrorCode.GAUSS_512["GAUSS_51222"]
+ " Command: \"%s\". Error: \n%s"
% (cmd, output))
retry += 1
time.sleep(1)
if os.getuid() == 0:
hostnameCmd = "pssh -s -H %s 'cat /etc/hostname'" % (nodename)
(status, output) = subprocess.getstatusoutput(hostnameCmd)
if status == 0 and output.strip() == nodename:
pass
else:
raise Exception(ErrorCode.GAUSS_512["GAUSS_51248"] % nodename
+ " Command: \"%s\". Error: \n%s"
% (hostnameCmd, output))
except Exception as e:
raise Exception(str(e))
@staticmethod
def checkHostnameMapping(clusterInfo):
"""
function: check host name mapping
input: NA
output: NA
"""
nodes = clusterInfo.getClusterNodeNames()
if len(nodes) > 0:
try:
pool = ThreadPool(DefaultValue.getCpuSet())
pool.map(OMCommand.checkHostname, nodes)
pool.close()
pool.join()
except Exception as e:
raise Exception(str(e))
@staticmethod
def wait_for_normal(logger, user, timeout=300, delta=5):