Merge pull request ceph#63289 from tchaikov/ceph-dedup-cleanups

tools/ceph_dedup: improve const-ness and use ranged-for loop when appropriate

Reviewed-by: Myoungwon Oh <[email protected]>
Reviewed-by: Ilya Dryomov <[email protected]>

Author: idryomov

src/tools/ceph_dedup/ceph_dedup_daemon.cc

@@ -1,3 +1,6 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
 #include "common.h"
 #include "log/Log.h"
 
@@ -187,13 +190,13 @@ class SampleDedupWorkerThread : public Thread
       }
     }
 
-    bool contains(std::string& fp) {
+    bool contains(const std::string& fp) {
       std::shared_lock lock(fingerprint_lock);
       return fp_map.contains(fp);
     }
 
     // return true if the chunk is duplicate
-    bool add(chunk_t& chunk) {
+    bool add(const chunk_t& chunk) {
       std::unique_lock lock(fingerprint_lock);
       auto entry = fp_map.find(chunk.fingerprint);
       total_bytes += chunk.size;
@@ -243,7 +246,7 @@ class SampleDedupWorkerThread : public Thread
       fp_store(chunk_threshold, report_period, fpstore_threshold),
       sampling_ratio(static_cast<double>(sampling_ratio) / 100) { }
 
-    bool is_all_stop() {
+    bool is_all_stop() const {
       std::shared_lock l{glock};
       return all_stop;
     }
@@ -316,14 +319,14 @@ class SampleDedupWorkerThread : public Thread
     ObjectCursor end,
     size_t max_object_count);
   std::vector<size_t> sample_object(size_t count);
-  void try_dedup_and_accumulate_result(ObjectItem &object, snap_t snap = 0);
+  void try_dedup_and_accumulate_result(const ObjectItem &object, snap_t snap = 0);
   int do_chunk_dedup(chunk_t &chunk, snap_t snap);
-  bufferlist read_object(ObjectItem &object);
+  bufferlist read_object(const ObjectItem &object);
   std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> do_cdc(
-    ObjectItem &object,
-    bufferlist &data);
-  std::string generate_fingerprint(bufferlist chunk_data);
-  AioCompRef do_async_evict(std::string oid);
+    const ObjectItem &object,
+    const bufferlist &data) const;
+  std::string generate_fingerprint(const bufferlist& chunk_data) const;
+  AioCompRef do_async_evict(const std::string& oid);
 
   IoCtx io_ctx;
   IoCtx chunk_io_ctx;
@@ -362,11 +365,9 @@ void SampleDedupWorkerThread::crawl()
 	op.list_snaps(&snap_set, &snap_ret);
 	io_ctx.operate(target.oid, &op, NULL);
 
-	for (std::vector<librados::clone_info_t>::const_iterator r = snap_set.clones.begin();
-	  r != snap_set.clones.end();
-	  ++r) {
-	  io_ctx.snap_set_read(r->cloneid);
-	  try_dedup_and_accumulate_result(target, r->cloneid);
+	for (const auto& clone : snap_set.clones) {
+	  io_ctx.snap_set_read(clone.cloneid);
+	  try_dedup_and_accumulate_result(target, clone.cloneid);
 	}
       } else {
 	try_dedup_and_accumulate_result(target);
@@ -392,7 +393,7 @@ void SampleDedupWorkerThread::crawl()
   }
 }
 
-AioCompRef SampleDedupWorkerThread::do_async_evict(std::string oid)
+AioCompRef SampleDedupWorkerThread::do_async_evict(const std::string& oid)
 {
   Rados rados;
   ObjectReadOperation op_tier;
@@ -442,7 +443,7 @@ std::vector<size_t> SampleDedupWorkerThread::sample_object(size_t count)
 }
 
 void SampleDedupWorkerThread::try_dedup_and_accumulate_result(
-  ObjectItem &object, snap_t snap)
+  const ObjectItem &object, snap_t snap)
 {
   bufferlist data = read_object(object);
   if (data.length() == 0) {
@@ -503,7 +504,7 @@ void SampleDedupWorkerThread::try_dedup_and_accumulate_result(
   total_object_size += object_size;
 }
 
-bufferlist SampleDedupWorkerThread::read_object(ObjectItem &object)
+bufferlist SampleDedupWorkerThread::read_object(const ObjectItem &object)
 {
   bufferlist whole_data;
   size_t offset = 0;
@@ -526,8 +527,8 @@ bufferlist SampleDedupWorkerThread::read_object(ObjectItem &object)
 }
 
 std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> SampleDedupWorkerThread::do_cdc(
-  ObjectItem &object,
-  bufferlist &data)
+  const ObjectItem &object,
+  const bufferlist &data) const
 {
   std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> ret;
 
@@ -543,7 +544,7 @@ std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> SampleDedupWo
   return ret;
 }
 
-std::string SampleDedupWorkerThread::generate_fingerprint(bufferlist chunk_data)
+std::string SampleDedupWorkerThread::generate_fingerprint(const bufferlist& chunk_data) const
 {
   std::string ret;
 

src/tools/ceph_dedup/ceph_dedup_tool.cc

@@ -1040,10 +1040,8 @@ int make_dedup_object(const po::variables_map &opts)
       op.list_snaps(&snap_set, &snap_ret);
       io_ctx.operate(object_name, &op, NULL);
 
-      for (std::vector<librados::clone_info_t>::const_iterator r = snap_set.clones.begin();
-	r != snap_set.clones.end();
-	++r) {
-	io_ctx.snap_set_read(r->cloneid);
+      for (const auto& clone : snap_set.clones) {
+	io_ctx.snap_set_read(clone.cloneid);
 	ret = create_new_deduped_object(object_name);
 	if (ret < 0) {
 	  goto out;