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 <[email protected]>
ceph · Aug 6, 2024 · 5836ffe · 5836ffe
1 parent 7f1968c
commit 5836ffe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/teuthology/suite/test/test_util.py b/teuthology/suite/test/test_util.py
@@ -103,15 +103,15 @@ def test_get_branch_info(self, m_get):
     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):
         m_query.list_locks.return_value = [{"arch": "arch"}]
         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
@@ -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: