stackforge/libra
Code Issues Proposed changes

[WORKER]+[MGM]: gearman needs string names, ports need ints, socks need close

Browse Source 
Change-Id: I72c9730ccb53bfe3fbe5291d8e6e7ec5099272e9
This commit is contained in:
Andrew Hutchings
2013-10-21 07:33:41 +01:00
committed by David Shrewsbury
parent aa58d4d7c0
commit 68cc1a0da1
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libra/mgm/controllers/build.py
View File

@@ -68,7 +68,7 @@ class BuildController(object):
if self.msg[self.RESPONSE_FIELD] == self.RESPONSE_SUCCESS: if self.msg[self.RESPONSE_FIELD] == self.RESPONSE_SUCCESS:
status = self._test_node(self.msg['name']) status = self._test_node(self.msg['name'])
if not status: if not status:
self.msg[self.RESPONSE_FIELD] == self.RESPONSE_FAILURE self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
return self.msg return self.msg
else: else:
self.logger.error( self.logger.error(
@@ -143,7 +143,7 @@ class BuildController(object):
job_data = {'hpcs_action': 'DIAGNOSTICS'} job_data = {'hpcs_action': 'DIAGNOSTICS'}
job_status = gm_client.submit_job( job_status = gm_client.submit_job(
name, job_data, background=False, wait_until_complete=True, str(name), job_data, background=False, wait_until_complete=True,
max_retries=10, poll_timeout=10 max_retries=10, poll_timeout=10
) )
if job_status.state == JOB_UNKNOWN: if job_status.state == JOB_UNKNOWN:
@@ -156,7 +156,7 @@ class BuildController(object):
return False return False
self.logger.debug(job_status.result) self.logger.debug(job_status.result)
# Would only happen if DIAGNOSTICS call not supported # Would only happen if DIAGNOSTICS call not supported
if job_status.result['hpcs_result'] == 'FAIL': if job_status.result['hpcs_response'] == 'FAIL':
return True return True
if job_status.result['network'] == 'FAIL': if job_status.result['network'] == 'FAIL':

3
libra/mgm/controllers/root.py
View File

@@ -59,7 +59,8 @@ class PoolMgmController(object):
self.msg = controller.run() self.msg = controller.run()
# Delete a built device if it has failed # Delete a built device if it has failed
if ( if (
action == 'BUILD_DEVICE' and self.msg == self.RESPONSE_FAILURE action == 'BUILD_DEVICE'
and self.msg[self.RESPONSE_FIELD] == self.RESPONSE_FAILURE
and 'name' in self.msg and 'name' in self.msg
): ):
delete_msg = {'name': self.msg['name']} delete_msg = {'name': self.msg['name']}

2
libra/mgm/controllers/vip.py
View File

@@ -105,6 +105,7 @@ class AssignIpController(object):
while True: while True:
try: try:
sock.connect((ip, port)) sock.connect((ip, port))
sock.close()
return True return True
except socket.error: except socket.error:
loop_count += 1 loop_count += 1
@@ -113,6 +114,7 @@ class AssignIpController(object):
"TCP connect error after floating IP assign {0}" "TCP connect error after floating IP assign {0}"
.format(ip) .format(ip)
) )
sock.close()
raise raise
time.sleep(2) time.sleep(2)

3
libra/worker/controller.py
View File

@@ -95,7 +95,7 @@ class LBaaSController(object):
for host_port in cfg.CONF['gearman']['servers']: for host_port in cfg.CONF['gearman']['servers']:
host, port = host_port.split(':') host, port = host_port.split(':')
try: try:
self._check_host(host, port) self._check_host(host, int(port))
except: except:
self.msg['gearman'].append( self.msg['gearman'].append(
{'host': host, 'status': self.RESPONSE_FAILURE} {'host': host, 'status': self.RESPONSE_FAILURE}
@@ -122,6 +122,7 @@ class LBaaSController(object):
sock.settimeout(5) sock.settimeout(5)
try: try:
sock.connect((ip, port)) sock.connect((ip, port))
sock.close()
return True return True
except socket.error: except socket.error:
self.logger.error( self.logger.error(