From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 6 Jan 2016 23:43:32 +0000 (-0800)
Subject: rgw: data sync, handle delete marker removal
X-Git-Tag: v10.1.0~354^2~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69c1d9f28aed06c9253f20c56bdfbe79a649e29a;p=ceph.git

rgw: data sync, handle delete marker removal

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 3644554d870..cdc46cce2c2 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -1940,8 +1940,11 @@ public:
             call(new RGWFetchRemoteObjCR(async_rados, store, source_zone, *bucket_info,
                                          key, versioned_epoch,
                                          true));
-          } else if (op == CLS_RGW_OP_DEL) {
+          } else if (op == CLS_RGW_OP_DEL || op == CLS_RGW_OP_UNLINK_INSTANCE) {
             set_status("removing obj");
+            if (op == CLS_RGW_OP_UNLINK_INSTANCE) {
+              versioned = true;
+            }
             call(new RGWRemoveObjCR(async_rados, store, source_zone, *bucket_info, key, versioned, versioned_epoch, NULL, NULL, false, &timestamp));
           } else if (op == CLS_RGW_OP_LINK_OLH_DM) {
             set_status("creating delete marker");