From 9e505299153cb303b8867505bd85dd58f79986ad Mon Sep 17 00:00:00 2001 From: Gabriel BenHanokh Date: Wed, 8 Oct 2025 12:15:45 +0000 Subject: [PATCH] minor changes Signed-off-by: Gabriel BenHanokh --- src/rgw/driver/rados/rgw_dedup.cc | 4 +++- src/test/rgw/dedup/test_dedup.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rgw/driver/rados/rgw_dedup.cc b/src/rgw/driver/rados/rgw_dedup.cc index 7b0054b8259..e42ce7f22e1 100644 --- a/src/rgw/driver/rados/rgw_dedup.cc +++ b/src/rgw/driver/rados/rgw_dedup.cc @@ -904,7 +904,7 @@ namespace rgw::dedup { return ret; } - string ref_tag = p_tgt_rec->ref_tag; + const string &ref_tag = p_tgt_rec->ref_tag; ldpp_dout(dpp, 20) << __func__ << "::ref_tag=" << ref_tag << dendl; ret = inc_ref_count_by_manifest(ref_tag, src_oid, src_manifest); if (unlikely(ret != 0)) { @@ -1612,6 +1612,8 @@ namespace rgw::dedup { ldpp_dout(dpp, 20) << __func__ << "::successfully created: " << tail_oid << dendl; } else if (ret == -EEXIST) { + // should never happen as we take the prefix with unused counter 000 + // better to skip this dedup opportunity ldpp_dout(dpp, 1) << __func__ << "::ERR object " << tail_oid << " exists!" << dendl; p_stats->failed_split_head_creat++; return ret; diff --git a/src/test/rgw/dedup/test_dedup.py b/src/test/rgw/dedup/test_dedup.py index 7df93aa1f17..6a9ca06cd2b 100644 --- a/src/test/rgw/dedup/test_dedup.py +++ b/src/test/rgw/dedup/test_dedup.py @@ -502,8 +502,9 @@ def check_delete_objects_response(response): for error in response['Errors']: log.error("delete_objects::ERROR::Key=%s, Code=%s, Message=%s", error['Key'], error['Code'], error['Message']) - else: - log.debug("All objects deleted successfully.") + + else: + log.debug("All objects deleted successfully.") #------------------------------------------------------------------------------- -- 2.39.5