From: hsiang41 <rick.chen@prophetstor.com>
Date: Wed, 7 Nov 2018 14:00:34 +0000 (+0800)
Subject: Avoid import _strptime failed
X-Git-Tag: v14.1.0~955^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28707a4cd0e1dbca32f21b0e25c7d6abb828e9a6;p=ceph.git

Avoid import _strptime failed

Failed to import _strptime because the import lockis held by another thread

Signed-off-by: Rick Chen <rick.chen@prophetstor.com>
---

diff --git a/src/pybind/mgr/diskprediction_local/module.py b/src/pybind/mgr/diskprediction_local/module.py
index 1959739e3975..fd7784886dfb 100644
--- a/src/pybind/mgr/diskprediction_local/module.py
+++ b/src/pybind/mgr/diskprediction_local/module.py
@@ -1,8 +1,8 @@
 """
 diskprediction with local predictor
 """
-from datetime import datetime
 import json
+import datetime
 from threading import Event
 import time
 
@@ -59,7 +59,7 @@ class Module(MgrModule):
         ls = self.get_store('last_predicted')
         if ls:
             try:
-                last_predicted = datetime.strptime(ls, TIME_FORMAT)
+                last_predicted = datetime.datetime.strptime(ls, TIME_FORMAT)
             except ValueError:
                 pass
         self.log.debug('Last predicted %s', last_predicted)
@@ -68,15 +68,15 @@ class Module(MgrModule):
             self.refresh_config()
             mode = self.get_option('device_failure_prediction_mode')
             if mode == 'local':
-                now = datetime.utcnow()
+                now = datetime.datetime.utcnow()
                 if not last_predicted:
                     next_predicted = now
                 else:
                     predicted_frequency = int(self.predict_interval) or 86400
-                    seconds = (last_predicted - datetime.utcfromtimestamp(0)).total_seconds()
+                    seconds = (last_predicted - datetime.datetime.utcfromtimestamp(0)).total_seconds()
                     seconds -= seconds % predicted_frequency
                     seconds += predicted_frequency
-                    next_predicted = datetime.utcfromtimestamp(seconds)
+                    next_predicted = datetime.datetime.utcfromtimestamp(seconds)
                     if last_predicted:
                         self.log.debug('Last scrape %s, next scrape due %s',
                                        last_predicted.strftime(TIME_FORMAT),
@@ -107,7 +107,7 @@ class Module(MgrModule):
         :return:
             date format '%Y-%m-%d' ex. 2018-01-01
         """
-        return datetime.fromtimestamp(
+        return datetime.datetime.fromtimestamp(
             predicted_timestamp / (1000 ** 3) + life_expectancy_day).strftime('%Y-%m-%d')
 
     def _predict_life_expentancy(self, devid):