Browse Source

Merge "container_update: Retry removing containers." into stable/stein

changes/78/706478/1
Zuul 2 weeks ago
parent
commit
723b627c76
1 changed files with 19 additions and 4 deletions
  1. +19
    -4
      scripts/container-update.py

+ 19
- 4
scripts/container-update.py View File

@@ -16,6 +16,7 @@ import logging
import multiprocessing
import subprocess
import sys
import tenacity
import yaml
import yum

@@ -50,6 +51,12 @@ def parse_opts(argv):
return opts


@tenacity.retry(
reraise=True,
retry=tenacity.retry_if_exception_type(RuntimeError),
stop=tenacity.stop_after_attempt(3),
wait=tenacity.wait_fixed(1)
)
def rm_container(name):
log.info('Removing container: %s' % name)
subproc = subprocess.Popen(['/usr/bin/docker', 'rm', name],
@@ -57,12 +64,20 @@ def rm_container(name):
stderr=subprocess.PIPE,
universal_newlines=True)
cmd_stdout, cmd_stderr = subproc.communicate()
rc = subproc.returncode

if cmd_stdout:
log.debug(cmd_stdout)
if cmd_stderr and \
cmd_stderr != 'Error response from daemon: ' \
'No such container: {}\n'.format(name):
log.debug(cmd_stderr)

if rc != 0:

if 'No such container' in cmd_stderr:
log.warn('Container that does not exist cannot be deleted: '
'%s' % name)
else:
log.error('Error removing container: %s' % name)
log.error(cmd_stderr)
raise RuntimeError(cmd_stdout, cmd_stderr, rc)


def populate_container_rpms_list(container):

Loading…
Cancel
Save