openstack/tripleo-heat-templates
Code Issues Proposed changes

Reuse the container in case we have a temporary podman failure

Browse Source 
The "retry" patch[1] didn't take care of the existing container. This patch
intends to allow to reuse the container in case it has failed, in order to
avoid an error when the container is already existing.

[1] https://review.openstack.org/#/c/614639/

Change-Id: I5c7258c8687582f56b59ed410c0cc8f6ba4c2d4f
Context: https://github.com/containers/libpod/issues/1844
Related-Bug: #1811383
This commit is contained in:
Cédric Jeanneret 2019-01-16 14:03:16 +01:00
parent d747625b82
commit 704b6870ba
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/docker-puppet.py
View File

@ -456,8 +456,12 @@ def mp_puppet_config(*args):
count = 0 count = 0
log.debug('Running %s command: %s' % (container_cli, ' '.join(dcmd))) log.debug('Running %s command: %s' % (container_cli, ' '.join(dcmd)))
while count < 3: while count < 3:
if count == 0:
cmd = dcmd
else:
cmd = [cli_cmd, 'start', '-a', uname]
count += 1 count += 1
subproc = subprocess.Popen(dcmd, stdout=subprocess.PIPE, subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=env) stderr=subprocess.PIPE, env=env)
cmd_stdout, cmd_stderr = subproc.communicate() cmd_stdout, cmd_stderr = subproc.communicate()
retval = subproc.returncode retval = subproc.returncode
@ -465,14 +469,14 @@ def mp_puppet_config(*args):
# and 2 for success and resource changes. Other numbers are failures # and 2 for success and resource changes. Other numbers are failures
if retval in [0,2]: if retval in [0,2]:
if cmd_stdout: if cmd_stdout:
log.debug('%s run succeeded: %s' % (dcmd, cmd_stdout)) log.debug('%s run succeeded: %s' % (cmd, cmd_stdout))
if cmd_stderr: if cmd_stderr:
log.warning(cmd_stderr) log.warning(cmd_stderr)
# only delete successful runs, for debugging # only delete successful runs, for debugging
rm_container(uname) rm_container(uname)
break break
time.sleep(3) time.sleep(3)
log.warning('%s run failed after %s attempt(s): %s' % (dcmd, log.warning('%s run failed after %s attempt(s): %s' % (cmd,
cmd_stderr, cmd_stderr,
count)) count))
log.warning('Retrying running container: %s' % config_volume) log.warning('Retrying running container: %s' % config_volume)