From 3cd499aa74ca56c17b13ef276dd70c465b28d17e Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 17 Sep 2019 02:24:15 +0800
Subject: [PATCH] osd/PeeringState: use
 BufferedRecoveryMessages::send_osd_message()

more consistent this way.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
 src/osd/PeeringState.cc | 45 +++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 616cdd72b2f..4611ecdaae9 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -34,16 +34,9 @@ void BufferedRecoveryMessages::send_notify(int to, const pg_notify_t &n)
 {
   if (require_osd_release >= ceph_release_t::octopus) {
     spg_t pgid(n.info.pgid.pgid, n.to);
-    message_map[to].push_back(
-      make_message<MOSDPGNotify2>(
-	pgid,
-	n));
+    send_osd_message(to, make_message<MOSDPGNotify2>(pgid, n));
   } else {
-    vector<pg_notify_t> notifies;
-    notifies.push_back(n);
-    message_map[to].push_back(
-      make_message<MOSDPGNotify>(n.epoch_sent, std::move(notifies))
-      );
+    send_osd_message(to, make_message<MOSDPGNotify>(n.epoch_sent, vector{n}));
   }
 }
 
@@ -53,15 +46,13 @@ void BufferedRecoveryMessages::send_query(
   const pg_query_t &q)
 {
   if (require_osd_release >= ceph_release_t::octopus) {
-    message_map[to].push_back(
-      make_message<MOSDPGQuery2>(to_spgid, q)
-      );
+    send_osd_message(to,
+		     make_message<MOSDPGQuery2>(to_spgid, q));
   } else {
-    map<spg_t,pg_query_t> queries;
-    queries[to_spgid] = q;
-    message_map[to].push_back(
-      make_message<MOSDPGQuery>(q.epoch_sent, std::move(queries))
-      );
+    auto m = make_message<MOSDPGQuery>(
+      q.epoch_sent,
+      MOSDPGQuery::pg_list_t{{to_spgid, q}});
+    send_osd_message(to, m);
   }
 }
 
@@ -73,7 +64,8 @@ void BufferedRecoveryMessages::send_info(
   const pg_info_t &info)
 {
   if (require_osd_release >= ceph_release_t::octopus) {
-    message_map[to].push_back(
+    send_osd_message(
+      to,
       make_message<MOSDPGInfo2>(
 	to_spgid,
 	info,
@@ -81,14 +73,15 @@ void BufferedRecoveryMessages::send_info(
 	min_epoch)
       );
   } else {
-    auto m = make_message<MOSDPGInfo>(cur_epoch);
-    m->pg_list.push_back(
-      pg_notify_t(
-	to_spgid.shard,
-	info.pgid.shard,
-	min_epoch, cur_epoch,
-	info, PastIntervals()));
-    message_map[to].push_back(m);
+    send_osd_message(
+      to,
+      make_message<MOSDPGInfo>(
+        cur_epoch,
+        vector{pg_notify_t{to_spgid.shard,
+			   info.pgid.shard,
+			   min_epoch, cur_epoch,
+			   info, PastIntervals{}}})
+      );
   }
 }
 
-- 
2.39.5