summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-05-23 15:24:39 -0700
committerSamuel Just <sam.just@inktank.com>2013-05-23 15:24:39 -0700
commit5979a26d521918d74fc3b62b75c9fb6afe109933 (patch)
treecf23c8ec0f58b87ca06429b201f332ea83aa50e9
parentbde6b58baf5e78550980ee5076bbc2d72a52c0fc (diff)
downloadceph-5979a26d521918d74fc3b62b75c9fb6afe109933.tar.gz
PG: reset timeout in _scan_list for each object, read chunk
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/PG.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 5dc0f197229..c8a9a17e6db 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3159,6 +3159,7 @@ void PG::_scan_list(
for (vector<hobject_t>::iterator p = ls.begin();
p != ls.end();
p++, i++) {
+ handle.reset_tp_timeout();
hobject_t poid = *p;
struct stat st;
@@ -3178,6 +3179,7 @@ void PG::_scan_list(
__u64 pos = 0;
while ( (r = osd->store->read(coll, poid, pos,
g_conf->osd_deep_scrub_stride, bl)) > 0) {
+ handle.reset_tp_timeout();
h << bl;
pos += bl.length();
bl.clear();