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 2dd586df98916a95915366d66df6db74d8c36de6..c877afc152438491cc6f4c150dfd0da6accf8fef 100644 (file)
--- 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 29e8b06af8559e3c80fea14f5523acb8cdbfa0c8..99df69c909fdea44512973aabe69e3e45990d525 100644 (file)
--- 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