RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3973 from XinzeChi/wip-scrub-pending

Browse Source 
osd: check pending or active scrub before sched_scrub

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Samuel Just 2015-06-22 15:17:46 -07:00
commit f4391a905e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osd/OSD.cc
View File

@ -905,6 +905,21 @@ void OSDService::share_map_peer(int peer, Connection *con, OSDMapRef map)
}
}
bool OSDService::can_inc_scrubs_pending()
{
bool can_inc = false;
Mutex::Locker l(sched_scrub_lock);
if (scrubs_pending + scrubs_active < cct->_conf->osd_max_scrubs) {
dout(20) << __func__ << scrubs_pending << " -> " << (scrubs_pending+1)
<< " (max " << cct->_conf->osd_max_scrubs << ", active " << scrubs_active << ")" << dendl;
can_inc = true;
} else {
dout(20) << __func__ << scrubs_pending << " + " << scrubs_active << " active >= max " << cct->_conf->osd_max_scrubs << dendl;
}
return can_inc;
}
bool OSDService::inc_scrubs_pending()
{
@ -5929,6 +5944,11 @@ bool OSD::scrub_load_below_threshold()
void OSD::sched_scrub()
{
// if not permitted, fail fast
if (!service.can_inc_scrubs_pending()) {
return;
}
utime_t now = ceph_clock_now(cct);
bool time_permit = scrub_time_permit(now);
bool load_is_low = scrub_load_below_threshold();

1
src/osd/OSD.h
View File

@ -630,6 +630,7 @@ public:
return true;
}
bool can_inc_scrubs_pending();
bool inc_scrubs_pending();
void inc_scrubs_active(bool reserved);
void dec_scrubs_pending();