Merge pull request ceph#46943 from kalaspuffar/python39

mgr/diskprediction_local: Support Python 3.9 for disk prediction module. Reviewed-by: Kefu Chai <[email protected]>
mitsu-ko · Aug 23, 2022 · ccff328 · ccff328
2 parents a1d8b79 + 1969a63
commit ccff328
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py
@@ -54,7 +54,7 @@ def test_diskprediction_local(self):
         self._load_module("selftest")
         python_version = self.mgr_cluster.mon_manager.raw_cluster_cmd(
             "mgr", "self-test", "python-version")
-        if tuple(int(v) for v in python_version.split('.')) >= (3, 8):
+        if tuple(int(v) for v in python_version.split('.')) == (3, 8):
             # https://tracker.ceph.com/issues/45147
             self.skipTest(f'python {python_version} not compatible with '
                           'diskprediction_local')

diff --git a/src/common/options/CMakeLists.txt b/src/common/options/CMakeLists.txt
@@ -76,7 +76,7 @@ endif()
 set(mgr_disabled_modules "")
 if(WITH_MGR)
   # https://tracker.ceph.com/issues/45147
-  if(Python3_VERSION VERSION_GREATER_EQUAL 3.8)
+  if(Python3_VERSION VERSION_EQUAL 3.8)
     set(mgr_disabled_modules "diskprediction_local")
     message(STATUS "mgr module disabled for ${Python3_VERSION}: ${mgr_disabled_modules}")
   endif()