openstack/charm-swift-storage
Code Issues Proposed changes

Merge "Catch exception of ring sync fails"

Browse Source
This commit is contained in:
Zuul 2018-12-12 09:43:26 +00:00 committed by Gerrit Code Review
commit c4897eff53
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/swift_storage_hooks.py
View File

@ -24,6 +24,7 @@ import socket
import subprocess import subprocess
import tempfile import tempfile
from subprocess import CalledProcessError
_path = os.path.dirname(os.path.realpath(__file__)) _path = os.path.dirname(os.path.realpath(__file__))
_root = os.path.abspath(os.path.join(_path, '..')) _root = os.path.abspath(os.path.join(_path, '..'))
@ -71,6 +72,7 @@ from charmhelpers.core.hookenv import (
status_set, status_set,
ingress_address, ingress_address,
DEBUG, DEBUG,
WARNING,
) )
from charmhelpers.fetch import ( from charmhelpers.fetch import (
@ -303,7 +305,16 @@ def swift_storage_relation_changed():
CONFIGS.write('/etc/rsync-juju.d/050-swift-storage.conf') CONFIGS.write('/etc/rsync-juju.d/050-swift-storage.conf')
CONFIGS.write('/etc/swift/swift.conf') CONFIGS.write('/etc/swift/swift.conf')
# NOTE(hopem): retries are handled in the function but it is possible that
# we are attempting to get rings from a proxy that is no
# longer publiscising them so lets catch the error, log a
# message and hope that the good rings_url us waiting to be
# consumed.
try:
fetch_swift_rings(rings_url) fetch_swift_rings(rings_url)
except CalledProcessError:
log("Failed to sync rings from {} - no longer available from that "
"unit?".format(rings_url), level=WARNING)
@hooks.hook('swift-storage-relation-departed') @hooks.hook('swift-storage-relation-departed')