RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12357 from dongbula/fix-versioned-bucket-datasync-fail

Browse Source 
rgw: fix versioned bucket data sync fail when upload is busy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-01-18 14:21:00 -05:00 committed by GitHub
commit 37ff492351
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rgw/rgw_data_sync.cc
View File

@ -2416,7 +2416,7 @@ class RGWBucketShardIncrementalSyncCR : public RGWCoroutine {
boost::intrusive_ptr<RGWContinuousLeaseCR> lease_cr;
list<rgw_bi_log_entry> list_result;
list<rgw_bi_log_entry>::iterator entries_iter;
map<string, pair<real_time, RGWModifyOp> > squash_map;
map<pair<string, string>, pair<real_time, RGWModifyOp> > squash_map;
rgw_bucket_shard_inc_sync_marker& inc_marker;
rgw_obj_key key;
rgw_bi_log_entry *entry{nullptr};
@ -2476,11 +2476,8 @@ int RGWBucketShardIncrementalSyncCR::operate()
if (e.state != CLS_RGW_STATE_COMPLETE) {
continue;
}
auto& squash_entry = squash_map[e.object];
if (squash_entry.first == e.timestamp &&
e.op == CLS_RGW_OP_DEL) {
squash_entry.second = e.op;
} else if (squash_entry.first < e.timestamp) {
auto& squash_entry = squash_map[make_pair(e.object, e.instance)];
if (squash_entry.first <= e.timestamp) {
squash_entry = make_pair<>(e.timestamp, e.op);
}
}
@ -2533,7 +2530,7 @@ int RGWBucketShardIncrementalSyncCR::operate()
marker_tracker.try_update_high_marker(cur_id, 0, entry->timestamp);
continue;
}
if (make_pair<>(entry->timestamp, entry->op) != squash_map[entry->object]) {
if (make_pair<>(entry->timestamp, entry->op) != squash_map[make_pair(entry->object, entry->instance)]) {
set_status() << "squashed operation, skipping";
ldout(sync_env->cct, 20) << "[inc sync] skipping object: "
<< bucket_shard_str{bs} << "/" << key << ": squashed operation" << dendl;