From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Oct 2015 18:38:30 +0000 (-0400)
Subject: mon/MonClient: don't send log if we're reconnecting
X-Git-Tag: v10.0.1~26^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73bdf0fc044dbdc2780dccb6d9b201256817c0d6;p=ceph.git

mon/MonClient: don't send log if we're reconnecting

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 6e9843b99f2b..18db5a706f4a 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -719,8 +719,6 @@ void MonClient::tick()
     cur_con->send_keepalive();
 
     if (state == MC_STATE_HAVE_SESSION) {
-      send_log();
-
       if (cct->_conf->mon_client_ping_timeout > 0 &&
 	  cur_con->has_feature(CEPH_FEATURE_MSGR_KEEPALIVE2)) {
 	utime_t lk = cur_con->get_last_keepalive_ack();
@@ -731,6 +729,8 @@ void MonClient::tick()
 	  _reopen_session();
 	}
       }
+
+      send_log();
     }
   }