mds: heartbeat_reset in dispatch

Previously we only heartbeated in tick.  However, our locking is
not guaranteed to be fair, so on a super-busy dispatch queue it may be
possible for the heartbeat to time out while the tick() function
is waiting for mds_lock.

Fixes: http://tracker.ceph.com/issues/19118
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 819394549af10532419d88742fae3a69d2ea487d)

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 728af772bae6a6cd5710b25aa6d4cc7f1bfe5dfb..97497856f363f7265ca580b57eeefedfebbe929d 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -427,6 +427,8 @@ bool MDSRank::_dispatch(Message *m, bool new_msg)
       m->put();
       return false;
     }
+
+    heartbeat_reset();
   }
 
   if (dispatch_depth > 1)