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

!954 fix /etc/hosts存在冗余，ip和hostname映射有问题并支持一站式安装使用上下键

Browse Source 
Merge pull request !954 from liuheng/fix44
This commit is contained in:
opengauss_bot 2024-11-02 01:41:38 +00:00 committed by Gitee
commit f2632d45f1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
script/base_utils/os/hosts_util.py
View File

@ -96,30 +96,6 @@ class HostsUtil:
if hostname == name:
ip_list.append(ip)
return ip_list
@staticmethod
def ip_to_hostname(host_ip):
if not host_ip:
return ""
if host_ip[:1] == '[' and host_ip[-1:] == ']':
host_ip = host_ip.strip('[]')
# get hostname from /etc/hosts
hostname = HostsUtil.get_hostname_by_ip_from_etc_hosts(host_ip)
if hostname:
return hostname
hosts_file = FileUtil.get_hosts_file()
if not os.path.isfile(hosts_file):
raise Exception("hosts file is not exist")
contents = HostsUtil.read_hosts_file(hosts_file)
name = ""
for ip, hostname in contents.items():
if host_ip == ip:
name = hostname
return name
if name == "":
return host_ip
@staticmethod
def read_hosts_file(path, mode='r'):

1
script/gs_preinstall
View File

@ -25,6 +25,7 @@ import pwd
import sys
import grp
import subprocess
import readline
from gspylib.common.CheckPythonVersion import check_python_version, \
check_python_compiler_option, check_os_and_package_arch

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

@ -118,16 +118,19 @@ class SshTool():
self._finalizer = weakref.finalize(self, self.clen_ssh_result_files)
self.__sessions = {}
self.is_ip = False
self.host_ips_names_map = {}
if hostNames:
# if not ip, convert hostname to ip
if not SecurityChecker.check_is_ip(hostNames[0]):
self.is_ip = False
# key:value hostname:ip
host_ip_list = HostsUtil.hostname_list_to_ip_list(hostNames)
if not host_ip_list:
host_ips_list = HostsUtil.hostname_list_to_ip_list(hostNames)
if not host_ips_list:
raise Exception("Failed to hostname to ip.")
self.hostNames = host_ip_list
for ip, name in zip(host_ips_list, hostNames):
self.host_ips_names_map[ip] = name
self.hostNames = host_ips_list
else:
self.is_ip = True
@ -335,7 +338,8 @@ class SshTool():
if not self.is_ip:
res_map = {}
for key, value in resultMap.items():
name = HostsUtil.ip_to_hostname(key)
if key in self.host_ips_names_map:
name = self.host_ips_names_map[key]
res_map[name] = value
resultMap = res_map
@ -344,7 +348,8 @@ class SshTool():
sshErrorPutFile = "%s/%s" % (self.__errorPath, host)
# ip to hostname
if not self.is_ip:
host = HostsUtil.ip_to_hostname(host)
if host in self.host_ips_names_map:
host = self.host_ips_names_map[host]
if resultMap[host] == DefaultValue.SUCCESS:
prefix = "SUCCESS"
else:
@ -451,6 +456,8 @@ class SshTool():
else:
self.is_ip = False
host = HostsUtil.hostname_list_to_ip_list(host_list)
for ip, name in zip(host, host_list):
self.host_ips_names_map[ip] = name
return host
def executeCommand(self, cmd, cmdReturn=DefaultValue.SUCCESS,
@ -570,7 +577,8 @@ class SshTool():
if localMode:
if not self.is_ip:
hostList = [HostsUtil.ip_to_hostname(hostList[0])]
if hostList[0] in self.host_ips_names_map:
hostList = [self.host_ips_names_map[hostList[0]]]
resultMap[hostList[0]] = DefaultValue.SUCCESS if status == 0 \
else DefaultValue.FAILURE
outputCollect = "[%s] %s:\n%s" \
@ -586,7 +594,8 @@ class SshTool():
for host in hostList:
if not localMode and not self.is_ip:
host = HostsUtil.ip_to_hostname(host)
if host in self.host_ips_names_map:
host = self.host_ips_names_map[host]
if resultMap.get(host) != cmdReturn:
if outputCollect.find("GAUSS-5") == -1:
raise Exception(ErrorCode.GAUSS_514["GAUSS_51400"]
@ -713,7 +722,8 @@ class SshTool():
if localMode:
dir_permission = 0o700
if not self.is_ip:
hostList = [HostsUtil.ip_to_hostname(hostList[0])]
if hostList[0] in self.host_ips_names_map:
hostList = [self.host_ips_names_map[hostList[0]]]
if status == 0:
resultMap[hostList[0]] = DefaultValue.SUCCESS
outputCollect = "[%s] %s:\n%s" % ("SUCCESS", hostList[0],
@ -751,7 +761,8 @@ class SshTool():
for host in hostList:
if not localMode and not self.is_ip:
host = HostsUtil.ip_to_hostname(host)
if host in self.host_ips_names_map:
host = self.host_ips_names_map[host]
if resultMap.get(host) != DefaultValue.SUCCESS:
if outputCollect.find("GAUSS-5") == -1:
outputCollect = ErrorCode.GAUSS_514["GAUSS_51400"] \
@ -792,7 +803,8 @@ class SshTool():
sshErrorPutFile = "%s/%s" % (self.__errorPath, host)
if not self.is_ip:
host = HostsUtil.ip_to_hostname(host)
if host in self.host_ips_names_map:
host = self.host_ips_names_map[host]
if os.path.isfile(sshOutPutFile):
with open(sshOutPutFile, "r") as fp:
context = fp.read()
@ -896,7 +908,8 @@ class SshTool():
if local_mode:
dir_permission = 0o700
if not self.is_ip:
ssh_hosts = [HostsUtil.ip_to_hostname(ssh_hosts[0])]
if ssh_hosts[0] in self.host_ips_names_map:
ssh_hosts = [self.host_ips_names_map[ssh_hosts[0]]]
if status == 0:
resultMap[ssh_hosts[0]] = DefaultValue.SUCCESS
outputCollect = "[%s] %s:\n%s" % ("SUCCESS", ssh_hosts[0],
@ -931,7 +944,8 @@ class SshTool():
for host in ssh_hosts:
if not local_mode and not self.is_ip:
host = HostsUtil.ip_to_hostname(host)
if host in self.host_ips_names_map:
host = self.host_ips_names_map[host]
if resultMap.get(host) != DefaultValue.SUCCESS:
raise Exception(ErrorCode.GAUSS_502["GAUSS_50216"]
% ("file [%s]" % srcFile) +