Merge "Skip retry loop on first check for group"
diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index 7f36440..bdd84f0 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -176,7 +176,7 @@
return True
-def _get_group_uuid(group):
+def _get_group_uuid(group, retries=10):
"""
Gerrit keeps internal user groups in the DB while it keeps systems
groups in All-Projects groups file (in refs/meta/config). This
@@ -189,7 +189,7 @@
"""
query = "SELECT group_uuid FROM account_groups WHERE name = %s"
con = jeepyb.gerritdb.connect()
- for x in range(10):
+ for x in range(retries):
cursor = con.cursor()
cursor.execute(query, (group,))
data = cursor.fetchone()
@@ -197,12 +197,13 @@
con.commit()
if data:
return data[0]
- time.sleep(1)
+ if retries > 1:
+ time.sleep(1)
return None
def get_group_uuid(gerrit, group):
- uuid = _get_group_uuid(group)
+ uuid = _get_group_uuid(group, retries=1)
if uuid:
return uuid
if group in GERRIT_SYSTEM_GROUPS: