From: Zack Cerza <zack@redhat.com>
Date: Thu, 11 Jul 2024 22:50:19 +0000 (-0600)
Subject: find_git_parents: Refresh mirror when required
X-Git-Tag: 1.2.0~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1976%2Fhead;p=teuthology.git

find_git_parents: Refresh mirror when required

We used to do the refresh every time, which wasn't good. Then we didn't do it at
all, which was fine until someone tried to schedule against a commit in the few
minutes before the mirror picked it up. Let's try doing it when necessary :)

Fixes: #66893

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/suite/util.py b/teuthology/suite/util.py
index 5300c6561..30994c27f 100644
--- a/teuthology/suite/util.py
+++ b/teuthology/suite/util.py
@@ -347,25 +347,34 @@ def find_git_parents(project: str, sha1: str, count=1):
         log.warning('githelper_base_url not set, --newest disabled')
         return []
 
+    def refresh():
+        url = f"{base_url}/{project}.git/refresh"
+        log.info(f"Forcing refresh of git mirror: {url}")
+        resp = requests.get(url)
+        if not resp.ok:
+            log.error('git refresh failed for %s: %s',
+                      project, resp.content.decode())
+
     def get_sha1s(project, committish, count):
-        url = '/'.join((
-            base_url,
-            f"{project}.git",
-            f"history/?committish={committish}&count={count}"
-        ))
+        url = f"base_url/{project}.git/history?committish={committish}&count={count}"
+        log.info(f"Looking for parent commits: {url}")
         resp = requests.get(url)
         resp.raise_for_status()
         sha1s = resp.json()['sha1s']
         if len(sha1s) != count:
             resp_json = resp.json()
             err_msg = resp_json.get("error") or resp_json.get("err")
-            log.debug(f"Got response: {resp_json}")
+            log.debug(f"Got {resp.status_code} response: {resp_json}")
             log.error(f"Can't find {count} parents of {sha1} in {project}: {err_msg}")
         return sha1s
 
     # index 0 will be the commit whose parents we want to find.
     # So we will query for count+1, and strip index 0 from the result.
     sha1s = get_sha1s(project, sha1, count + 1)
+    if not sha1s:
+        log.error("Will try to refresh git mirror and try again")
+        refresh()
+        sha1s = get_sha1s(project, sha1, count + 1)
     if sha1s:
         return sha1s[1:]
     return []