From a1f23b7a95ff6e173ef4cb85918d7a5b4ac4fbcf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 24 Oct 2014 11:16:36 -0700 Subject: [PATCH] Revert "rbd: ObjectCacher reads can hang when reading sparse files" This reverts commit cdb7675a21c9107e3596c90c2b1598def3c6899f. Signed-off-by: Sage Weil --- src/osdc/ObjectCacher.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 5210e934c432c..9b7f4c714ab6b 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -714,9 +714,6 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid, } } - ls.splice(ls.end(), waitfor_read); - waitfor_read.clear(); - // apply to bh's! loff_t opos = start; while (true) { @@ -771,6 +768,9 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid, loff_t oldpos = opos; opos = bh->end(); + ls.splice(ls.end(), waitfor_read); + waitfor_read.clear(); + if (r == -ENOENT) { if (trust_enoent) { ldout(cct, 10) << "bh_read_finish removing " << *bh << dendl; -- 2.39.5