]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: pass cr registry to managers
authorCasey Bodley <cbodley@redhat.com>
Fri, 29 Jul 2016 00:20:29 +0000 (20:20 -0400)
committerCasey Bodley <cbodley@redhat.com>
Thu, 6 Apr 2017 19:04:38 +0000 (15:04 -0400)
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)

src/rgw/rgw_data_sync.cc

index 3d946505f1430c10d0a456140746e67c174ae70e..59f7b39f1f3c741c87facad286be30ebe3714c10 100644 (file)
@@ -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));
 }