Merge PR #32102 into master

* refs/pull/32102/head:
	mgr/diskprediction_local: import scipy early to fix self-test deadlock

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2019-12-09 14:44:37 -06:00
commit 5993dd82b0

View File

@ -9,6 +9,14 @@ import time
from mgr_module import MgrModule, CommandResult
# Importing scipy early appears to avoid a future deadlock when
# we try to do
#
# from .predictor import get_diskfailurepredictor_path
#
# in a command thread. See https://tracker.ceph.com/issues/42764
import scipy
TIME_FORMAT = '%Y%m%d-%H%M%S'
TIME_DAYS = 24*60*60