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

Add wait for IP connectivity

Browse Source 
After config, there may be a delay
before the configuration takes effect.

This delay can break nodeconfig.

Try to wait for the delay to pass.
This commit is contained in:
Jarrod Johnson 2022-08-09 08:50:19 -04:00
parent f0c8eee956
commit 047cd6302a
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
confluent_server/confluent/discovery/core.py
View File

@ -82,6 +82,7 @@ import confluent.util as util
import eventlet
import traceback
import shlex
import eventlet.green.socket as socket
import socket as nsocket
import eventlet.green.subprocess as subprocess
webclient = eventlet.import_patched('pyghmi.util.webclient')
@ -1209,8 +1210,15 @@ def discover_node(cfg, handler, info, nodename, manual):
log.log({'info': 'Discovered {0} ({1})'.format(nodename,
handler.devname)})
if nodeconfig:
subprocess.check_call(['/opt/confluent/bin/nodeconfig', nodename] + nodeconfig)
log.log({'info': 'Configured {0} ({1})'.format(nodename,
bmcaddr = cfg.get_node_attributes(nodename, 'hardwaremanagement.manager')
bmcaddr = bmcaddr.get(nodename, {}).get('hardwaremanagement.manager', {}).get('value', '')
if not bmcaddr:
log.log({'error': 'Unable to get BMC address for {0]'.format(nodename)})
else:
wait_for_connection(bmcaddr)
socket.getaddrinfo(bmcaddr, 443)
subprocess.check_call(['/opt/confluent/bin/nodeconfig', nodename] + nodeconfig)
log.log({'info': 'Configured {0} ({1})'.format(nodename,
handler.devname)})
info['discostatus'] = 'discovered'
@ -1236,6 +1244,18 @@ def discover_node(cfg, handler, info, nodename, manual):
info['discofailure'] = 'policy'
return False
def wait_for_connection(bmcaddr):
expiry = 75 + util.monotonic_time()
while util.monotonic_time() < expiry:
for addrinf in socket.getaddrinfo(bmcaddr, 443, proto=socket.IPPROTO_TCP):
try:
tsock = socket.socket(addrinf[0])
tsock.settimeout(1)
tsock.connect(addrinf[4])
return
except OSError:
continue
eventlet.sleep(1)
def do_pxe_discovery(cfg, handler, info, manual, nodename, policies):
# use uuid based scheme in lieu of tls cert, ideally only