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

MonClient: add a timeout on commands for librados

Browse Source 
Just use the conf option directly, since librados is the only caller.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Josh Durgin 2014-02-03 18:30:00 -08:00
parent 3e1f7bbb42
commit 671a76d64b
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mon/MonClient.cc
View File

@ -882,6 +882,23 @@ void MonClient::handle_mon_command_ack(MMonCommandAck *ack)
ack->put();
}
int MonClient::_cancel_mon_command(uint64_t tid, int r)
{
assert(monc_lock.is_locked());
map<tid_t, MonCommand*>::iterator it = mon_commands.find(tid);
if (it == mon_commands.end()) {
ldout(cct, 10) << __func__ << " tid " << tid << " dne" << dendl;
return -ENOENT;
}
ldout(cct, 10) << __func__ << " tid " << tid << dendl;
MonCommand *cmd = it->second;
_finish_command(cmd, -ETIMEDOUT, "");
return 0;
}
void MonClient::_finish_command(MonCommand *r, int ret, string rs)
{
ldout(cct, 10) << "_finish_command " << r->tid << " = " << ret << " " << rs << dendl;
@ -907,6 +924,10 @@ int MonClient::start_mon_command(const vector<string>& cmd,
r->poutbl = outbl;
r->prs = outs;
r->onfinish = onfinish;
if (cct->_conf->rados_mon_op_timeout > 0) {
r->ontimeout = new C_CancelMonCommand(r->tid, this);
timer.add_event_after(cct->_conf->rados_mon_op_timeout, r->ontimeout);
}
mon_commands[r->tid] = r;
_send_command(r);
// can't fail

16
src/mon/MonClient.h
View File

@ -344,18 +344,30 @@ private:
bufferlist *poutbl;
string *prs;
int *prval;
Context *onfinish;
Context *onfinish, *ontimeout;
MonCommand(uint64_t t)
: target_rank(-1),
tid(t),
poutbl(NULL), prs(NULL), prval(NULL), onfinish(NULL)
poutbl(NULL), prs(NULL), prval(NULL), onfinish(NULL), ontimeout(NULL)
{}
};
map<uint64_t,MonCommand*> mon_commands;
class C_CancelMonCommand : public Context
{
uint64_t tid;
MonClient *monc;
public:
C_CancelMonCommand(uint64_t tid, MonClient *monc) : tid(tid), monc(monc) {}
void finish(int r) {
monc->_cancel_mon_command(tid, -ETIMEDOUT);
}
};
void _send_command(MonCommand *r);
void _resend_mon_commands();
int _cancel_mon_command(uint64_t tid, int r);
void _finish_command(MonCommand *r, int ret, string rs);
void handle_mon_command_ack(MMonCommandAck *ack);