From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Oct 2019 20:30:40 +0000 (-0500)
Subject: common/admin_socket: switch tell queue to cref_t (from ref_t)
X-Git-Tag: v15.1.0~519^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=193bd35566ebb38fa8bfa54299ff878072e720ac;p=ceph.git

common/admin_socket: switch tell queue to cref_t (from ref_t)

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index c3b0681622c9..0d6527facc8a 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -386,8 +386,8 @@ void AdminSocket::do_accept()
 void AdminSocket::do_tell_queue()
 {
   ldout(m_cct,10) << __func__ << dendl;
-  std::list<ref_t<MCommand>> q;
-  std::list<ref_t<MMonCommand>> lq;
+  std::list<cref_t<MCommand>> q;
+  std::list<cref_t<MMonCommand>> lq;
   {
     std::lock_guard l(tell_lock);
     q.swap(tell_queue);
@@ -525,14 +525,14 @@ void AdminSocket::execute_command(
   in_hook_cond.notify_all();
 }
 
-void AdminSocket::queue_tell_command(ref_t<MCommand> m)
+void AdminSocket::queue_tell_command(cref_t<MCommand> m)
 {
   ldout(m_cct,10) << __func__ << " " << *m << dendl;
   std::lock_guard l(tell_lock);
   tell_queue.push_back(std::move(m));
   wakeup();
 }
-void AdminSocket::queue_tell_command(ref_t<MMonCommand> m)
+void AdminSocket::queue_tell_command(cref_t<MMonCommand> m)
 {
   ldout(m_cct,10) << __func__ << " " << *m << dendl;
   std::lock_guard l(tell_lock);
diff --git a/src/common/admin_socket.h b/src/common/admin_socket.h
index 3ac5f140e1cd..6073869c7ef5 100644
--- a/src/common/admin_socket.h
+++ b/src/common/admin_socket.h
@@ -117,8 +117,8 @@ public:
     std::ostream& errss,
     bufferlist *outbl);
 
-  void queue_tell_command(ref_t<MCommand> m);
-  void queue_tell_command(ref_t<MMonCommand> m); // for compat
+  void queue_tell_command(cref_t<MCommand> m);
+  void queue_tell_command(cref_t<MMonCommand> m); // for compat
 
 private:
 
@@ -149,8 +149,8 @@ private:
   std::unique_ptr<AdminSocketHook> getdescs_hook;
 
   std::mutex tell_lock;
-  std::list<ref_t<MCommand>> tell_queue;
-  std::list<ref_t<MMonCommand>> tell_legacy_queue;
+  std::list<cref_t<MCommand>> tell_queue;
+  std::list<cref_t<MMonCommand>> tell_legacy_queue;
 
   struct hook_info {
     AdminSocketHook* hook;
diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 0eea4d26cb7d..e075452bee78 100644
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -24,7 +24,7 @@ public:
   std::string rs;
 
   MMonCommandAck() : PaxosServiceMessage{MSG_MON_COMMAND_ACK, 0} {}
-  MMonCommandAck(std::vector<std::string>& c, int _r, std::string s, version_t v) : 
+  MMonCommandAck(const std::vector<std::string>& c, int _r, std::string s, version_t v) :
     PaxosServiceMessage{MSG_MON_COMMAND_ACK, v},
     cmd(c), r(_r), rs(s) { }
 private: