Merge pull request #22660 from cfanz/wip-rgw-fix-24603

rgw-multisite: fix endless loop in RGWBucketShardIncrementalSyncCR

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2018-06-27 14:29:28 -04:00 committed by GitHub
commit 58337afb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3029,6 +3029,12 @@ int RGWBucketShardIncrementalSyncCR::operate()
/* we have reported this error */
}
}
if (sync_status != 0)
break;
}
if (sync_status != 0) {
/* get error, stop */
break;
}
if (!marker_tracker.index_key_to_marker(key, cur_id)) {
set_status() << "can't do op, sync already in progress for object";