diff options
| author | João Eduardo Luís <joao.luis@inktank.com> | 2013-08-30 10:36:07 -0700 |
|---|---|---|
| committer | João Eduardo Luís <joao.luis@inktank.com> | 2013-08-30 10:36:07 -0700 |
| commit | 12c8850a7cf92a9ab2c11acf0a546944cb80da43 (patch) | |
| tree | bb2bcd6f905df8ec95b57fccdfdd4e2daa3dc2e0 | |
| parent | e60d4e09e9f11e3c34a05cd122341e06c7c889bb (diff) | |
| parent | 309569a6d0b7df263654b7f3f15b910a72f2918d (diff) | |
| download | ceph-12c8850a7cf92a9ab2c11acf0a546944cb80da43.tar.gz | |
Merge pull request #530 from ceph/wip-monc-leak
mon/MonClient: release pending outgoing messages on shutdown
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
| -rw-r--r-- | src/mon/MonClient.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 299379ac249..38bead8f29f 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -328,6 +328,12 @@ void MonClient::shutdown() version_requests.erase(version_requests.begin()); } + while (!waiting_for_session.empty()) { + ldout(cct, 20) << __func__ << " discarding pending message " << *waiting_for_session.front() << dendl; + waiting_for_session.front()->put(); + waiting_for_session.pop_front(); + } + monc_lock.Unlock(); if (initialized) { |