osd: swap instead of copy big query list

diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h
index 870f41eae88e7056086175f6c6cc88aac854299a..5723e05a81eb62955e33cf1917a959c5491e4e98 100644 (file)
--- a/src/messages/MOSDPGQuery.h
+++ b/src/messages/MOSDPGQuery.h
@@ -32,7 +32,8 @@ class MOSDPGQuery : public Message {
   MOSDPGQuery() {}
   MOSDPGQuery(epoch_t e, map<pg_t,PG::Query>& ls) :
     Message(MSG_OSD_PG_QUERY),
-    epoch(e), pg_list(ls) {
+    epoch(e) {
+    pg_list.swap(ls);
   }
   
   const char *get_type_name() { return "PGq"; }

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7874071e33e28de276b6b4fd02a61bdcb9024818..d1341a00e60ce76173e2a49020dc97eea989ace7 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2245,7 +2245,6 @@ void OSD::handle_pg_notify(MOSDPGNotify *m)
  * NOTE: called with opqueue active.
  */
 
-
 void OSD::_process_pg_info(epoch_t epoch, int from,
                           PG::Info &info, 
                           PG::Log &log,