From 9052c8ccd4130d2b0e30be981ea26a67e181dc8a Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 3 Jun 2021 13:39:28 +0800
Subject: [PATCH] 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>
---
 src/crimson/admin/osd_admin.cc | 6 +++---
 src/crimson/admin/osd_admin.h  | 2 +-
 src/crimson/osd/osd.cc         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc
index 9f8ef248e42..cea9bdb959b 100644
--- 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 4b0da7330e4..57b0c9ac32e 100644
--- 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 3da33dc348d..539e3a65b67 100644
--- 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())),
-- 
2.39.5