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

Merge pull request #12052 from liewegas/wip-osd-fast-dispatch

Browse Source 
osd: a few fast dispatch optimizations

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Yuri Weinstein 2016-11-22 16:35:24 -08:00 committed by GitHub
commit 60941ae24d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/config_opts.h
View File

@ -839,6 +839,7 @@ OPTION(osd_debug_skip_full_check_in_backfill_reservation, OPT_BOOL, false)
OPTION(osd_debug_reject_backfill_probability, OPT_DOUBLE, 0)
OPTION(osd_debug_inject_copyfrom_error, OPT_BOOL, false) // inject failure during copyfrom completion
OPTION(osd_debug_randomize_hobject_sort_order, OPT_BOOL, false)
OPTION(osd_debug_misdirected_ops, OPT_BOOL, false)
OPTION(osd_enable_op_tracker, OPT_BOOL, true) // enable/disable OSD op tracking
OPTION(osd_num_op_tracker_shard, OPT_U32, 32) // The number of shards for holding the ops
OPTION(osd_op_history_size, OPT_U32, 20) // Max number of completed ops to track

21
src/osd/OSD.cc
View File

@ -3224,12 +3224,12 @@ PG *OSD::_create_lock_pg(
return pg;
}
PGRef OSD::get_pg_or_queue_for_pg(const spg_t& pgid, OpRequestRef& op)
PGRef OSD::get_pg_or_queue_for_pg(const spg_t& pgid, OpRequestRef& op,
Session *session)
{
Session *session = static_cast<Session*>(
op->get_req()->get_connection()->get_priv());
if (!session)
if (!session) {
return PGRef();
}
// get_pg_or_queue_for_pg is only called from the fast_dispatch path where
// the session_dispatch_lock must already be held.
assert(session->session_dispatch_lock.is_locked());
@ -3249,7 +3249,6 @@ PGRef OSD::get_pg_or_queue_for_pg(const spg_t& pgid, OpRequestRef& op)
wlistiter->second.push_back(op);
register_session_waiting_on_pg(session, pgid);
}
session->put();
return PGRef(out);
}
@ -8696,7 +8695,7 @@ void OSD::handle_op(OpRequestRef& op, OSDMapRef& osdmap)
return;
}
PGRef pg = get_pg_or_queue_for_pg(pgid, op);
PGRef pg = get_pg_or_queue_for_pg(pgid, op, client_session);
if (pg) {
op->send_map_update = share_map.should_send;
op->sent_epoch = m->get_map_epoch();
@ -8705,10 +8704,14 @@ void OSD::handle_op(OpRequestRef& op, OSDMapRef& osdmap)
return;
}
// ok, we didn't have the PG. let's see if it's our fault or the client's.
// ok, we didn't have the PG.
if (!g_conf->osd_debug_misdirected_ops) {
return;
}
// let's see if it's our fault or the client's. note that this might
// involve loading an old OSDmap off disk, so it can be slow.
OSDMapRef send_map = service.try_get_map(m->get_map_epoch());
// check send epoch
if (!send_map) {
dout(7) << "don't have sender's osdmap; assuming it was valid and that"
<< " client will resend" << dendl;
@ -8784,7 +8787,7 @@ void OSD::handle_replica_op(OpRequestRef& op, OSDMapRef& osdmap)
peer_session->put();
}
PGRef pg = get_pg_or_queue_for_pg(m->pgid, op);
PGRef pg = get_pg_or_queue_for_pg(m->pgid, op, peer_session);
if (pg) {
op->send_map_update = should_share_map;
op->sent_epoch = m->map_epoch;

3
src/osd/OSD.h
View File

@ -2031,7 +2031,8 @@ protected:
PGPool _get_pool(int id, OSDMapRef createmap);
PGRef get_pg_or_queue_for_pg(const spg_t& pgid, OpRequestRef& op);
PGRef get_pg_or_queue_for_pg(const spg_t& pgid, OpRequestRef& op,
Session *session);
PG *_lookup_lock_pg_with_map_lock_held(spg_t pgid);
PG *_lookup_lock_pg(spg_t pgid);
PG *_open_lock_pg(OSDMapRef createmap,