From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 2 Dec 2015 22:13:33 +0000 (-0800)
Subject: rgw: incremental sync, skip non-complete entries early
X-Git-Tag: v10.1.0~354^2~157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f00585f0e2dc920c76bbeb1eb2e8a0e1b40e699b;p=ceph.git

rgw: incremental sync, skip non-complete entries early

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index c46cbce9880c..3690a77bd083 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2098,6 +2098,11 @@ int RGWBucketShardIncrementalSyncCR::operate()
           ldout(store->ctx(), 20) << "[inc sync] skipping object: " << bucket_name << ":" << bucket_id << ":" << shard_id << "/" << key << ": canceled operation" << dendl;
           continue;
         }
+        if (entry->state != CLS_RGW_STATE_COMPLETE) {
+          set_status() << "non-complete operation, skipping";
+          ldout(store->ctx(), 20) << "[inc sync] skipping object: " << bucket_name << ":" << bucket_id << ":" << shard_id << "/" << key << ": non-complete operation" << dendl;
+          continue;
+        }
         ldout(store->ctx(), 20) << "[inc sync] syncing object: " << bucket_name << ":" << bucket_id << ":" << shard_id << "/" << key << dendl;
         inc_marker.position = entry->id;
         updated_status = false;