From 69c1d9f28aed06c9253f20c56bdfbe79a649e29a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 6 Jan 2016 15:43:32 -0800 Subject: [PATCH] rgw: data sync, handle delete marker removal Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_data_sync.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 3644554d8706e..cdc46cce2c2e5 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, ×tamp)); } else if (op == CLS_RGW_OP_LINK_OLH_DM) { set_status("creating delete marker"); -- 2.39.5