]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: drop unused input "handle" from _scan_rollback_obs() 21151/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 31 Mar 2018 09:58:07 +0000 (17:58 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 2 Apr 2018 09:28:56 +0000 (17:28 +0800)
Well, I think this is unnecessary since we already hard-cap
max objects to scan at a time into
[osd_scrub_chunk_min, osd_scrub_chunk_max].

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PG.cc
src/osd/PG.h

index 930f3a4b765066a576379dab0ee3e9768e54b0c0..6b3c436f7ba75a0d1f620934f70487aa55eb5867 100644 (file)
@@ -4361,9 +4361,7 @@ void PG::scrub_unreserve_replicas()
   }
 }
 
-void PG::_scan_rollback_obs(
-  const vector<ghobject_t> &rollback_obs,
-  ThreadPool::TPHandle &handle)
+void PG::_scan_rollback_obs(const vector<ghobject_t> &rollback_obs)
 {
   ObjectStore::Transaction t;
   eversion_t trimmed_to = last_rollback_info_trimmed_to_applied;
@@ -4549,7 +4547,7 @@ int PG::build_scrub_map_chunk(
     if (pos.ls.empty()) {
       break;
     }
-    _scan_rollback_obs(rollback_obs, handle);
+    _scan_rollback_obs(rollback_obs);
     pos.pos = 0;
     return -EINPROGRESS;
   }
index 0575cd8cc9eef94e1b0c0024af6821d796c6a2f0..798c0e2fd34a77c3aac936b9383ba71434328e0d 100644 (file)
@@ -1728,9 +1728,7 @@ protected:
   void scrub_clear_state();
   void _scan_snaps(ScrubMap &map);
   void _repair_oinfo_oid(ScrubMap &map);
-  void _scan_rollback_obs(
-    const vector<ghobject_t> &rollback_obs,
-    ThreadPool::TPHandle &handle);
+  void _scan_rollback_obs(const vector<ghobject_t> &rollback_obs);
   void _request_scrub_map(pg_shard_t replica, eversion_t version,
                           hobject_t start, hobject_t end, bool deep,
                          bool allow_preemption);