From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 22:19:51 +0000 (-0600)
Subject: mon/MonClient: send logs to mon even if we have no keelalive2
X-Git-Tag: v15.1.1~38^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa774b88427673babbc0038b452e26781306c2f4;p=ceph.git

mon/MonClient: send logs to mon even if we have no keelalive2

This looks like a subtle regression introduced inadvertantly by
a2eb6ae3fb57b09efdd4d7baac6871ca8dd8e79f.

Sending logs has nothing to do with the connection features or whether/how
we are timing out.

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index dbb4287a2a2..033d8a00850 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -924,10 +924,11 @@ void MonClient::tick()
 		      << " seconds), reconnecting" << dendl;
 	return _reopen_session();
       }
-      send_log();
     }
 
     _un_backoff();
+
+    send_log();
   }
 }