From: Joe Buck <jbbuck@gmail.com>
Date: Sat, 17 Aug 2013 00:32:45 +0000 (-0700)
Subject: rgw: fix domain root pool name assignment
X-Git-Tag: 1.1.0~1964
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7061e3c6dc2d6d685ff802b2adcf84288c13655e;p=teuthology.git

rgw: fix domain root pool name assignment

Do not make the domain root pool the same
as the zone root pool. That causes sync issues.
Also, clarify a logging message.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index e8a81da902..47d589d61e 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -271,12 +271,10 @@ def extract_zone_info(ctx, client, client_config):
                                                                   client=client)
     region = ceph_config['rgw region']
     zone = ceph_config['rgw zone']
-    zone_info = dict(
-        domain_root=ceph_config['rgw zone root pool'],
-        )
+    zone_info = dict()
     for key in ['rgw control pool', 'rgw gc pool', 'rgw log pool', 'rgw intent log pool',
                 'rgw usage log pool', 'rgw user keys pool', 'rgw user email pool',
-                'rgw user swift pool', 'rgw user uid pool']:
+                'rgw user swift pool', 'rgw user uid pool', 'rgw domain root']:
         new_key = key.split(' ',1)[1]
         new_key = new_key.replace(' ', '_')
 
diff --git a/teuthology/task_util/rgw.py b/teuthology/task_util/rgw.py
index 0e6751444a..153708abe5 100644
--- a/teuthology/task_util/rgw.py
+++ b/teuthology/task_util/rgw.py
@@ -108,10 +108,9 @@ def radosgw_agent_sync_all(ctx):
     if ctx.radosgw_agent.procs:
         for agent_client, c_config in ctx.radosgw_agent.config.iteritems():
             dest_zone = zone_for_client(ctx, agent_client)
-            sync_dest, sync_port = get_sync_agent(ctx, agent_client)
-            log.debug('doing a sync from {host1} to {host2}'.format(
-                host1=agent_client,host2=sync_dest))
-            radosgw_agent_sync(ctx, sync_dest, sync_port)
+            sync_host, sync_port = get_sync_agent(ctx, agent_client)
+            log.debug('doing a sync via {host1}'.format(host1=sync_host))
+            radosgw_agent_sync(ctx, sync_host, sync_port)
 
 def host_for_role(ctx, role):
     for target, roles in zip(ctx.config['targets'].iterkeys(), ctx.config['roles']):