Merge lp:~hopem/charms/trusty/swift-proxy/support-rsync-acl into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

[Edward Hope-Morley]

[Edward Hope-Morley (hopem)]

Before:
    ubuntu@dev:~$ juju ssh swift-storage-z1/0 "sudo grep 'hosts allow' /etc/rsync-juju.d/050-swift-storage.conf"
    ubuntu@dev:~$
    ubuntu@dev:~$ tmp=`mktemp -d`; rsync -var $tmp swift@`juju-deployer -f swift-storage-z1`::object; rm -rf $tmp
    2015-11-24 12:07:09 Service: swift-storage-z1 address: 10.5.16.232
    sending incremental file list
    tmp.wcuTXHLGnG/

    sent 84 bytes received 20 bytes 208.00 bytes/sec
    total size is 0 speedup is 0.00

After:
    ubuntu@dev:~$ juju ssh swift-storage-z1/0 "sudo grep 'hosts allow' /etc/rsync-juju.d/050-swift-storage.conf"
    hosts allow = 10.5.16.242 10.5.16.243 10.5.16.244
    hosts allow = 10.5.16.242 10.5.16.243 10.5.16.244
    hosts allow = 10.5.16.242 10.5.16.243 10.5.16.244

    ubuntu@dev:~$ tmp=`mktemp -d`; rsync -var $tmp swift@`juju-deployer -f swift-storage-z1`::object; rm -rf $tmp
    2015-11-24 13:02:58 Service: swift-storage-z1 address: 10.5.16.242
    @ERROR: access denied to object from UNKNOWN (10.5.0.3)
    rsync error: error starting client-server protocol (code 5) at main.c(1653) [sender=3.1.0]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14308 swift-proxy-next for hopem mp278426
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14308/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13337 swift-proxy-next for hopem mp278426
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13337/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8026 swift-proxy-next for hopem mp278426
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8026/

[James Page (james-page)]

review: Needs Fixing

[lp:~hopem/charms/trusty/swift-proxy/support-rsync-acl]

128. By Edward Hope-Morley on 2015-11-27

remove unit from relation_set

[Ryan Beisner (1chb1n)]

FYI, re-running amulet test...

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8051 swift-proxy-next for hopem mp278426
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8051/

Unmerged revisions

=== modified file 'hooks/swift_hooks.py'
--- hooks/swift_hooks.py	2015-11-06 18:33:58 +0000
+++ hooks/swift_hooks.py	2015-11-27 09:48:56 +0000
@@ -2,6 +2,7 @@
 
 import os
 import sys
+import time
 
 from subprocess import (
     check_call,
@@ -192,6 +193,43 @@
         mark_www_rings_deleted()
 
 
+def get_host_ip(rid=None, unit=None):
+    addr = relation_get('private-address', rid=rid, unit=unit)
+    if config('prefer-ipv6'):
+        host_ip = format_ipv6_addr(addr)
+        if host_ip:
+            return host_ip
+        else:
+            msg = ("Did not get IPv6 address from storage relation "
+                   "(got=%s)" % (addr))
+            log(msg, level=WARNING)
+
+    return openstack.get_host_ip(addr)
+
+
+def update_rsync_acls():
+    """Get Host IP of each storage unit and broadcast acl to all units."""
+    hosts = []
+
+    if not is_elected_leader(SWIFT_HA_RES):
+        log("Skipping rsync acl update since not leader", level=DEBUG)
+        return
+
+    # Get all unit addresses
+    for rid in relation_ids('swift-storage'):
+        for unit in related_units(rid):
+            hosts.append(get_host_ip(rid=rid, unit=unit))
+
+    rsync_hosts = ' '.join(hosts)
+    log("Broadcasting acl '%s' to all storage units" % (rsync_hosts),
+        level=DEBUG)
+    # We add a timestamp so that the storage units know which is the newest
+    settings = {'rsync_allowed_hosts': rsync_hosts,
+                'timestamp': time.time()}
+    for rid in relation_ids('swift-storage'):
+        relation_set(relation_id=rid, **settings)
+
+
 @hooks.hook('swift-storage-relation-changed')
 @pause_aware_restart_on_change(restart_map())
 def storage_changed():
@@ -206,17 +244,13 @@
         return
 
     log("Leader established, updating ring builders", level=INFO)
-    addr = relation_get('private-address')
-    if config('prefer-ipv6'):
-        host_ip = format_ipv6_addr(addr)
-        if not host_ip:
-            msg = ("Did not get IPv6 address from storage relation "
-                   "(got=%s)" % (addr))
-            log(msg, level=WARNING)
-            host_ip = addr
-            return
-    else:
-        host_ip = openstack.get_host_ip(addr)
+    host_ip = get_host_ip()
+    if not host_ip:
+        log("No host ip found in storage relation - deferring storage "
+            "relation", level=WARNING)
+        return
+
+    update_rsync_acls()
 
     zone = get_zone(config('zone-assignment'))
     node_settings = {
@@ -540,6 +574,11 @@
     nrpe_setup.write()
 
 
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    update_rsync_acls()
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== added symlink 'hooks/upgrade-charm'
=== target is u'swift_hooks.py'
=== modified file 'unit_tests/test_swift_hooks.py'
--- unit_tests/test_swift_hooks.py	2015-10-13 12:59:52 +0000
+++ unit_tests/test_swift_hooks.py	2015-11-27 09:48:56 +0000
@@ -1,8 +1,12 @@
-from mock import patch
 import sys
 import unittest
 import uuid
 
+from mock import (
+    call,
+    patch,
+)
+
 sys.path.append("hooks")
 with patch('charmhelpers.core.hookenv.log'):
     with patch('lib.swift_utils.is_paused') as is_paused:
@@ -129,3 +133,29 @@
             requested_roles='Operator,Monitor',
             relation_id=None
         )
+
+    @patch.object(swift_hooks.time, 'time')
+    @patch.object(swift_hooks, 'get_host_ip')
+    @patch.object(swift_hooks, 'is_elected_leader')
+    @patch.object(swift_hooks, 'related_units')
+    @patch.object(swift_hooks, 'relation_ids')
+    @patch.object(swift_hooks, 'relation_set')
+    def test_update_rsync_acls(self, mock_rel_set, mock_rel_ids,
+                               mock_rel_units, mock_is_leader,
+                               mock_get_host_ip, mock_time):
+        mock_time.return_value = 1234
+        mock_is_leader.return_value = True
+        mock_rel_ids.return_value = ['storage:1']
+        mock_rel_units.return_value = ['unit/0', 'unit/1']
+
+        def fake_get_host_ip(rid, unit):
+            if unit == 'unit/0':
+                return '10.0.0.1'
+            elif unit == 'unit/1':
+                return '10.0.0.2'
+
+        mock_get_host_ip.side_effect = fake_get_host_ip
+        swift_hooks.update_rsync_acls()
+        calls = [call(rsync_allowed_hosts='10.0.0.1 10.0.0.2',
+                      relation_id='storage:1', timestamp=1234)]
+        mock_rel_set.assert_has_calls(calls)