smartctl changes

Author: vinitChacharia

ceph-osd/hooks/utils.py

@@ -337,11 +337,20 @@ def should_enable_discard(devices):
 
 
 def is_sata30orless(device):
+    db = unitdata.kv()
+    key = '%s_is_sata30orless' % str(device)
+    if db.get(key) is not None:
+        value = db.get(key)
+        log('is_sata30orless: Using cached value %s' % value, level='DEBUG')
+        return value
+
     result = subprocess.check_output(["/usr/sbin/smartctl", "-i", device])
     print(result)
     for line in str(result).split("\\n"):
         if re.match(r"SATA Version is: *SATA (1\.|2\.|3\.0)", str(line)):
+            db.set(key, True)
             return True
+    db.set(key, False)
     return False
 
 

ceph-osd/unit_tests/test_ceph_utils.py

@@ -22,6 +22,8 @@
                             lambda *args, **kwargs: f(*args, **kwargs))
     import utils
 
+from charmhelpers.core import unitdata
+
 
 class CephUtilsTestCase(unittest.TestCase):
     def setUp(self):
@@ -92,29 +94,47 @@ def test_is_sata30orless_sata31(self, mock_subprocess_check_output):
                          b'SATA 3.1, 6.0 Gb/s (current: 6.0 Gb/s)\n'
                          b'supressed text\n\n')
         mock_subprocess_check_output.return_value = extcmd_output
-        ret = utils.is_sata30orless('/dev/sda')
-        mock_subprocess_check_output.assert_called()
-        self.assertEqual(ret, False)
+        db = unitdata.kv()
+        key = '/dev/sda_is_sata30orless'
+        if db.get(key) is None:
+            ret = utils.is_sata30orless('/dev/sda')
+            mock_subprocess_check_output.assert_called()
+            self.assertEqual(ret, False)
+        else:
+            ret = utils.is_sata30orless('/dev/sda')
+            mock_subprocess_check_output.assert_not_called()
 
     @patch('subprocess.check_output')
     def test_is_sata30orless_sata30(self, mock_subprocess_check_output):
         extcmd_output = (b'supressed text\nSATA Version is:  '
                          b'SATA 3.0, 6.0 Gb/s (current: 6.0 Gb/s)\n'
                          b'supressed text\n\n')
         mock_subprocess_check_output.return_value = extcmd_output
-        ret = utils.is_sata30orless('/dev/sda')
-        mock_subprocess_check_output.assert_called()
-        self.assertEqual(ret, True)
+        db = unitdata.kv()
+        key = '/dev/sda_is_sata30orless'
+        if db.get(key) is None:
+            ret = utils.is_sata30orless('/dev/sda')
+            mock_subprocess_check_output.assert_called()
+            self.assertEqual(ret, True)
+        else:
+            ret = utils.is_sata30orless('/dev/sda')
+            mock_subprocess_check_output.assert_not_called()
 
     @patch('subprocess.check_output')
     def test_is_sata30orless_sata26(self, mock_subprocess_check_output):
         extcmd_output = (b'supressed text\nSATA Version is:  '
                          b'SATA 2.6, 3.0 Gb/s (current: 3.0 Gb/s)\n'
                          b'supressed text\n\n')
         mock_subprocess_check_output.return_value = extcmd_output
-        ret = utils.is_sata30orless('/dev/sda')
-        mock_subprocess_check_output.assert_called()
-        self.assertEqual(ret, True)
+        db = unitdata.kv()
+        key = '/dev/sda_is_sata30orless'
+        if db.get(key) is None:
+            ret = utils.is_sata30orless('/dev/sda')
+            mock_subprocess_check_output.assert_called()
+            self.assertEqual(ret, True)
+        else:
+            ret = utils.is_sata30orless('/dev/sda')
+            mock_subprocess_check_output.assert_not_called()
 
     @patch.object(utils, "function_get")
     def test_raise_on_missing_arguments(self, mock_function_get):