RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14886 from badone/wip-async-osd-scrub-sleep

Browse Source 
osd: Implement asynchronous scrub sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Kefu Chai 2017-05-09 20:27:17 +08:00 committed by GitHub
commit 1116556ff4
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/osd/PG.cc
View File

@ -326,7 +326,9 @@ PG::PG(OSDService *o, OSDMapRef curmap,
peer_features(CEPH_FEATURES_SUPPORTED_DEFAULT),
acting_features(CEPH_FEATURES_SUPPORTED_DEFAULT),
upacting_features(CEPH_FEATURES_SUPPORTED_DEFAULT),
last_epoch(0)
last_epoch(0),
scrub_sleep_lock("PG::scrub_sleep_lock"),
scrub_sleep_timer(o->cct, scrub_sleep_lock, false /* relax locking */)
{
#ifdef PG_DEBUG_REFS
osd->add_pgid(p, this);
@ -342,6 +344,8 @@ PG::PG(OSDService *o, OSDMapRef curmap,
PG::~PG()
{
pgstate_history.set_pg_in_destructor();
Mutex::Locker l(scrub_sleep_lock);
scrub_sleep_timer.shutdown();
#ifdef PG_DEBUG_REFS
osd->remove_pgid(info.pgid, this);
#endif
@ -2828,6 +2832,8 @@ void PG::init(
dirty_info = true;
dirty_big_info = true;
write_if_dirty(*t);
scrub_sleep_timer.init();
}
#pragma GCC diagnostic ignored "-Wpragmas"
@ -4216,22 +4222,34 @@ void PG::scrub(epoch_t queued, ThreadPool::TPHandle &handle)
{
if (cct->_conf->osd_scrub_sleep > 0 &&
(scrubber.state == PG::Scrubber::NEW_CHUNK ||
scrubber.state == PG::Scrubber::INACTIVE)) {
scrubber.state == PG::Scrubber::INACTIVE) && scrubber.needs_sleep) {
ceph_assert(!scrubber.sleeping);
dout(20) << __func__ << " state is INACTIVE|NEW_CHUNK, sleeping" << dendl;
unlock();
utime_t t;
t.set_from_double(cct->_conf->osd_scrub_sleep);
handle.suspend_tp_timeout();
t.sleep();
handle.reset_tp_timeout();
// Do an async sleep so we don't block the op queue
auto scrub_requeue_callback = new FunctionContext([this](int r) {
lock();
dout(20) << __func__ << " slept for " << t << dendl;
scrubber.sleeping = false;
scrubber.needs_sleep = false;
dout(20) << __func__ << " slept for "
<< ceph_clock_now() - scrubber.sleep_start
<< ", re-queuing scrub" << dendl;
scrub_queued = false;
requeue_scrub();
scrubber.sleep_start = utime_t();
unlock();
});
Mutex::Locker l(scrub_sleep_lock);
scrub_sleep_timer.add_event_after(cct->_conf->osd_scrub_sleep, scrub_requeue_callback);
scrubber.sleeping = true;
scrubber.sleep_start = ceph_clock_now();
return;
}
if (pg_has_reset_since(queued)) {
return;
}
assert(scrub_queued);
scrub_queued = false;
scrubber.needs_sleep = true;
if (!is_primary() || !is_active() || !is_clean() || !is_scrubbing()) {
dout(10) << "scrub -- not primary or active or not clean" << dendl;

12
src/osd/PG.h
View File

@ -36,6 +36,7 @@
#include "include/xlist.h"
#include "SnapMapper.h"
#include "Session.h"
#include "common/Timer.h"
#include "PGLog.h"
#include "OSDMap.h"
@ -1203,6 +1204,11 @@ public:
OpRequestRef active_rep_scrub;
utime_t scrub_reg_stamp; // stamp we registered for
// For async sleep
bool sleeping = false;
bool needs_sleep = true;
utime_t sleep_start;
// flags to indicate explicitly requested scrubs (by admin)
bool must_scrub, must_deep_scrub, must_repair;
@ -1317,6 +1323,9 @@ public:
authoritative.clear();
num_digest_updates_pending = 0;
cleaned_meta_map = ScrubMap();
sleeping = false;
needs_sleep = true;
sleep_start = utime_t();
}
void create_results(const hobject_t& obj);
@ -2190,6 +2199,9 @@ public:
epoch_t last_epoch;
Mutex scrub_sleep_lock;
SafeTimer scrub_sleep_timer;
public:
const spg_t& get_pgid() const { return pg_id; }