From ea5d7fdd7fa978deadeee42bc0ea33fb11662e59 Mon Sep 17 00:00:00 2001 From: weiqiaomiao Date: Tue, 16 Aug 2016 14:19:20 +0800 Subject: [PATCH] rgw: fix radosgw daemon core when reopen logs 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 --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index f3246b17ede3..4d31877eb6cb 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -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; } -- 2.47.3