From: Kefu Chai <kchai@redhat.com>
Date: Wed, 19 May 2021 04:40:10 +0000 (+0800)
Subject: crimson/tools/store_nbd: remove PerfService
X-Git-Tag: v17.1.0~1899^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f84c7f2e895b38b0bebd30dfcad678ecaf76a4d0;p=ceph.git

crimson/tools/store_nbd: remove PerfService

since PerfCounter is not used in seastore, there is no need to keep an
instance of PerfService.

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

diff --git a/src/crimson/tools/store_nbd/store-nbd.cc b/src/crimson/tools/store_nbd/store-nbd.cc
index a3f228ec5acad..b3f65842d3621 100644
--- a/src/crimson/tools/store_nbd/store-nbd.cc
+++ b/src/crimson/tools/store_nbd/store-nbd.cc
@@ -40,7 +40,6 @@
 
 #include "crimson/common/log.h"
 #include "crimson/common/config_proxy.h"
-#include "crimson/os/seastore/seastore_perf_counters.h"
 
 #include "test/crimson/seastar_runner.h"
 
@@ -306,28 +305,24 @@ int main(int argc, char** argv)
   }
 
   sc.run([=] {
-    return crimson::common::sharded_perf_coll().start().then([=] {
-      return crimson::common::sharded_conf(
-      ).start(EntityName{}, string_view{"ceph"}
-      ).then([=] {
-        auto backend = get_backend(backend_config);
-        return seastar::do_with(
-          NBDHandler(*backend, nbd_config),
-	  std::move(backend),
-	  [](auto &nbd, auto &backend) {
-	    return backend->mount(
-	    ).then([&] {
-	      logger().debug("Running nbd server...");
-	      return nbd.run();
-	    }).then([&] {
-	      return backend->close();
-	    });
-	});
-      });
+    return crimson::common::sharded_conf(
+    ).start(EntityName{}, string_view{"ceph"}
+    ).then([=] {
+      auto backend = get_backend(backend_config);
+      return seastar::do_with(
+        NBDHandler(*backend, nbd_config),
+        std::move(backend),
+        [](auto &nbd, auto &backend) {
+          return backend->mount(
+          ).then([&] {
+            logger().debug("Running nbd server...");
+            return nbd.run();
+          }).then([&] {
+            return backend->close();
+          });
+        });
     }).then([=] {
-      return crimson::common::sharded_perf_coll().stop().then([] {
-	return crimson::common::sharded_conf().stop();
-      });
+      return crimson::common::sharded_conf().stop();
     });
   });
 
diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc
index 20011ef570df3..b45bd0d52b81e 100644
--- a/src/crimson/tools/store_nbd/tm_driver.cc
+++ b/src/crimson/tools/store_nbd/tm_driver.cc
@@ -162,7 +162,6 @@ size_t TMDriver::get_size() const
 seastar::future<> TMDriver::mkfs()
 {
   assert(config.path);
-  perf_service->add_to_collection();
   segment_manager = std::make_unique<
     segment_manager::block::BlockSegmentManager
     >(*config.path);
@@ -185,7 +184,6 @@ seastar::future<> TMDriver::mkfs()
     logger().debug("sm close");
     return segment_manager->close();
   }).safe_then([this] {
-    perf_service->remove_from_collection();
     clear();
     logger().debug("mkfs complete");
     return TransactionManager::mkfs_ertr::now();
diff --git a/src/crimson/tools/store_nbd/tm_driver.h b/src/crimson/tools/store_nbd/tm_driver.h
index d5be3c228f02b..1643281339f42 100644
--- a/src/crimson/tools/store_nbd/tm_driver.h
+++ b/src/crimson/tools/store_nbd/tm_driver.h
@@ -4,7 +4,6 @@
 #include "block_driver.h"
 
 #include "crimson/os/seastore/cache.h"
-#include "crimson/os/seastore/seastore_perf_counters.h"
 #include "crimson/os/seastore/segment_cleaner.h"
 #include "crimson/os/seastore/segment_manager.h"
 #include "crimson/os/seastore/segment_manager/block.h"
@@ -42,9 +41,6 @@ private:
 
   using TransactionManager = crimson::os::seastore::TransactionManager;
   std::unique_ptr<TransactionManager> tm;
-  using PerfServiceRef = crimson::os::seastore::PerfServiceRef;
-  using PerfService = crimson::os::seastore::PerfService;
-  PerfServiceRef perf_service = PerfServiceRef(new PerfService());
 
   seastar::future<> mkfs();
   void init();