From: Haomai Wang <haomai@xsky.com>
Date: Mon, 16 Nov 2015 17:17:34 +0000 (+0800)
Subject: ceph_test_msgr: Use send_message instead of keepalive to wakeup connection
X-Git-Tag: v10.0.1~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf408a3191e79f66474a646522ede69186ab40d9;p=ceph.git

ceph_test_msgr: Use send_message instead of keepalive to wakeup connection

If connection is standby state and call send keepalive, we should reconnect
this connection.

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

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index eddef22c5c2e..8829c1e54a64 100644
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -552,7 +552,9 @@ TEST_P(MessengerTest, ClientStandbyTest) {
   usleep(300*1000);
   // client should be standby, so we use original connection
   {
-    conn->send_keepalive();
+    // Try send message to verify got remote reset callback
+    m = new MPing();
+    ASSERT_EQ(conn->send_message(m), 0);
     {
       Mutex::Locker l(cli_dispatcher.lock);
       while (!cli_dispatcher.got_remote_reset)