RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add code to check flag state

Browse Source 
Signed-off-by: David Zafman <david.zafman@inktank.com>
This commit is contained in:
David Zafman 2013-03-08 20:23:21 -08:00
parent 776c042844
commit 3fbdfd30e0
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osd/PG.cc
View File

@ -2857,6 +2857,21 @@ bool PG::sched_scrub()
return false;
}
bool time_for_deep = (ceph_clock_now(g_ceph_context) >
info.history.last_deep_scrub_stamp + g_conf->osd_deep_scrub_interval);
//NODEEP_SCRUB so ignore time initiated deep-scrub
if (osd->osd->get_osdmap()->test_flag(CEPH_OSDMAP_NODEEP_SCRUB))
time_for_deep = false;
if (!scrubber.must_scrub) {
assert(!scrubber.must_deep_scrub);
//NOSCRUB so skip regular scrubs
if (osd->osd->get_osdmap()->test_flag(CEPH_OSDMAP_NOSCRUB) && !time_for_deep)
return false;
}
bool ret = true;
if (!scrubber.reserved) {
assert(scrubber.reserved_peers.empty());
@ -2878,8 +2893,7 @@ bool PG::sched_scrub()
ret = false;
} else if (scrubber.reserved_peers.size() == acting.size()) {
dout(20) << "sched_scrub: success, reserved self and replicas" << dendl;
if (ceph_clock_now(g_ceph_context) >
info.history.last_deep_scrub_stamp + g_conf->osd_deep_scrub_interval) {
if (time_for_deep) {
dout(10) << "sched_scrub: scrub will be deep" << dendl;
state_set(PG_STATE_DEEP_SCRUB);
}