]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Objecter: detect laggy ops with objecter_timeout, not osd_timeout 7629/head
authorGreg Farnum <gfarnum@redhat.com>
Fri, 12 Feb 2016 18:55:43 +0000 (10:55 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Fri, 12 Feb 2016 22:35:26 +0000 (14:35 -0800)
Fixes: 14750
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/osdc/Objecter.cc

index 8a6f1e659e0c1e2a89b8c2d5d3ff7cc905db27b5..a9a360d1026cd1980f9c97046a4e07bb90c4204d 100644 (file)
@@ -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;