From: Adam Kupczyk <akupczyk@redhat.com>
Date: Tue, 30 Jul 2019 10:26:33 +0000 (+0200)
Subject: common/admin_socket: Adapted old protocol to use new protocol, simplifies handle... 
X-Git-Tag: v14.2.5~57^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fc227dd07ddcedc72b57342dcd0f701edf361da;p=ceph.git

common/admin_socket: Adapted old protocol to use new protocol, simplifies handle path.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 2b5da1f671a76f77107b6eaefc67e0e9c9179ca7)
---

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index c7f21f7b0f2..258eb7315a6 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -317,6 +317,8 @@ bool AdminSocket::do_accept()
 	  c = "foo";
 	  break;
 	}
+	//wrap command with new protocol
+	c = "{\"prefix\": \"" + c + "\"}";
 	break;
       }
     } else {
@@ -340,7 +342,7 @@ bool AdminSocket::do_accept()
   string format;
   vector<string> cmdvec;
   stringstream errss;
-  cmdvec.push_back(cmd);
+  cmdvec.push_back(c);
   if (!cmdmap_from_json(cmdvec, &cmdmap, errss)) {
     ldout(m_cct, 0) << "AdminSocket: " << errss.str() << dendl;
     retry_sys_call(::close, connection_fd);