diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-05-23 15:23:05 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-05-23 19:42:32 -0700 |
| commit | b8a25e08a638c31b9cfc2c1bf6d9bad40e921a9f (patch) | |
| tree | cc1e29b46fc7f149bcdea344f6f2ee715dd751b6 /src/osd/OSD.h | |
| parent | eb69c7df1902706b74876b6803ffcae68bd5ff76 (diff) | |
| download | ceph-b8a25e08a638c31b9cfc2c1bf6d9bad40e921a9f.tar.gz | |
OSD,PG: pass tphandle down to _scan_list
Signed-off-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index f52973456f6..ac2c634c1f2 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1339,8 +1339,10 @@ protected: osd->scrub_queue.pop_front(); return pg; } - void _process(PG *pg) { - pg->scrub(); + void _process( + PG *pg, + ThreadPool::TPHandle &handle) { + pg->scrub(handle); pg->put("ScrubWQ"); } void _clear() { @@ -1424,7 +1426,9 @@ protected: rep_scrub_queue.pop_front(); return msg; } - void _process(MOSDRepScrub *msg) { + void _process( + MOSDRepScrub *msg, + ThreadPool::TPHandle &handle) { osd->osd_lock.Lock(); if (osd->is_stopping()) { osd->osd_lock.Unlock(); @@ -1433,7 +1437,7 @@ protected: if (osd->_have_pg(msg->pgid)) { PG *pg = osd->_lookup_lock_pg(msg->pgid); osd->osd_lock.Unlock(); - pg->replica_scrub(msg); + pg->replica_scrub(msg, handle); msg->put(); pg->unlock(); } else { |