crimson/admin: s/SeastarMetricsHook/DumpMetricsHook/

seastar is the name of one of the libraries used to implement crimson,
but the asok hook dumps not only builtin metrics in seastar, but also
the ones registered by crimson and seastore, so rename it to a more
general name.

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 9f8ef248e423ead09b72397218dae5430fadb215..cea9bdb959be0204a6f62abfcd4f01d5c7f11c9c 100644 (file)
--- a/src/crimson/admin/osd_admin.cc
+++ b/src/crimson/admin/osd_admin.cc
@@ -197,9 +197,9 @@ template std::unique_ptr<AdminSocketHook> make_asok_hook<AssertAlwaysHook>();
 /**
 * A Seastar admin hook: fetching the values of configured metrics
 */
-class SeastarMetricsHook : public AdminSocketHook {
+class DumpMetricsHook : public AdminSocketHook {
 public:
-  SeastarMetricsHook() :
+  DumpMetricsHook() :
     AdminSocketHook("perf dump_seastar",
                     "name=group,type=CephString,req=false",
                     "dump current configured seastar metrics and their values")
@@ -270,7 +270,7 @@ private:
     }
   }
 };
-template std::unique_ptr<AdminSocketHook> make_asok_hook<SeastarMetricsHook>();
+template std::unique_ptr<AdminSocketHook> make_asok_hook<DumpMetricsHook>();
 
 
 static ghobject_t test_ops_get_object_name(

diff --git a/src/crimson/admin/osd_admin.h b/src/crimson/admin/osd_admin.h
index 4b0da7330e41a20e136cd5572716f3f8a4dc0bb8..57b0c9ac32ed49d996f5ae3c247737d9ff0e4278 100644 (file)
--- a/src/crimson/admin/osd_admin.h
+++ b/src/crimson/admin/osd_admin.h
@@ -13,7 +13,7 @@ class FlushPgStatsHook;
 class OsdStatusHook;
 class SendBeaconHook;
 class DumpPGStateHistory;
-class SeastarMetricsHook;
+class DumpMetricsHook;
 class DumpPerfCountersHook;
 class InjectDataErrorHook;
 class InjectMDataErrorHook;

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 3da33dc348d24a6f0c7d679b6894c6f3562fa149..539e3a65b6737e3e21d25b442a8aa2e3cd1a546d 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -465,7 +465,7 @@ seastar::future<> OSD::start_asok_admin()
       asok->register_command(make_asok_hook<SendBeaconHook>(*this)),
       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<DumpMetricsHook>()),
       asok->register_command(make_asok_hook<DumpPerfCountersHook>()),
       asok->register_command(make_asok_hook<InjectDataErrorHook>(get_shard_services())),
       asok->register_command(make_asok_hook<InjectMDataErrorHook>(get_shard_services())),