]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: incremental sync, skip non-complete entries early
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 2 Dec 2015 22:13:33 +0000 (14:13 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:40 +0000 (16:13 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_data_sync.cc

index c46cbce9880ca1cc1cd9be9f8c5b3763b5ab495a..3690a77bd083cb5dbf83e58782cfe1ae1027ce81 100644 (file)
@@ -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;