From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Fri, 6 Sep 2019 03:21:12 +0000 (+0800)
Subject: msg/async/ProtocolV1: avoid unnecessary bufferlist::swap.
X-Git-Tag: v15.1.0~1640^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2e55da9406ef5f41b8b886702d019aa58df07da8;p=ceph-ci.git

msg/async/ProtocolV1: avoid unnecessary bufferlist::swap.

Currently, for MOSDOpRely it don't prepare in func send_message.
So no need do swap for empty bufferlist.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index 2c7121a9c80..9f6160d7ef0 100644
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -1304,7 +1304,10 @@ Message *ProtocolV1::_get_next_outgoing(bufferlist *bl) {
     ceph_assert(!it->second.empty());
     list<pair<bufferlist, Message *> >::iterator p = it->second.begin();
     m = p->second;
-    if (bl) bl->swap(p->first);
+    if (p->first.length() && bl) {
+      assert(bl->length() == 0);
+      bl->swap(p->first);
+    }
     it->second.erase(p);
     if (it->second.empty()) out_q.erase(it->first);
   }