xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Separate connection check from connection

Browse Source 
Messing with connect corrupted
the http client too much,
have a separate helper function to evaluate
the candidate deployers,
then pass only the winner on.
This commit is contained in:
Jarrod Johnson 2021-09-13 11:21:38 -04:00
parent 95ea913108
commit 66ddcfc194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
confluent_osdeploy/common/opt/confluent/bin/apiclient
View File

@ -94,14 +94,17 @@ class HTTPSClient(client.HTTPConnection, object):
self.v6srv = v6srv
self.port = port
self.host = None
self.connect()
client.HTTPConnection.__init__(self, host, port)
self.node = node
host = self.check_connections()
client.HTTPConnection.__init__(self, host, port)
self.connect()
def set_header(self, key, val):
self.stdheaders[key] = val
def connect(self):
def check_connections(self):
foundsrv = None
hosts = []
if self.v4srv:
hosts.append(self.v4srv)
@ -112,11 +115,18 @@ class HTTPSClient(client.HTTPConnection, object):
addrinf = socket.getaddrinfo(host, self.port)[0]
psock = socket.socket(addrinf[0])
psock.connect(addrinf[4])
self.host = host
foundsrv = host
psock.close()
except OSError:
continue
if not self.host:
if not foundsrv:
raise Exception('Unable to reach any hosts')
return foundsrv
def connect(self):
addrinf = socket.getaddrinfo(self.host, self.port)[0]
psock = socket.socket(addrinf[0])
psock.connect(addrinf[4])
ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
ctx.load_verify_locations('/etc/confluent/ca.pem')
host = self.host.split('%', 1)[0]