common/admin_socket: pass inbl to sync call() method

Only the async_call got this before.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 313ec59c29e845142eb8945bd5362bf46c4539d2..82e66c4f13fd2c39d4c169082a7db44a327ad4c1 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -211,6 +211,7 @@ Client::CommandHook::CommandHook(Client *client) :
 int Client::CommandHook::call(
   std::string_view command,
   const cmdmap_t& cmdmap,
+  const bufferlist&,
   Formatter *f,
   std::ostream& errss,
   bufferlist& out)

diff --git a/src/client/Client.h b/src/client/Client.h
index db493136a1f0631abc90603a9746e2efa8da1d16..d452c46bb97049edb0d9beda935c0ed0e5ed4c0d 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -269,6 +269,7 @@ public:
   public:
     explicit CommandHook(Client *client);
     int call(std::string_view command, const cmdmap_t& cmdmap,
+            const bufferlist&,
             Formatter *f,
             std::ostream& errss,
             bufferlist& out) override;

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index 1f3b38649cca32b13d82a6ecac13fd4bd181b0e0..8a7e0c72197101fefe4ff93b1534521a62a7b0d1 100644 (file)
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -623,6 +623,7 @@ void AdminSocket::unregister_commands(const AdminSocketHook *hook)
 class VersionHook : public AdminSocketHook {
 public:
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {
@@ -649,6 +650,7 @@ class HelpHook : public AdminSocketHook {
 public:
   explicit HelpHook(AdminSocket *as) : m_as(as) {}
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {
@@ -667,6 +669,7 @@ class GetdescsHook : public AdminSocketHook {
 public:
   explicit GetdescsHook(AdminSocket *as) : m_as(as) {}
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/common/admin_socket.h b/src/common/admin_socket.h
index c5d2b48e563bf0414f19e2e4362f7ad177a75886..3f364a5b711c7db22a9e14e13af5f64afd97d5fc 100644 (file)
--- a/src/common/admin_socket.h
+++ b/src/common/admin_socket.h
@@ -60,6 +60,7 @@ public:
   virtual int call(
     std::string_view command,
     const cmdmap_t& cmdmap,
+    const ceph::buffer::list& inbl,
     ceph::Formatter *f,
     std::ostream& errss,
     ceph::buffer::list& out) = 0;
@@ -96,7 +97,7 @@ public:
     // by default, call the synchronous handler and then finish
     ceph::buffer::list out;
     std::ostringstream errss;
-    int r = call(command, cmdmap, f, errss, out);
+    int r = call(command, cmdmap, inbl, f, errss, out);
     on_finish(r, errss.str(), out);
   }
   virtual ~AdminSocketHook() {}

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 029f9b9496e3bb3d780f89d1258500d326fbc1f8..fe71ea4ccc49e8569851c0dda9d1061608df4b30 100644 (file)
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -182,6 +182,7 @@ public:
 
   // AdminSocketHook
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist& inbl,
           ceph::Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {
@@ -442,6 +443,7 @@ public:
   explicit CephContextHook(CephContext *cct) : m_cct(cct) {}
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist& inbl,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/librbd/LibrbdAdminSocketHook.cc b/src/librbd/LibrbdAdminSocketHook.cc
index f91bda3f0d2fbe23c73ffda53da141ea36e5a27c..159c9eda570bbe6434a54904b32e7476697a7aee 100644 (file)
--- a/src/librbd/LibrbdAdminSocketHook.cc
+++ b/src/librbd/LibrbdAdminSocketHook.cc
@@ -80,6 +80,7 @@ LibrbdAdminSocketHook::~LibrbdAdminSocketHook() {
 
 int LibrbdAdminSocketHook::call(std::string_view command,
                                const cmdmap_t& cmdmap,
+                               const bufferlist&,
                                Formatter *f,
                                std::ostream& errss,
                                bufferlist& out) {

diff --git a/src/librbd/LibrbdAdminSocketHook.h b/src/librbd/LibrbdAdminSocketHook.h
index d07a9280e583385cab6f8f98434f712caa73a2e6..98ff06abb30006aaa5794a9714514cee645017bb 100644 (file)
--- a/src/librbd/LibrbdAdminSocketHook.h
+++ b/src/librbd/LibrbdAdminSocketHook.h
@@ -18,6 +18,7 @@ namespace librbd {
     ~LibrbdAdminSocketHook() override;
 
     int call(std::string_view command, const cmdmap_t& cmdmap,
+            const bufferlist&,
             Formatter *f,
             std::ostream& errss,
             bufferlist& out) override;

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index a0a1843e5a1248770884359177cd36d2dbf0b8f5..824be241984400016eb18fb8714cb8f54feb3baa 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -116,6 +116,7 @@ public:
   int call(
     std::string_view command,
     const cmdmap_t& cmdmap,
+    const bufferlist&,
     Formatter *f,
     std::ostream& errss,
     ceph::buffer::list& out) override {

diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc
index 2d7efe4dfd8660b33f1f9ee940bb134e60e27430..7f811a5e41597852c91cd031e9f5e60f8b67e977 100644 (file)
--- a/src/mgr/ClusterState.cc
+++ b/src/mgr/ClusterState.cc
@@ -198,6 +198,7 @@ class ClusterSocketHook : public AdminSocketHook {
 public:
   explicit ClusterSocketHook(ClusterState *o) : cluster_state(o) {}
   int call(std::string_view admin_command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {
@@ -239,6 +240,7 @@ bool ClusterState::asok_command(
   ostream& ss)
 {
   std::lock_guard l(lock);
+
   if (admin_command == "dump_osd_network") {
     int64_t value = 0;
     // Default to health warning level if nothing specified

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 32c92466bbce5758abe3db64184c905fbf731177..7dc158fe152e08b1dec134836e675c791146ae2c 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -806,6 +806,7 @@ std::map<std::string, std::string> Mgr::get_services() const
 int Mgr::call(
   std::string_view admin_command,
   const cmdmap_t& cmdmap,
+  const bufferlist&,
   Formatter *f,
   std::ostream& errss,
   bufferlist& out)

diff --git a/src/mgr/Mgr.h b/src/mgr/Mgr.h
index 28a7da93de08312fc3ece50de516af6791e37050..22ebdb680410e89e335ed2232eac435fba68fd2b 100644 (file)
--- a/src/mgr/Mgr.h
+++ b/src/mgr/Mgr.h
@@ -103,6 +103,7 @@ public:
   int call(
     std::string_view command,
     const cmdmap_t& cmdmap,
+    const bufferlist& inbl,
     Formatter *f,
     std::ostream& errss,
     ceph::buffer::list& out) override;

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 65a853fb5c414af0dda722f8a3e0d03f20157446..0846fa0a8f00bd771ebccf1496b7149970c2eea4 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -291,6 +291,7 @@ class AdminHook : public AdminSocketHook {
 public:
   explicit AdminHook(Monitor *m) : mon(m) {}
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/os/bluestore/Allocator.cc b/src/os/bluestore/Allocator.cc
index 4f835d66869f42ca8d10dbad3cb99f26f755ea19..3acdeacdfe76a8f605fa6f1827b4ed8cf3002cfa 100644 (file)
--- a/src/os/bluestore/Allocator.cc
+++ b/src/os/bluestore/Allocator.cc
@@ -65,6 +65,7 @@ public:
 
   int call(std::string_view command,
           const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& out) override {

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 284906372c59b6dd6bbf60e560ca367916b66f1d..e72f24bbc7048a60a4a2474a8ff3b73603c41444 100644 (file)
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -107,6 +107,7 @@ private:
   SocketHook(BlueFS* bluefs) :
     bluefs(bluefs) {}
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4e457cacc667cd0b9d6b18964cf40dcfb986b6bc..8b9aa4feb12b1330f76e63630c7c5491406f5b4e 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2420,6 +2420,7 @@ class OSDSocketHook : public AdminSocketHook {
 public:
   explicit OSDSocketHook(OSD *o) : osd(o) {}
   int call(std::string_view prefix, const cmdmap_t& cmdmap,
+          const bufferlist& inbl,
           Formatter *f,
           std::ostream& ss,
           bufferlist& out) override {
@@ -3319,6 +3320,7 @@ class TestOpsSocketHook : public AdminSocketHook {
 public:
   TestOpsSocketHook(OSDService *s, ObjectStore *st) : service(s), store(st) {}
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 4fe1b3a41c3aa4448b2ea4c925c2a06e2c7dd8bb..eff79c5e9061c8cf4dc8476c92084da14df3475a 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -195,6 +195,7 @@ class Objecter::RequestStateHook : public AdminSocketHook {
 public:
   explicit RequestStateHook(Objecter *objecter);
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           cb::list& out) override;
@@ -4713,6 +4714,7 @@ Objecter::RequestStateHook::RequestStateHook(Objecter *objecter) :
 
 int Objecter::RequestStateHook::call(std::string_view command,
                                     const cmdmap_t& cmdmap,
+                                    const bufferlist&,
                                     Formatter *f,
                                     std::ostream& ss,
                                     cb::list& out)

diff --git a/src/rgw/rgw_coroutine.cc b/src/rgw/rgw_coroutine.cc
index 797df9d8d67014718b57b27627c9188c622a8231..0be0daac20adaab517d3f0611590923925824f6c 100644 (file)
--- a/src/rgw/rgw_coroutine.cc
+++ b/src/rgw/rgw_coroutine.cc
@@ -880,6 +880,7 @@ int RGWCoroutinesManagerRegistry::hook_to_admin_command(const string& command)
 
 int RGWCoroutinesManagerRegistry::call(std::string_view command,
                                       const cmdmap_t& cmdmap,
+                                      const bufferlist&,
                                       Formatter *f,
                                       std::ostream& ss,
                                       bufferlist& out) {

diff --git a/src/rgw/rgw_coroutine.h b/src/rgw/rgw_coroutine.h
index 917543406e2d0cb1aaa6d6456e9e53b4f7d15320..611a4438c1ee8abb172a684408558cdd76d22e32 100644 (file)
--- a/src/rgw/rgw_coroutine.h
+++ b/src/rgw/rgw_coroutine.h
@@ -606,6 +606,7 @@ public:
 
   int hook_to_admin_command(const std::string& command);
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& out) override;

diff --git a/src/rgw/rgw_sync_trace.cc b/src/rgw/rgw_sync_trace.cc
index b4a15ecc9410c5a01d17d8e71dcebcae33585c2c..b346835938d6f0ae3fa09bf2e0a10411a04e8424 100644 (file)
--- a/src/rgw/rgw_sync_trace.cc
+++ b/src/rgw/rgw_sync_trace.cc
@@ -199,6 +199,7 @@ string RGWSyncTraceManager::get_active_names()
 }
 
 int RGWSyncTraceManager::call(std::string_view command, const cmdmap_t& cmdmap,
+                             const bufferlist&,
                              Formatter *f,
                              std::ostream& ss,
                              bufferlist& out) {

diff --git a/src/rgw/rgw_sync_trace.h b/src/rgw/rgw_sync_trace.h
index e66dde7cf41aa5a02266d32829e43f0246fc9cfd..9617dac70dbc9a1ca9453555914b5e022f7cc374 100644 (file)
--- a/src/rgw/rgw_sync_trace.h
+++ b/src/rgw/rgw_sync_trace.h
@@ -134,6 +134,7 @@ public:
 
   int hook_to_admin_command();
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& out) override;

diff --git a/src/rgw/services/svc_sys_obj_cache.cc b/src/rgw/services/svc_sys_obj_cache.cc
index e329c37e36d0d803c46be3e07009df289e1718a3..ec39ed9669c06700b8cd43ab90e7c40262368e5b 100644 (file)
--- a/src/rgw/services/svc_sys_obj_cache.cc
+++ b/src/rgw/services/svc_sys_obj_cache.cc
@@ -521,6 +521,7 @@ public:
     void shutdown();
 
     int call(std::string_view command, const cmdmap_t& cmdmap,
+            const bufferlist&,
             Formatter *f,
             std::ostream& ss,
             bufferlist& out) override;
@@ -548,6 +549,7 @@ void RGWSI_SysObj_Cache_ASocketHook::shutdown()
 
 int RGWSI_SysObj_Cache_ASocketHook::call(
   std::string_view command, const cmdmap_t& cmdmap,
+  const bufferlist&,
   Formatter *f,
   std::ostream& ss,
   bufferlist& out)

diff --git a/src/test/admin_socket.cc b/src/test/admin_socket.cc
index 69bbcedb3cd4af8a2ac52be2c4d965e02f2ddc96..369e7abbf9b6e565f553475e28b8462e7f31a9d5 100644 (file)
--- a/src/test/admin_socket.cc
+++ b/src/test/admin_socket.cc
@@ -118,6 +118,7 @@ TEST(AdminSocket, SendTooLongRequest) {
 
 class MyTest : public AdminSocketHook {
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& result) override {
@@ -153,6 +154,7 @@ TEST(AdminSocket, RegisterCommand) {
 
 class MyTest2 : public AdminSocketHook {
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& result) override {
@@ -210,6 +212,7 @@ public:
   BlockingHook() = default;
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& result) override {

diff --git a/src/tools/cephfs_mirror/FSMirror.cc b/src/tools/cephfs_mirror/FSMirror.cc
index a0bf75d1e29778a207e48d9c0fd700dca43e629b..7ea798e6bec2bd130cc0711f8b728c2e8e97b26c 100644 (file)
--- a/src/tools/cephfs_mirror/FSMirror.cc
+++ b/src/tools/cephfs_mirror/FSMirror.cc
@@ -81,6 +81,7 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+           const bufferlist&,
            Formatter *f, std::ostream &errss, bufferlist &out) override {
     auto p = commands.at(std::string(command));
     return p->call(f);

diff --git a/src/tools/cephfs_mirror/PeerReplayer.cc b/src/tools/cephfs_mirror/PeerReplayer.cc
index 064f2bd4d4f935b1dc59086b7b8f0e8b29d79a53..66a141f8578d92dea954284996b381d9ee2da054 100644 (file)
--- a/src/tools/cephfs_mirror/PeerReplayer.cc
+++ b/src/tools/cephfs_mirror/PeerReplayer.cc
@@ -129,6 +129,7 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+           const bufferlist&,
            Formatter *f, std::ostream &errss, bufferlist &out) override {
     auto p = commands.at(std::string(command));
     return p->call(f);

diff --git a/src/tools/rbd_mirror/ImageDeleter.cc b/src/tools/rbd_mirror/ImageDeleter.cc
index fcdd1baad44c3a2eabd9e31e4d531e4712c7c513..ba137e6fd71a0dddfd6d8198a88143dfb36b47c8 100644 (file)
--- a/src/tools/rbd_mirror/ImageDeleter.cc
+++ b/src/tools/rbd_mirror/ImageDeleter.cc
@@ -105,6 +105,7 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index ee22b8d3475d59b9a037e23dcd0e331d1c349b23..0f909b206ddbd1b7c10f7ebc488e4396d0d3155b 100644 (file)
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -166,6 +166,7 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/tools/rbd_mirror/Mirror.cc b/src/tools/rbd_mirror/Mirror.cc
index a67afcf42dee685159475db95ca1e94541fc39eb..e87009281829c7b7693ab7ea1e8089c4c0ee7e11 100644 (file)
--- a/src/tools/rbd_mirror/Mirror.cc
+++ b/src/tools/rbd_mirror/Mirror.cc
@@ -338,6 +338,7 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& errss,
           bufferlist& out) override {

diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc
index de0d60241e3fb7085cb3bda5bb80bd6fb2d7dd0b..8a04219da06861487371000cc0dff01c31495dbe 100644 (file)
--- a/src/tools/rbd_mirror/PoolReplayer.cc
+++ b/src/tools/rbd_mirror/PoolReplayer.cc
@@ -188,6 +188,7 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
+          const bufferlist&,
           Formatter *f,
           std::ostream& ss,
           bufferlist& out) override {

diff --git a/src/tools/rbd_wnbd/wnbd_handler.cc b/src/tools/rbd_wnbd/wnbd_handler.cc
index ecfa47240f2db44186e0d24538f704b5095eaa35..0d13b6297aa35da6cea222f77a6ed0ae24a2d408 100644 (file)
--- a/src/tools/rbd_wnbd/wnbd_handler.cc
+++ b/src/tools/rbd_wnbd/wnbd_handler.cc
@@ -62,15 +62,18 @@ int WnbdHandler::wait()
   return err;
 }
 
-int WnbdAdminHook::call (std::string_view command, const cmdmap_t& cmdmap,
-     Formatter *f,
-     std::ostream& errss,
-     bufferlist& out) {
-    if (command == "wnbd stats") {
-      return m_handler->dump_stats(f);
-    }
-    return -ENOSYS;
+int WnbdAdminHook::call (
+  std::string_view command, const cmdmap_t& cmdmap,
+  const bufferlist&,
+  Formatter *f,
+  std::ostream& errss,
+  bufferlist& out)
+{
+  if (command == "wnbd stats") {
+    return m_handler->dump_stats(f);
   }
+  return -ENOSYS;
+}
 
 int WnbdHandler::dump_stats(Formatter *f)
 {

diff --git a/src/tools/rbd_wnbd/wnbd_handler.h b/src/tools/rbd_wnbd/wnbd_handler.h
index 9a8217745ff5c183fdaeb07fd55c0f1198335afa..78eaa7cdf4a078f41d1f1fa382bca4c2883d0e7a 100644 (file)
--- a/src/tools/rbd_wnbd/wnbd_handler.h
+++ b/src/tools/rbd_wnbd/wnbd_handler.h
@@ -56,7 +56,8 @@ public:
   }
 
   int call(std::string_view command, const cmdmap_t& cmdmap,
-     Formatter *f, std::ostream& errss, bufferlist& out) override;
+          const bufferlist&,
+          Formatter *f, std::ostream& errss, bufferlist& out) override;
 };