PG: reset timeout in _scan_list for each object, read chunk

Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2013-05-23 15:24:39 -07:00
parent b8a25e08a6
commit d62716dd4c

View File

@ -3258,6 +3258,7 @@ void PG::_scan_list(
for (vector<hobject_t>::iterator p = ls.begin(); for (vector<hobject_t>::iterator p = ls.begin();
p != ls.end(); p != ls.end();
++p, i++) { ++p, i++) {
handle.reset_tp_timeout();
hobject_t poid = *p; hobject_t poid = *p;
struct stat st; struct stat st;
@ -3277,6 +3278,7 @@ void PG::_scan_list(
while ( (r = osd->store->read(coll, poid, pos, while ( (r = osd->store->read(coll, poid, pos,
g_conf->osd_deep_scrub_stride, bl, g_conf->osd_deep_scrub_stride, bl,
true)) > 0) { true)) > 0) {
handle.reset_tp_timeout();
h << bl; h << bl;
pos += bl.length(); pos += bl.length();
bl.clear(); bl.clear();