From c4960f03a25e8877284f7aa33c8ee066034fff51 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 6 Feb 2018 08:48:24 -0600 Subject: [PATCH] osd: remove get_mapped_pools command No in-tree users. Signed-off-by: Sage Weil --- src/osd/OSD.cc | 20 -------------------- src/osd/OSD.h | 2 -- 2 files changed, 22 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e8a4b301df1..d969801d9b2 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2138,14 +2138,6 @@ public: } }; -std::set OSD::get_mapped_pools() { - std::set pools; - RWLock::RLocker l(pg_map_lock); - for (const auto &i : pg_map) - pools.insert(i.first.pool()); - return pools; -} - bool OSD::asok_command(std::string_view admin_command, const cmdmap_t& cmdmap, std::string_view format, ostream& ss) { @@ -2363,11 +2355,6 @@ will start to track new ops received afterwards."; f->open_object_section("compact_result"); f->dump_float("elapsed_time", duration); f->close_section(); - } else if (admin_command == "get_mapped_pools") { - f->open_object_section("mapped_pools"); - set poollist = get_mapped_pools(); - f->dump_stream("pool_list") << poollist; - f->close_section(); } else if (admin_command == "smart") { probe_smart(ss); } else if (admin_command == "list_devices") { @@ -2930,12 +2917,6 @@ void OSD::final_init() " WARNING: Compaction probably slows your requests"); assert(r == 0); - r = admin_socket->register_command("get_mapped_pools", "get_mapped_pools", - asok_hook, - "dump pools whose PG(s) are mapped to this OSD."); - - assert(r == 0); - r = admin_socket->register_command("smart", "smart", asok_hook, "probe OSD devices for SMART data."); @@ -3437,7 +3418,6 @@ int OSD::shutdown() cct->get_admin_socket()->unregister_command("flush_store_cache"); cct->get_admin_socket()->unregister_command("dump_pgstate_history"); cct->get_admin_socket()->unregister_command("compact"); - cct->get_admin_socket()->unregister_command("get_mapped_pools"); cct->get_admin_socket()->unregister_command("smart"); cct->get_admin_socket()->unregister_command("list_devices"); delete asok_hook; diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 6568edaba61..e59fec0fddb 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1861,8 +1861,6 @@ public: return pg_map.size(); } - std::set get_mapped_pools(); - protected: PGRef _open_pg( OSDMapRef createmap, ///< map pg is created in