From: Kyr Shatskyy Date: Tue, 6 Aug 2024 22:54:00 +0000 (+0200) Subject: suite/util: list_lock() once for get_arch() X-Git-Tag: 1.2.0^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5836ffe2db39fa0ae6c6f89387150336fdd1399e;p=teuthology.git suite/util: list_lock() once for get_arch() We only want to try to list_locks() for getting arch by machine_type when scheduling a suite. Otherwise we've got into an infinite loop and console log flooded with useless error messages. Signed-off-by: Kyr Shatskyy --- diff --git a/teuthology/suite/test/test_util.py b/teuthology/suite/test/test_util.py index 20a7dcc88..daa583023 100644 --- a/teuthology/suite/test/test_util.py +++ b/teuthology/suite/test/test_util.py @@ -103,7 +103,7 @@ Branch 'no-branch' not found in repo: https://github.com/ceph/ceph-ci.git!" def test_get_arch_fail(self, m_query): m_query.list_locks.return_value = False util.get_arch('magna') - m_query.list_locks.assert_called_with(machine_type="magna", count=1) + m_query.list_locks.assert_called_with(machine_type="magna", count=1, tries=1) @patch('teuthology.lock.query') def test_get_arch_success(self, m_query): @@ -111,7 +111,7 @@ Branch 'no-branch' not found in repo: https://github.com/ceph/ceph-ci.git!" result = util.get_arch('magna') m_query.list_locks.assert_called_with( machine_type="magna", - count=1 + count=1, tries=1 ) assert result == "arch" diff --git a/teuthology/suite/util.py b/teuthology/suite/util.py index 8999f9eaf..db0cf11cb 100644 --- a/teuthology/suite/util.py +++ b/teuthology/suite/util.py @@ -263,7 +263,7 @@ def get_arch(machine_type): :returns: A string or None """ - result = teuthology.lock.query.list_locks(machine_type=machine_type, count=1) + result = teuthology.lock.query.list_locks(machine_type=machine_type, count=1, tries=1) if not result: log.warning("No machines found with machine_type %s!", machine_type) else: