From: yanjun <942431195@qq.com>
Date: Fri, 10 Aug 2018 02:49:19 +0000 (+0800)
Subject: Merge pull request #23482 from Yan-waller/wip-walle-180808-mgr-deadlock
X-Git-Tag: v14.0.1~632
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d50bef3861801d180ad32b1e179dd90e0bad7ffe;p=ceph.git

Merge pull request #23482 from Yan-waller/wip-walle-180808-mgr-deadlock

mgr: fix beacon interruption caused by deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

d50bef3861801d180ad32b1e179dd90e0bad7ffe