RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: replace reshard blocking sleep with interruptible condition wait

Browse Source 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2017-05-18 11:51:21 -07:00
parent 45ad93ddee
commit f2b0eb0863
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rgw/rgw_reshard.cc
View File

@ -243,7 +243,7 @@ int RGWBucketReshard::set_resharding_status(const string& new_instance_id, int32
int RGWBucketReshard::clear_resharding()
{
cls_rgw_bucket_instance_entry instance_entry;
int ret = store->bucket_set_reshard(bucket_info, instance_entry);
if (ret < 0) {
ldout(store->ctx(), 0) << "RGWReshard::" << __func__ << " ERROR: error setting bucket resharding flag on bucket index: "
@ -710,7 +710,6 @@ int RGWReshardWait::block_while_resharding(RGWRados::BucketShard *bs, string *ne
return -ERR_BUSY_RESHARDING;
}
int RGWReshard::process_single_logshard(int logshard_num)
{
string marker;
@ -719,7 +718,7 @@ int RGWReshard::process_single_logshard(int logshard_num)
CephContext *cct = store->ctx();
int max_entries = 1000;
int max_secs = 60;
rados::cls::lock::Lock l(reshard_lock_name);
utime_t time(max_secs, 0);