]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
dashboard: Fix dashboard shutdown/restart 22051/head
authorBoris Ranto <branto@redhat.com>
Thu, 17 May 2018 09:02:29 +0000 (11:02 +0200)
committerBoris Ranto <branto@redhat.com>
Thu, 17 May 2018 09:02:32 +0000 (11:02 +0200)
commita7acd399d1455d23c28421d8f52cb339cb32f91b
tree86f83cf67aa06614380fc58cf944e539de21253b
parentf373e93760bdc1a3775cd47028598aa5e4a9023a
dashboard: Fix dashboard shutdown/restart

The dashboard serve method uses block which it should not as it can
cause several problems when shutting down (restarting) ceph-mgr. As a
result the restart of the ceph-mgr module will block until time-out if
the dashboard module is enabled. This fixes the problem by using a
simple simple shutdown_event instead of block() and stopping the server
afterwards.

Signed-off-by: Boris Ranto <branto@redhat.com>
src/pybind/mgr/dashboard/module.py