openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Make swift_rings threading react to bad return codes"

Browse Source
This commit is contained in:
Jenkins 2017-02-17 14:43:45 +00:00 committed by Gerrit Code Review
commit 56190b63f5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
templates/swift_rings.py.j2
View File

@ -36,6 +36,16 @@ class RingValidationError(Exception):
pass pass
class ThreadWithErr(threading.Thread):
def run(self):
try:
threading.Thread.run(self)
except BaseException as err:
self.err = err
else:
self.err = None
def create_buildfile(build_file, part_power, repl, min_part_hours, def create_buildfile(build_file, part_power, repl, min_part_hours,
update=False, data=None, validate=False): update=False, data=None, validate=False):
if update: if update:
@ -118,9 +128,11 @@ def add_host_to_ring(build_file, host, validate=False):
def run_and_wait(func, *args): def run_and_wait(func, *args):
t = threading.Thread(target=func, args=args) t = ThreadWithErr(target=func, args=args)
t.start() t.start()
return t.join() t.join()
if t.err and t.err.code > 0:
sys.exit(t.err.code)
def get_build_file_data(build_file): def get_build_file_data(build_file):