RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46943 from kalaspuffar/python39

Browse Source 
mgr/diskprediction_local: Support Python 3.9 for disk prediction module.

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
Kefu Chai 2022-08-23 23:26:07 +08:00 committed by GitHub
commit ccff328190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/tasks/mgr/test_module_selftest.py
View File

@ -54,7 +54,7 @@ class TestModuleSelftest(MgrTestCase):
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')

2
src/common/options/CMakeLists.txt
View File

@ -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()