From: Samuel Just <sam.just@inktank.com>
Date: Thu, 23 May 2013 22:24:39 +0000 (-0700)
Subject: PG: reset timeout in _scan_list for each object, read chunk
X-Git-Tag: v0.63~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d62716dd4ceb29032759bf84e864d214fe38a17c;p=ceph.git

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

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a419c68de17b..6e8079dae5a0 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3258,6 +3258,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;
@@ -3277,6 +3278,7 @@ void PG::_scan_list(
         while ( (r = osd->store->read(coll, poid, pos,
                                       g_conf->osd_deep_scrub_stride, bl,
 		                      true)) > 0) {
+	  handle.reset_tp_timeout();
           h << bl;
           pos += bl.length();
           bl.clear();