diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-22 17:46:45 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-22 17:46:45 -0700 |
| commit | 309569a6d0b7df263654b7f3f15b910a72f2918d (patch) | |
| tree | f21ece24129d98fbcf932b0b3b3f750f296c6740 | |
| parent | 617dc36d477fd83b2d45034fe6311413aa1866df (diff) | |
| download | ceph-309569a6d0b7df263654b7f3f15b910a72f2918d.tar.gz | |
mon/MonClient: release pending outgoing messages on shutdown
This fixes a small memory leak when we have messages queued for the mon
when we shut down. It is harmless except for the valgrind leak check
noise that obscures real leaks.
Backport: dumpling
Signed-off-by: Sage Weil <sage@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) { |