From: Haomai Wang <haomai@xsky.com>
Date: Mon, 27 Jun 2016 10:21:42 +0000 (+0800)
Subject: OSD: remove dispatch queue check since we don't queue hb message to this
X-Git-Tag: ses5-milestone5~485^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df63b5c5334d91776e2bec454da9854797703f53;p=ceph.git

OSD: remove dispatch queue check since we don't queue hb message to this

We already make simple/async all OSDPing use fast dispatch, xio doesn't
implment this.

Otherwise if osd_lock is held by other threads which stuck into waiting
FileStore throttler, it may cause heartbeat failure message delay a lot.

We also consider to remove Messenger::get_dispatch_queue_max_age since
it doesn't have users now. But it's fine to wait some periods to see.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 15e85ccedce8..8292c25727ce 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4137,11 +4137,6 @@ void OSD::heartbeat_check()
 {
   assert(heartbeat_lock.is_locked());
   utime_t now = ceph_clock_now(cct);
-  double age = hbclient_messenger->get_dispatch_queue_max_age(now);
-  if (age > ((double)cct->_conf->osd_heartbeat_grace / 2.0)) {
-    derr << "skipping heartbeat_check, hbqueue max age: " << age << dendl;
-    return; // hb dispatch is too backed up for our hb status to be meaningful
-  }
 
   // check for incoming heartbeats (move me elsewhere?)
   utime_t cutoff = now;