diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-17 13:32:07 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-23 15:10:24 -0700 |
| commit | afafb87e8402242d3897069f4b94ba46ffe0c413 (patch) | |
| tree | c756ed48160790b2f8ce961dc7eb58f3b86e8f18 | |
| parent | 5fc1dabfb3b2cbffdee3214d24d7769d6e440e45 (diff) | |
| download | ceph-afafb87e8402242d3897069f4b94ba46ffe0c413.tar.gz | |
msgr: clear con->pipe inside pipe_lock on mark_down
We need to do this under protection of the pipe_lock.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/msg/SimpleMessenger.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 994f849c1eb..2bee4d6370d 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -579,6 +579,11 @@ void SimpleMessenger::mark_down(const entity_addr_t& addr) p->unregister_pipe(); p->pipe_lock.Lock(); p->stop(); + if (p->connection_state) { + // do not generate a reset event for the caller in this case, + // since they asked for it. + p->connection_state->clear_pipe(p); + } p->pipe_lock.Unlock(); } else { ldout(cct,1) << "mark_down " << addr << " -- pipe dne" << dendl; @@ -598,6 +603,11 @@ void SimpleMessenger::mark_down(Connection *con) p->unregister_pipe(); p->pipe_lock.Lock(); p->stop(); + if (p->connection_state) { + // do not generate a reset event for the caller in this case, + // since they asked for it. + p->connection_state->clear_pipe(p); + } p->pipe_lock.Unlock(); p->put(); } else { |