Merge lp:~raharper/charms/trusty/swift-proxy/next-unique-get-zone into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

[Corey Bryant]

[Corey Bryant (corey.bryant)]

Looks good to me.

[Corey Bryant (corey.bryant)]

Actually, one comment. It'd probably be useful to reference the bug in your commit. e.g. bzr commit --fixes lp:1342891 hooks/swift_utils.py

[Ryan Harper (raharper)]

I did that in my branch:

------------------------------------------------------------
revno: 54
fixes bug: https://launchpad.net/bugs/1342891
committer: Ryan Harper <email address hidden>
branch nick: next-fix-1342891
timestamp: Wed 2014-07-16 14:07:14 -0500
message:
  uniquify swift-storage device list for zone calculation.

This should show up after merging the branch with:

bzr log -n 0 | less

On Wed, Jul 16, 2014 at 2:30 PM, Corey Bryant <email address hidden>
wrote:

> Actually, one comment. It'd probably be useful to reference the bug in
> your commit. e.g. bzr commit --fixes lp:1342891 hooks/swift_utils.py
> --
>
> https://code.launchpad.net/~raharper/charms/trusty/swift-proxy/next-unique-get-zone/+merge/227090
> You are the owner of
> lp:~raharper/charms/trusty/swift-proxy/next-unique-get-zone.
>

=== modified file 'hooks/swift_utils.py'
--- hooks/swift_utils.py	2014-04-10 16:52:10 +0000
+++ hooks/swift_utils.py	2014-07-16 19:11:22 +0000
@@ -275,8 +275,14 @@
     zones = [d['zone'] for d in ring_builder.devs]
     if not zones:
         return 1
-    if len(zones) < replicas:
-        return sorted(zones).pop() + 1
+
+    # zones is a per-device list, so we may have one
+    # node with 3 devices in zone 1.  For balancing
+    # we need to track the unique zones being used
+    # not necessarily the number of devices
+    unique_zones = list(set(zones))
+    if len(unique_zones) < replicas:
+        return sorted(unique_zones).pop() + 1
 
     zone_distrib = {}
     for z in zones: