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 e8a81da9029cda97c93493932ae98e6f483f867a..47d589d61e1c3cc25fe173f7e1259f096ac23cd9 100644 (file)
--- 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 0e6751444a61b46a7f38a83e1cb7b425257d4f4e..153708abe575368090d49a3b891394e8df10d231 100644 (file)
--- 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']):