From: Yehuda Sadeh <yehuda@redhat.com>
Date: Sat, 4 Jun 2016 12:47:50 +0000 (-0700)
Subject: rgw: data sync squash, prioritize object removal
X-Git-Tag: v10.2.3~112^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c34dbd4b19dcc35483306f95932b3ed6ed8332fd;p=ceph.git

rgw: data sync squash, prioritize object removal

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2fcd8b1d49aae2fd03b986dd10bb3f98d3b8f32e)
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 160a512a8e2..474f89b8eeb 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2344,7 +2344,10 @@ int RGWBucketShardIncrementalSyncCR::operate()
           continue;
         }
         auto& squash_entry = squash_map[e.object];
-        if (squash_entry.first <= e.timestamp) {
+        if (squash_entry.first == e.timestamp &&
+            e.op == CLS_RGW_OP_DEL) {
+          squash_entry.second = e.op;
+        } else if (squash_entry.first < e.timestamp) {
           squash_entry = make_pair<>(e.timestamp, e.op);
         }
       }