diff options
| author | Brad Hubbard <bhubbard@redhat.com> | 2017-05-17 05:28:26 +0200 |
|---|---|---|
| committer | Brad Hubbard <bhubbard@redhat.com> | 2017-05-24 06:11:32 +0200 |
| commit | eb5c02df634b34ca45ecbf1eaf4440ccf806845f (patch) | |
| tree | 4d26657934b7c1c88ae39a1ffde1e89a30e05d6c /src/mgr/MgrClient.cc | |
| parent | Merge pull request #15087 from liewegas/wip-thrash-ec (diff) | |
| download | ceph-eb5c02df634b34ca45ecbf1eaf4440ccf806845f.tar.xz ceph-eb5c02df634b34ca45ecbf1eaf4440ccf806845f.zip | |
mgr: Mark session connections down on shutdown
Also assert in OSD::ms_get_authorizer since it is dangerous to proceed
if we are shutting down.
Fixes: http://tracker.ceph.com/issues/19900
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Diffstat (limited to 'src/mgr/MgrClient.cc')
| -rw-r--r-- | src/mgr/MgrClient.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc index 2f558c0614a..45d2707af25 100644 --- a/src/mgr/MgrClient.cc +++ b/src/mgr/MgrClient.cc @@ -59,7 +59,10 @@ void MgrClient::shutdown() command_table.clear(); timer.shutdown(); - session.reset(); + if (session) { + session->con->mark_down(); + session.reset(); + } } bool MgrClient::ms_dispatch(Message *m) |