From: Kefu Chai <kchai@redhat.com>
Date: Sat, 15 May 2021 06:00:33 +0000 (+0800)
Subject: crimson/admin: do not construct AdminSocketHook with osd
X-Git-Tag: v17.1.0~1936^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=852775c050905fc401f27dd9e01a2cc00981e489;p=ceph.git

crimson/admin: do not construct AdminSocketHook with osd

osd is not used at all.

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

diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc
index a1d308351a7ab..511a62d443176 100644
--- a/src/crimson/admin/osd_admin.cc
+++ b/src/crimson/admin/osd_admin.cc
@@ -135,12 +135,11 @@ template std::unique_ptr<AdminSocketHook> make_asok_hook<DumpPGStateHistory>(con
 //dump the contents of perfcounters in osd and store
 class DumpPerfCountersHook final: public AdminSocketHook {
 public:
-  explicit DumpPerfCountersHook(const crimson::osd::OSD &osd) :
+  explicit DumpPerfCountersHook() :
     AdminSocketHook{"perfcounters_dump",
                     "name=logger,type=CephString,req=false "
                     "name=counter,type=CephString,req=false",
-                    "dump perfcounters in osd and store"},
-    osd{osd}
+                    "dump perfcounters in osd and store"}
   {}
   seastar::future<tell_result_t> call(const cmdmap_t& cmdmap,
                                       std::string_view format,
@@ -157,10 +156,8 @@ public:
     crimson::common::local_perf_coll().dump_formatted(f.get(), false, logger, counter);
     return seastar::make_ready_future<tell_result_t>(std::move(f));
   }
-private:
-  const crimson::osd::OSD& osd;
 };
-template std::unique_ptr<AdminSocketHook> make_asok_hook<DumpPerfCountersHook>(const crimson::osd::OSD& osd);
+template std::unique_ptr<AdminSocketHook> make_asok_hook<DumpPerfCountersHook>();
 
 
 
diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index ab9862ae55565..4a65301139678 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -442,7 +442,7 @@ seastar::future<> OSD::start_asok_admin()
       asok->register_command(make_asok_hook<FlushPgStatsHook>(*this)),
       asok->register_command(make_asok_hook<DumpPGStateHistory>(std::as_const(*this))),
       asok->register_command(make_asok_hook<SeastarMetricsHook>()),
-      asok->register_command(make_asok_hook<DumpPerfCountersHook>(std::as_const(*this))),
+      asok->register_command(make_asok_hook<DumpPerfCountersHook>()),
       // PG commands
       asok->register_command(make_asok_hook<pg::QueryCommand>(*this)),
       asok->register_command(make_asok_hook<pg::MarkUnfoundLostCommand>(*this)));