From: Kefu Chai <kchai@redhat.com>
Date: Sat, 19 Dec 2020 09:11:15 +0000 (+0800)
Subject: crimson/osd: use fmt::format() for formatting temp recovery oid
X-Git-Tag: v16.1.0~146^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6694f24e34b72b2c9c0e6c5bd8949b9a9507c2e5;p=ceph.git

crimson/osd: use fmt::format() for formatting temp recovery oid

for more concise code and better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc
index 9a07342f5db..4bd43429a48 100644
--- a/src/crimson/osd/recovery_backend.cc
+++ b/src/crimson/osd/recovery_backend.cc
@@ -19,12 +19,14 @@ namespace {
 
 hobject_t RecoveryBackend::get_temp_recovery_object(
   const hobject_t& target,
-  eversion_t version)
+  eversion_t version) const
 {
-  ostringstream ss;
-  ss << "temp_recovering_" << pg.get_info().pgid << "_" << version
-    << "_" << pg.get_info().history.same_interval_since << "_" << target.snap;
-  hobject_t hoid = target.make_temp_hobject(ss.str());
+  hobject_t hoid =
+    target.make_temp_hobject(fmt::format("temp_recovering_{}_{}_{}_{}",
+                                         pg.get_info().pgid,
+                                         version,
+                                         pg.get_info().history.same_interval_since,
+                                         target.snap));
   logger().debug("{} {}", __func__, hoid);
   return hoid;
 }
diff --git a/src/crimson/osd/recovery_backend.h b/src/crimson/osd/recovery_backend.h
index 2bffaed6a64..cb0ae9f2056 100644
--- a/src/crimson/osd/recovery_backend.h
+++ b/src/crimson/osd/recovery_backend.h
@@ -188,7 +188,7 @@ protected:
   std::map<hobject_t, WaitForObjectRecovery> recovering;
   hobject_t get_temp_recovery_object(
     const hobject_t& target,
-    eversion_t version);
+    eversion_t version) const;
 
   boost::container::flat_set<hobject_t> temp_contents;