From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Wed, 18 Jul 2018 17:25:58 +0000 (-0400)
Subject: Merge pull request #22347 from cbodley/wip-24367
X-Git-Tag: v14.0.1~844
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a00c16c4ab0f3558f59bc9562480a1bde9c739e;p=ceph.git

Merge pull request #22347 from cbodley/wip-24367

rgw: fixes for sync of versioned objects

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

4a00c16c4ab0f3558f59bc9562480a1bde9c739e
diff --cc src/rgw/rgw_data_sync.cc
index 36ca717bee84,c7f2a9ce0989..246f67b24e2b
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@@ -3029,14 -3051,8 +3051,14 @@@ int RGWBucketShardIncrementalSyncCR::op
                /* 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)) {
+         if (!marker_tracker.index_key_to_marker(key, cur_id, has_olh_epoch(entry->op))) {
            set_status() << "can't do op, sync already in progress for object";
            tn->log(20, SSTR("skipping sync of entry: " << cur_id << ":" << key << " sync already in progress for object"));
            marker_tracker.try_update_high_marker(cur_id, 0, entry->timestamp);