update source to 12.2.11

[ceph.git] / ceph / src / rgw / rgw_data_sync.cc

diff --git a/ceph/src/rgw/rgw_data_sync.cc b/ceph/src/rgw/rgw_data_sync.cc
index dca9ea9196e1b3f71eb3fbdd8761d75d4ea6db55..ad43157824e592692b67a64680b8eebaee65febe 100644 (file)
--- a/ceph/src/rgw/rgw_data_sync.cc
+++ b/ceph/src/rgw/rgw_data_sync.cc
@@ -2546,6 +2546,10 @@ public:
             }
             logger.log("remove");
             call(data_sync_module->remove_object(sync_env, *bucket_info, key, timestamp, versioned, versioned_epoch.value_or(0), &zones_trace));
+            // our copy of the object is more recent, continue as if it succeeded
+            if (retcode == -ERR_PRECONDITION_FAILED) {
+              retcode = 0;
+            }
           } else if (op == CLS_RGW_OP_LINK_OLH_DM) {
             logger.log("creating delete marker");
             set_status("creating delete marker");