From: Haomai Wang <haomai@xsky.com>
Date: Wed, 4 May 2016 10:38:13 +0000 (+0800)
Subject: AsyncConnection: need to prepare message when features mismatch
X-Git-Tag: v11.0.0~138^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=222132289651a8dbb9b04edc82342aa3e7c58a7d;p=ceph.git

AsyncConnection: need to prepare message when features mismatch

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 59ec5e0dca6a..e67d5b52e7e1 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -2004,7 +2004,7 @@ int AsyncConnection::send_message(Message *m)
                               << f << " != " << get_features() << dendl;
   }
   if (!is_queued() && can_write == WriteStatus::CANWRITE && async_msgr->cct->_conf->ms_async_send_inline) {
-    if (!can_fast_prepare)
+    if (!bl.length())
       prepare_send_message(get_features(), m, bl);
     logger->inc(l_msgr_send_messages_inline);
     if (write_message(m, bl, false) < 0) {