]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MonClient: don't send log if we're reconnecting
authorSage Weil <sage@redhat.com>
Tue, 6 Oct 2015 18:38:30 +0000 (14:38 -0400)
committerSage Weil <sage@redhat.com>
Mon, 23 Nov 2015 13:38:47 +0000 (08:38 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/MonClient.cc

index 6e9843b99f2b7abbe1ccce5497fad3e47c840f30..18db5a706f4a32dc628e118522c85d2f6adb6b66 100644 (file)
@@ -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();
     }
   }