From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 12 Feb 2016 18:55:43 +0000 (-0800)
Subject: Objecter: detect laggy ops with objecter_timeout, not osd_timeout
X-Git-Tag: v10.1.0~372^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=892c1448c2afbca05dd7f3899afd2c3187e536b9;p=ceph.git

Objecter: detect laggy ops with objecter_timeout, not osd_timeout

Fixes: 14750

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 8a6f1e659e0..a9a360d1026 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2009,7 +2009,7 @@ void Objecter::tick()
 
   // look for laggy requests
   auto cutoff = ceph::mono_clock::now();
-  cutoff -= osd_timeout;  // timeout
+  cutoff -= ceph::make_timespan(cct->_conf->objecter_timeout);  // timeout
 
   unsigned laggy_ops = 0;