RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15227 from tchaikov/wip-20051

Browse Source 
mon/MonClient: cancel pending commands on shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2017-05-25 22:28:47 -05:00 committed by GitHub
commit 0f01014ba5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mon/MonClient.cc
View File

@ -408,7 +408,10 @@ void MonClient::shutdown()
delete version_requests.begin()->second;
version_requests.erase(version_requests.begin());
}
while (!mon_commands.empty()) {
auto tid = mon_commands.begin()->first;
_cancel_mon_command(tid);
}
while (!waiting_for_session.empty()) {
ldout(cct, 20) << __func__ << " discarding pending message " << *waiting_for_session.front() << dendl;
waiting_for_session.front()->put();
@ -1003,7 +1006,7 @@ void MonClient::handle_mon_command_ack(MMonCommandAck *ack)
ack->put();
}
int MonClient::_cancel_mon_command(uint64_t tid, int r)
int MonClient::_cancel_mon_command(uint64_t tid)
{
assert(monc_lock.is_locked());
@ -1053,7 +1056,7 @@ void MonClient::start_mon_command(const vector<string>& cmd,
public:
C_CancelMonCommand(uint64_t tid, MonClient *monc) : tid(tid), monc(monc) {}
void finish(int r) override {
monc->_cancel_mon_command(tid, -ETIMEDOUT);
monc->_cancel_mon_command(tid);
}
};
r->ontimeout = new C_CancelMonCommand(r->tid, this);

2
src/mon/MonClient.h
View File

@ -432,7 +432,7 @@ private:
void _send_command(MonCommand *r);
void _resend_mon_commands();
int _cancel_mon_command(uint64_t tid, int r);
int _cancel_mon_command(uint64_t tid);
void _finish_command(MonCommand *r, int ret, string rs);
void _finish_auth();
void handle_mon_command_ack(MMonCommandAck *ack);