RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: delete entries_index in RGWFetchAllMetaCR

Browse Source 
use a unique_ptr to ensure the entries_index is freed on destruction

Fixes: http://tracker.ceph.com/issues/17812

Signed-off-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2016-11-04 12:18:32 -04:00
parent a50ede03f6
commit 9c731ed6b6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rgw/rgw_sync.cc
View File

@ -735,7 +735,7 @@ class RGWFetchAllMetaCR : public RGWCoroutine {
list<string> result;
list<string>::iterator iter;
RGWShardedOmapCRManager *entries_index;
std::unique_ptr<RGWShardedOmapCRManager> entries_index;
RGWContinuousLeaseCR *lease_cr;
RGWCoroutinesStack *lease_stack;
@ -748,7 +748,7 @@ public:
RGWFetchAllMetaCR(RGWMetaSyncEnv *_sync_env, int _num_shards,
map<uint32_t, rgw_meta_sync_marker>& _markers) : RGWCoroutine(_sync_env->cct), sync_env(_sync_env),
num_shards(_num_shards),
ret_status(0), entries_index(NULL), lease_cr(nullptr), lease_stack(nullptr),
ret_status(0), lease_cr(nullptr), lease_stack(nullptr),
lost_lock(false), failed(false), markers(_markers) {
}
@ -805,9 +805,9 @@ public:
set_sleeping(true);
yield;
}
entries_index = new RGWShardedOmapCRManager(sync_env->async_rados, sync_env->store, this, num_shards,
sync_env->store->get_zone_params().log_pool,
mdlog_sync_full_sync_index_prefix);
entries_index.reset(new RGWShardedOmapCRManager(sync_env->async_rados, sync_env->store, this, num_shards,
sync_env->store->get_zone_params().log_pool,
mdlog_sync_full_sync_index_prefix));
yield {
call(new RGWReadRESTResourceCR<list<string> >(cct, conn, sync_env->http_manager,
"/admin/metadata", NULL, &sections));