minor changes

Signed-off-by: Gabriel BenHanokh <gbenhano@redhat.com>

diff --git a/src/rgw/driver/rados/rgw_dedup.cc b/src/rgw/driver/rados/rgw_dedup.cc
index 7b0054b82596ea9214c4fafb29bf91ead8c7c847..e42ce7f22e1f4d2bc2c3fc83d12734e4c870681c 100644 (file)
--- 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 7df93aa1f17b53e29c202d69b2b4a24ac660309d..6a9ca06cd2b2de287a408f495fafbc33cb856a91 100644 (file)
--- 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.")
 
 
 #-------------------------------------------------------------------------------