diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-05-23 20:08:11 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-05-23 20:08:54 -0700 |
| commit | 8c1c2d98c6dc0611e4eb09086fb3939088bad826 (patch) | |
| tree | c5d70dc9a58ecbd8895380e81312cbe7cf7de1af /src/osd/OSD.h | |
| parent | 8b3a04dec8be13559716667d4b16cde9e9543feb (diff) | |
| parent | 86822485e518d61d7b2c02a6ff25eb2c4b4bc307 (diff) | |
| download | ceph-8c1c2d98c6dc0611e4eb09086fb3939088bad826.tar.gz | |
Merge branch 'wip_scrub_tphandle' into next
Fixes: #5159
Reviewed-by: Sage Weil <sage@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 b14592880aa..4c58972ab4a 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1408,8 +1408,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() { @@ -1493,7 +1495,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(); @@ -1502,7 +1506,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 { |