]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix radosgw daemon core when reopen logs 10737/head
authorweiqiaomiao <wei.qiaomiao@zte.com.cn>
Tue, 16 Aug 2016 06:19:20 +0000 (14:19 +0800)
committerweiqiaomiao <wei.qiaomiao@zte.com.cn>
Tue, 16 Aug 2016 06:39:45 +0000 (14:39 +0800)
the rgw_user_st_syn thread use the pointer meta_mgr in RGWUserStatsCache::sync_all_users() fuction, so we should close the thread before delete the pointer in RGWRados::finalize() function when close storage before reopen_logs.

Fixes: http://tracker.ceph.com/issues/17036
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
src/rgw/rgw_rados.cc

index f3246b17ede3a4808f9c2df244f263e968894f3f..4d31877eb6cb2af649194d6d3a4c27ec18b9dd70 100644 (file)
@@ -3164,7 +3164,6 @@ void RGWRados::finalize()
     data_notifier->stop();
     delete data_notifier;
   }
-  delete meta_mgr;
   delete data_log;
   if (async_rados) {
     delete async_rados;
@@ -3201,6 +3200,7 @@ void RGWRados::finalize()
   if (cr_registry) {
     cr_registry->put();
   }
+  delete meta_mgr;
   delete binfo_cache;
   delete obj_tombstone_cache;
 }