From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 29 Jul 2016 00:20:29 +0000 (-0400)
Subject: rgw: pass cr registry to managers
X-Git-Tag: v10.2.8~75^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87cb8474f523be1b281882c46a8a3597977a51c9;p=ceph.git

rgw: pass cr registry to managers

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit ef4d7eab11fb5d2a41c9c28b9eb8b075aaff0d05)

 Conflicts:
	src/rgw/rgw_rados.cc: removed ref to RGWSyncLogTrimThread (not backported)
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 3d946505f1430..59f7b39f1f3c7 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -594,13 +594,13 @@ int RGWRemoteDataLog::get_shard_info(int shard_id)
 int RGWRemoteDataLog::read_sync_status(rgw_data_sync_status *sync_status)
 {
   // cannot run concurrently with run_sync(), so run in a separate manager
-  RGWCoroutinesManager crs(store->ctx(), nullptr);
+  RGWCoroutinesManager crs(store->ctx(), store->get_cr_registry());
   return crs.run(new RGWReadDataSyncStatusCoroutine(&sync_env, sync_status));
 }
 
 int RGWRemoteDataLog::init_sync_status(int num_shards)
 {
-  RGWCoroutinesManager crs(store->ctx(), nullptr);
+  RGWCoroutinesManager crs(store->ctx(), store->get_cr_registry());
   return crs.run(new RGWInitDataSyncStatusCoroutine(&sync_env, num_shards));
 }