From 892c1448c2afbca05dd7f3899afd2c3187e536b9 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 12 Feb 2016 10:55:43 -0800 Subject: [PATCH] Objecter: detect laggy ops with objecter_timeout, not osd_timeout Fixes: 14750 Signed-off-by: Greg Farnum --- src/osdc/Objecter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 8a6f1e659e0c1..a9a360d1026cd 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; -- 2.39.5