diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-28 22:10:21 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-28 22:10:21 -0700 |
| commit | 6afc22a158fea9132479cf7407c13da1504eceb5 (patch) | |
| tree | 0a89132a8d10c3d5d1b8ddae2ae77126534a17e1 /src/osd/OSD.h | |
| parent | b6be785775442af1999b2543bd07a0d28391dbc5 (diff) | |
| parent | 054e96cf79e960894ef7e33a4d13635d3ad2a1b9 (diff) | |
| download | ceph-6afc22a158fea9132479cf7407c13da1504eceb5.tar.gz | |
Merge remote-tracking branch 'gh/last'
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 428284c85ab..99d75dc40ad 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1420,8 +1420,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() { @@ -1505,7 +1507,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(); @@ -1514,7 +1518,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 { |