From 3bc029f46929e787e6aed377ab7942bfb18f0ca6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 Jul 2017 11:13:24 -0400 Subject: [PATCH] mgr: use rvalue ref for MMgrBeacon metadata Signed-off-by: Sage Weil --- src/messages/MMgrBeacon.h | 4 ++-- src/mgr/MgrStandby.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h index 2dd586df989..c877afc1524 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& module_list, - const map& metadata) + map&& 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 29e8b06af85..99df69c909f 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