Merge pull request #22347 from cbodley/wip-24367

rgw: fixes for sync of versioned objects

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

diff --cc src/rgw/rgw_data_sync.cc
index 36ca717bee845883f6cfac4df6a2f7f86bef3178,c7f2a9ce098988dead22f1e640ce310416053800..246f67b24e2bb34393a0b1808a99210de76d6fa9
--- 1/src/rgw/rgw_data_sync.cc
--- 2/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);

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/rgw/rgw_sync_module_aws.cc
Simple merge