summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-05-23 19:29:06 -0700
committerSamuel Just <sam.just@inktank.com>2013-05-23 19:30:22 -0700
commitac6c77830ad9182c7345f10943ea4f537c1629b0 (patch)
treee7d13146a97c84796b460c9d0da4d87d35b547f3
parent3984b98804bf18711a7a4fc3940143ab599ad5b5 (diff)
parent0b50d073fab11f64682e20fec7bb71d4e931bd3c (diff)
downloadceph-ac6c77830ad9182c7345f10943ea4f537c1629b0.tar.gz
Merge remote-tracking branch 'upstream/wip_scrub_tphandle_bobtail' into bobtail
Fixes: #5159 Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/common/config_opts.h1
-rw-r--r--src/osd/OSD.h12
-rw-r--r--src/osd/PG.cc60
-rw-r--r--src/osd/PG.h26
4 files changed, 66 insertions, 33 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 34e2cabd8d0..d2a9c49d5ac 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -354,6 +354,7 @@ OPTION(osd_scrub_min_interval, OPT_FLOAT, 60*60*24) // if load is low
OPTION(osd_scrub_max_interval, OPT_FLOAT, 7*60*60*24) // regardless of load
OPTION(osd_deep_scrub_interval, OPT_FLOAT, 60*60*24*7) // once a week
OPTION(osd_deep_scrub_stride, OPT_INT, 524288)
+OPTION(osd_scan_list_ping_tp_interval, OPT_U64, 100)
OPTION(osd_auto_weight, OPT_BOOL, false)
OPTION(osd_class_dir, OPT_STR, CEPH_LIBDIR "/rados-classes") // where rados plugins are stored
OPTION(osd_check_for_log_corruption, OPT_BOOL, false)
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 3eda976bfbc..bb2ca33f79a 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1242,8 +1242,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();
}
void _clear() {
@@ -1327,12 +1329,14 @@ 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->_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 {
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 44a5965658f..e4297e20e3d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3149,7 +3149,9 @@ void PG::sub_op_scrub_map(OpRequestRef op)
/*
* pg lock may or may not be held
*/
-void PG::_scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep)
+void PG::_scan_list(
+ ScrubMap &map, vector<hobject_t> &ls, bool deep,
+ ThreadPool::TPHandle &handle)
{
dout(10) << "_scan_list scanning " << ls.size() << " objects"
<< (deep ? " deeply" : "") << dendl;
@@ -3157,6 +3159,7 @@ void PG::_scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep)
for (vector<hobject_t>::iterator p = ls.begin();
p != ls.end();
p++, i++) {
+ handle.reset_tp_timeout();
hobject_t poid = *p;
struct stat st;
@@ -3176,6 +3179,7 @@ void PG::_scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep)
__u64 pos = 0;
while ( (r = osd->store->read(coll, poid, pos,
g_conf->osd_deep_scrub_stride, bl)) > 0) {
+ handle.reset_tp_timeout();
h << bl;
pos += bl.length();
bl.clear();
@@ -3196,7 +3200,14 @@ void PG::_scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep)
ObjectMap::ObjectMapIterator iter = osd->store->get_omap_iterator(
coll, poid);
assert(iter);
+ uint64_t keys_scanned = 0;
for (iter->seek_to_first(); iter->valid() ; iter->next()) {
+ if (g_conf->osd_scan_list_ping_tp_interval &&
+ (keys_scanned % g_conf->osd_scan_list_ping_tp_interval == 0)) {
+ handle.reset_tp_timeout();
+ }
+ ++keys_scanned;
+
dout(25) << "CRC key " << iter->key() << " value "
<< string(iter->value().c_str(), iter->value().length()) << dendl;
@@ -3372,8 +3383,10 @@ void PG::scrub_unreserve_replicas()
* build a scrub map over a chunk without releasing the lock
* only used by chunky scrub
*/
-int PG::build_scrub_map_chunk(ScrubMap &map,
- hobject_t start, hobject_t end, bool deep)
+int PG::build_scrub_map_chunk(
+ ScrubMap &map,
+ hobject_t start, hobject_t end, bool deep,
+ ThreadPool::TPHandle &handle)
{
dout(10) << "build_scrub_map" << dendl;
dout(20) << "scrub_map_chunk [" << start << "," << end << ")" << dendl;
@@ -3388,7 +3401,7 @@ int PG::build_scrub_map_chunk(ScrubMap &map,
return ret;
}
- _scan_list(map, ls, deep);
+ _scan_list(map, ls, deep, handle);
// pg attrs
osd->store->collection_getattrs(coll, map.attrs);
@@ -3404,7 +3417,7 @@ int PG::build_scrub_map_chunk(ScrubMap &map,
* build a (sorted) summary of pg content for purposes of scrubbing
* called while holding pg lock
*/
-void PG::build_scrub_map(ScrubMap &map)
+void PG::build_scrub_map(ScrubMap &map, ThreadPool::TPHandle &handle)
{
dout(10) << "build_scrub_map" << dendl;
@@ -3421,7 +3434,7 @@ void PG::build_scrub_map(ScrubMap &map)
vector<hobject_t> ls;
osd->store->collection_list(coll, ls);
- _scan_list(map, ls, false);
+ _scan_list(map, ls, false, handle);
lock();
if (epoch != info.history.same_interval_since) {
@@ -3445,7 +3458,9 @@ void PG::build_scrub_map(ScrubMap &map)
* build a summary of pg content changed starting after v
* called while holding pg lock
*/
-void PG::build_inc_scrub_map(ScrubMap &map, eversion_t v)
+void PG::build_inc_scrub_map(
+ ScrubMap &map, eversion_t v,
+ ThreadPool::TPHandle &handle)
{
map.valid_through = last_update_applied;
map.incr_since = v;
@@ -3469,7 +3484,7 @@ void PG::build_inc_scrub_map(ScrubMap &map, eversion_t v)
}
}
- _scan_list(map, ls, false);
+ _scan_list(map, ls, false, handle);
// pg attrs
osd->store->collection_getattrs(coll, map.attrs);
@@ -3517,7 +3532,9 @@ void PG::repair_object(const hobject_t& soid, ScrubMap::object *po, int bad_peer
* for pushes to complete in case of recent recovery. Build a single
* scrubmap of objects that are in the range [msg->start, msg->end).
*/
-void PG::replica_scrub(MOSDRepScrub *msg)
+void PG::replica_scrub(
+ MOSDRepScrub *msg,
+ ThreadPool::TPHandle &handle)
{
assert(!scrubber.active_rep_scrub);
dout(7) << "replica_scrub" << dendl;
@@ -3551,7 +3568,9 @@ void PG::replica_scrub(MOSDRepScrub *msg)
return;
}
- build_scrub_map_chunk(map, msg->start, msg->end, msg->deep);
+ build_scrub_map_chunk(
+ map, msg->start, msg->end, msg->deep,
+ handle);
} else {
if (msg->scrub_from > eversion_t()) {
@@ -3566,10 +3585,10 @@ void PG::replica_scrub(MOSDRepScrub *msg)
return;
}
}
- build_inc_scrub_map(map, msg->scrub_from);
+ build_inc_scrub_map(map, msg->scrub_from, handle);
scrubber.finalizing = 0;
} else {
- build_scrub_map(map);
+ build_scrub_map(map, handle);
}
if (msg->map_epoch < info.history.same_interval_since) {
@@ -3597,7 +3616,7 @@ void PG::replica_scrub(MOSDRepScrub *msg)
* scrub will be chunky if all OSDs in PG support chunky scrub
* scrub will fall back to classic in any other case
*/
-void PG::scrub()
+void PG::scrub(ThreadPool::TPHandle &handle)
{
lock();
if (deleting) {
@@ -3643,9 +3662,9 @@ void PG::scrub()
}
if (scrubber.is_chunky) {
- chunky_scrub();
+ chunky_scrub(handle);
} else {
- classic_scrub();
+ classic_scrub(handle);
}
unlock();
@@ -3690,7 +3709,7 @@ void PG::scrub()
* Flag set when we're in the finalize stage.
*
*/
-void PG::classic_scrub()
+void PG::classic_scrub(ThreadPool::TPHandle &handle)
{
if (!scrubber.active) {
dout(10) << "scrub start" << dendl;
@@ -3721,7 +3740,7 @@ void PG::classic_scrub()
// Unlocks and relocks...
scrubber.primary_scrubmap = ScrubMap();
- build_scrub_map(scrubber.primary_scrubmap);
+ build_scrub_map(scrubber.primary_scrubmap, handle);
if (scrubber.epoch_start != info.history.same_interval_since) {
dout(10) << "scrub pg changed, aborting" << dendl;
@@ -3768,7 +3787,7 @@ void PG::classic_scrub()
if (scrubber.primary_scrubmap.valid_through != log.head) {
ScrubMap incr;
- build_inc_scrub_map(incr, scrubber.primary_scrubmap.valid_through);
+ build_inc_scrub_map(incr, scrubber.primary_scrubmap.valid_through, handle);
scrubber.primary_scrubmap.merge_incr(incr);
}
@@ -3851,7 +3870,7 @@ void PG::classic_scrub()
* scrubber.state encodes the current state of the scrub (refer to state diagram
* for details).
*/
-void PG::chunky_scrub() {
+void PG::chunky_scrub(ThreadPool::TPHandle &handle) {
// check for map changes
if (scrubber.is_chunky_scrub_active()) {
if (scrubber.epoch_start != info.history.same_interval_since) {
@@ -3983,7 +4002,8 @@ void PG::chunky_scrub() {
// build my own scrub map
ret = build_scrub_map_chunk(scrubber.primary_scrubmap,
scrubber.start, scrubber.end,
- scrubber.deep);
+ scrubber.deep,
+ handle);
if (ret < 0) {
dout(5) << "error building scrub map: " << ret << ", aborting" << dendl;
scrub_clear_state();
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 8b76c2d7b47..4317832697e 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -41,6 +41,7 @@
#include "msg/Messenger.h"
#include "messages/MOSDRepScrub.h"
#include "messages/MOSDPGLog.h"
+#include "common/WorkQueue.h"
#include "common/DecayCounter.h"
@@ -972,23 +973,28 @@ public:
map<hobject_t, int> &authoritative,
map<hobject_t, set<int> > &inconsistent_snapcolls,
ostream &errorstream);
- void scrub();
- void classic_scrub();
- void chunky_scrub();
+ void scrub(ThreadPool::TPHandle &handle);
+ void classic_scrub(ThreadPool::TPHandle &handle);
+ void chunky_scrub(ThreadPool::TPHandle &handle);
void scrub_compare_maps();
void scrub_process_inconsistent();
void scrub_finalize();
void scrub_finish();
void scrub_clear_state();
bool scrub_gather_replica_maps();
- void _scan_list(ScrubMap &map, vector<hobject_t> &ls, bool deep);
+ void _scan_list(
+ ScrubMap &map, vector<hobject_t> &ls, bool deep,
+ ThreadPool::TPHandle &handle);
void _request_scrub_map_classic(int replica, eversion_t version);
void _request_scrub_map(int replica, eversion_t version,
hobject_t start, hobject_t end, bool deep);
- int build_scrub_map_chunk(ScrubMap &map,
- hobject_t start, hobject_t end, bool deep);
- void build_scrub_map(ScrubMap &map);
- void build_inc_scrub_map(ScrubMap &map, eversion_t v);
+ int build_scrub_map_chunk(
+ ScrubMap &map,
+ hobject_t start, hobject_t end, bool deep,
+ ThreadPool::TPHandle &handle);
+ void build_scrub_map(ScrubMap &map, ThreadPool::TPHandle &handle);
+ void build_inc_scrub_map(
+ ScrubMap &map, eversion_t v, ThreadPool::TPHandle &handle);
virtual void _scrub(ScrubMap &map) { }
virtual void _scrub_clear_state() { }
virtual void _scrub_finish() { }
@@ -1013,7 +1019,9 @@ public:
void reg_next_scrub();
void unreg_next_scrub();
- void replica_scrub(class MOSDRepScrub *op);
+ void replica_scrub(
+ class MOSDRepScrub *op,
+ ThreadPool::TPHandle &handle);
void sub_op_scrub_map(OpRequestRef op);
void sub_op_scrub_reserve(OpRequestRef op);
void sub_op_scrub_reserve_reply(OpRequestRef op);