openstack/charm-swift-proxy
Code Issues Proposed changes

[thedac,r=corey.bryant] Return False from has_minimum_zones() if ring file doesn't exist.

Browse Source
This commit is contained in:
Corey Bryant
2015-10-27 02:46:16 +00:00
parent 0cb10f1247 2c6f53066a
commit 9c3f22e593
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/swift_utils.py
View File

@@ -1017,6 +1017,8 @@ def pause_aware_restart_on_change(restart_map):
def has_minimum_zones(rings): def has_minimum_zones(rings):
"""Determine if enough zones exist to satisfy minimum replicas""" """Determine if enough zones exist to satisfy minimum replicas"""
for ring in rings: for ring in rings:
if not os.path.isfile(ring):
return False
builder = _load_builder(ring).to_dict() builder = _load_builder(ring).to_dict()
replicas = builder['replicas'] replicas = builder['replicas']
zones = [dev['zone'] for dev in builder['devs']] zones = [dev['zone'] for dev in builder['devs']]