From cf9b081487b3780d20be413f04f8a4c9195f39b2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 31 May 2018 14:13:40 -0400 Subject: [PATCH] rgw: bucket sync allows OP_ADD on versioned objects operations like PutACL that only mutate object metadata do not generate a link_olh entry, so they cannot be skipped. their bilog entries don't have a versioned_epoch, so we skip the call to set_olh() by passing an empty value to fetch_remote_obj() Fixes: http://tracker.ceph.com/issues/24367 Signed-off-by: Casey Bodley (cherry picked from commit 7fb034ee5e98e7e991595c768a3a1da6c56f119c) Conflicts: src/rgw/rgw_data_sync.cc - trivial resolution --- src/rgw/rgw_data_sync.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index a37a0552150f2..059785c8d06c1 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -2483,12 +2483,6 @@ public: retcode = -EIO; } else if (op == CLS_RGW_OP_ADD || op == CLS_RGW_OP_LINK_OLH) { - if (op == CLS_RGW_OP_ADD && !key.instance.empty() && key.instance != "null") { - set_status("skipping entry"); - ldout(sync_env->cct, 10) << "bucket skipping sync obj: " << sync_env->source_zone << "/" << bucket_info->bucket << "/" << key << "[" << versioned_epoch << "]: versioned object will be synced on link_olh" << dendl; - goto done; - - } set_status("syncing obj"); ldout(sync_env->cct, 5) << "bucket sync: sync obj: " << sync_env->source_zone << "/" << bucket_info->bucket << "/" << key << "[" << versioned_epoch << "]" << dendl; logger.log("fetch"); -- 2.39.5