Skip to content

C
configuration
Commit f0ed7375 by Feanil Patel
Options

Merge pull request #672 from edx/feanil/abbey_keyerror 

Feanil/abbey keyerror
parents a9153e12 61412ce1
Showing with 61 additions and 53 deletions
util/vpc-tools/abbey.py
...@@ -407,60 +407,68 @@ def poll_sqs_ansible(): ...@@ -407,60 +407,68 @@ def poll_sqs_ansible():
now = int(time.time()) now = int(time.time())
if buf: if buf:
if (now - max([msg['recv_ts'] for msg in buf])) > args.msg_delay: try:
# sort by TS instead of recv_ts if (now - max([msg['recv_ts'] for msg in buf])) > args.msg_delay:
# because the sqs timestamp is not as # sort by TS instead of recv_ts
# accurate # because the sqs timestamp is not as
buf.sort(key=lambda k: k['msg']['TS']) # accurate
to_disp = buf.pop(0) buf.sort(key=lambda k: k['msg']['TS'])
if 'START' in to_disp['msg']: to_disp = buf.pop(0)
print '\n{:0>2.0f}:{:0>5.2f} {} : Starting "{}"'.format( if 'START' in to_disp['msg']:
to_disp['msg']['TS'] / 60, print '\n{:0>2.0f}:{:0>5.2f} {} : Starting "{}"'.format(
to_disp['msg']['TS'] % 60, to_disp['msg']['TS'] / 60,
to_disp['msg']['PREFIX'], to_disp['msg']['TS'] % 60,
to_disp['msg']['START']), to_disp['msg']['PREFIX'],
to_disp['msg']['START']),
elif 'TASK' in to_disp['msg']:
print "\n{:0>2.0f}:{:0>5.2f} {} : {}".format( elif 'TASK' in to_disp['msg']:
to_disp['msg']['TS'] / 60, print "\n{:0>2.0f}:{:0>5.2f} {} : {}".format(
to_disp['msg']['TS'] % 60, to_disp['msg']['TS'] / 60,
to_disp['msg']['PREFIX'], to_disp['msg']['TS'] % 60,
to_disp['msg']['TASK']), to_disp['msg']['PREFIX'],
last_task = to_disp['msg']['TASK'] to_disp['msg']['TASK']),
elif 'OK' in to_disp['msg']: last_task = to_disp['msg']['TASK']
if args.verbose: elif 'OK' in to_disp['msg']:
print "\n" if args.verbose:
for key, value in to_disp['msg']['OK'].iteritems(): print "\n"
print " {:<15}{}".format(key, value) for key, value in to_disp['msg']['OK'].iteritems():
else: print " {:<15}{}".format(key, value)
if to_disp['msg']['OK']['changed']:
changed = "*OK*"
else: else:
changed = "OK" invocation = to_disp['msg']['OK']['invocation']
print " {}".format(changed), module = invocation['module_name']
task_report.append({ # 'set_fact' does not provide a changed value.
'TASK': last_task, if module == 'set_fact':
'INVOCATION': to_disp['msg']['OK']['invocation'], changed = "OK"
'DELTA': to_disp['msg']['delta'], elif to_disp['msg']['OK']['changed']:
}) changed = "*OK*"
elif 'FAILURE' in to_disp['msg']: else:
print " !!!! FAILURE !!!!", changed = "OK"
for key, value in to_disp['msg']['FAILURE'].iteritems(): print " {}".format(changed),
print " {:<15}{}".format(key, value) task_report.append({
raise Exception("Failed Ansible run") 'TASK': last_task,
elif 'STATS' in to_disp['msg']: 'INVOCATION': to_disp['msg']['OK']['invocation'],
print "\n{:0>2.0f}:{:0>5.2f} {} : COMPLETE".format( 'DELTA': to_disp['msg']['delta'],
to_disp['msg']['TS'] / 60, })
to_disp['msg']['TS'] % 60, elif 'FAILURE' in to_disp['msg']:
to_disp['msg']['PREFIX']) print " !!!! FAILURE !!!!",
for key, value in to_disp['msg']['FAILURE'].iteritems():
# Since 3 ansible plays get run. print " {:<15}{}".format(key, value)
# We see the COMPLETE message 3 times raise Exception("Failed Ansible run")
# wait till the last one to end listening elif 'STATS' in to_disp['msg']:
# for new messages. print "\n{:0>2.0f}:{:0>5.2f} {} : COMPLETE".format(
completed += 1 to_disp['msg']['TS'] / 60,
if completed >= NUM_PLAYBOOKS: to_disp['msg']['TS'] % 60,
return (to_disp['msg']['TS'], task_report) to_disp['msg']['PREFIX'])
# Since 3 ansible plays get run.
# We see the COMPLETE message 3 times
# wait till the last one to end listening
# for new messages.
completed += 1
if completed >= NUM_PLAYBOOKS:
return (to_disp['msg']['TS'], task_report)
except KeyError:
print "Failed to print status from message: {}".format(to_disp)
if not messages: if not messages:
# wait 1 second between sqs polls # wait 1 second between sqs polls
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment