Merge pull request #8570 from xiexingguo/xxg-wip-scrub

osd: clear requeue_scrub_on_unblock flag after requeue scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2016-04-15 17:11:51 -04:00
commit 1f75dee1b3

View File

@ -9288,8 +9288,10 @@ void ReplicatedPG::kick_object_context_blocked(ObjectContextRef obc)
objects_blocked_on_snap_promotion.erase(i);
}
if (obc->requeue_scrub_on_unblock)
if (obc->requeue_scrub_on_unblock) {
obc->requeue_scrub_on_unblock = false;
requeue_scrub();
}
}
SnapSetContext *ReplicatedPG::create_snapset_context(const hobject_t& oid)