From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Jul 2017 15:13:24 +0000 (-0400)
Subject: mgr: use rvalue ref for MMgrBeacon metadata
X-Git-Tag: v12.1.2~164^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bc029f46929e787e6aed377ab7942bfb18f0ca6;p=ceph.git

mgr: use rvalue ref for MMgrBeacon metadata

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

diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h
index 2dd586df9891..c877afc15243 100644
--- a/src/messages/MMgrBeacon.h
+++ b/src/messages/MMgrBeacon.h
@@ -48,10 +48,10 @@ public:
   MMgrBeacon(const uuid_d& fsid_, uint64_t gid_, const std::string &name_,
              entity_addr_t server_addr_, bool available_,
 	     const std::set<std::string>& module_list,
-	     const map<string,string>& metadata)
+	     map<string,string>&& metadata)
     : PaxosServiceMessage(MSG_MGR_BEACON, 0, HEAD_VERSION, COMPAT_VERSION),
       gid(gid_), server_addr(server_addr_), available(available_), name(name_),
-      fsid(fsid_), available_modules(module_list), metadata(metadata)
+      fsid(fsid_), available_modules(module_list), metadata(std::move(metadata))
   {
   }
 
diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc
index 29e8b06af855..99df69c909fd 100644
--- a/src/mgr/MgrStandby.cc
+++ b/src/mgr/MgrStandby.cc
@@ -170,7 +170,7 @@ void MgrStandby::send_beacon()
                                  addr,
                                  available,
 				 modules,
-				 metadata);
+				 std::move(metadata));
 
   if (available && !available_in_map) {
     // We are informing the mon that we are done initializing: inform