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

Objecter: rename cancel_op -> cancel_linger_op

Browse Source 
This makes it possible to converse about op_cancel and cancel_linger_op
without getting too confused.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Greg Farnum 2013-09-10 14:59:09 -07:00
parent 383d8a199e
commit 14c71ea39b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osdc/Objecter.cc
View File

@ -297,7 +297,7 @@ void Objecter::send_linger(LingerOp *info)
if (ops.count(info->register_tid)) {
Op *o = ops[info->register_tid];
op_cancel_map_check(o);
cancel_op(o);
cancel_linger_op(o);
}
info->register_tid = _op_submit(o);
} else {
@ -659,7 +659,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
send_op(op);
}
} else {
cancel_op(op);
cancel_linger_op(op);
}
}
for (list<LingerOp*>::iterator p = need_resend_linger.begin(); p != need_resend_linger.end(); ++p) {
@ -1003,7 +1003,7 @@ void Objecter::kick_requests(OSDSession *session)
if (op->should_resend) {
resend[op->tid] = op;
} else {
cancel_op(op);
cancel_linger_op(op);
}
}
while (!resend.empty()) {
@ -1440,12 +1440,10 @@ bool Objecter::recalc_linger_op_target(LingerOp *linger_op)
return RECALC_OP_TARGET_NO_ACTION;
}
void Objecter::cancel_op(Op *op)
void Objecter::cancel_linger_op(Op *op)
{
ldout(cct, 15) << "cancel_op " << op->tid << dendl;
// currently this only works for linger registrations, since we just
// throw out the callbacks.
assert(!op->should_resend);
delete op->onack;
delete op->oncommit;

2
src/osdc/Objecter.h
View File

@ -1187,7 +1187,7 @@ public:
map<epoch_t,list< pair<Context*, int> > > waiting_for_map;
void send_op(Op *op);
void cancel_op(Op *op);
void cancel_linger_op(Op *op);
void finish_op(Op *op);
bool is_pg_changed(vector<int>& a, vector<int>& b, bool any_change=false);
enum recalc_op_target_result {