almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Gather more debug data for GitWrapper clone

Browse Source 
GitWrapper._clone crashes occasionally but unfortunately
the root cause is not found yet. We need more info for debugging.

JIRA: COMPOSE-4219
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2020-04-03 10:59:36 +08:00
parent 65251d983a
commit c5e59fa732
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pungi/wrappers/scm.py
View File

@ -34,6 +34,7 @@ class ScmBase(kobo.log.LoggingBase):
def __init__(self, logger=None, command=None, compose=None): def __init__(self, logger=None, command=None, compose=None):
kobo.log.LoggingBase.__init__(self, logger=logger) kobo.log.LoggingBase.__init__(self, logger=logger)
self.command = command self.command = command
self.compose = compose
@retry(interval=60, timeout=300, wait_on=RuntimeError) @retry(interval=60, timeout=300, wait_on=RuntimeError)
def retry_run(self, cmd, **kwargs): def retry_run(self, cmd, **kwargs):
@ -159,12 +160,23 @@ class GitWrapper(ScmBase):
try: try:
run(["git", "fetch", "--depth=1", repo, branch], workdir=destdir) run(["git", "fetch", "--depth=1", repo, branch], workdir=destdir)
run(["git", "checkout", "FETCH_HEAD"], workdir=destdir) run(["git", "checkout", "FETCH_HEAD"], workdir=destdir)
except RuntimeError: except RuntimeError as e:
# Fetch failed, to do a full clone we add a remote to our empty # Fetch failed, to do a full clone we add a remote to our empty
# repo, get its content and check out the reference we want. # repo, get its content and check out the reference we want.
run(["git", "remote", "add", "origin", repo], workdir=destdir) self.log_debug(
self.retry_run(["git", "remote", "update", "origin"], workdir=destdir) "Trying to do a full clone because shallow clone failed: %s %s"
run(["git", "checkout", branch], workdir=destdir) % (e, e.output)
)
try:
run(["git", "remote", "add", "origin", repo], workdir=destdir)
self.retry_run(["git", "remote", "update", "origin"], workdir=destdir)
run(["git", "checkout", branch], workdir=destdir)
except RuntimeError:
debugdir = os.path.join(self.compose.topdir, os.path.basename(destdir))
self.log_debug("Copying %s to %s for debugging" % (destdir, debugdir))
makedirs(debugdir)
copy_all(destdir, debugdir)
raise
self.run_process_command(destdir) self.run_process_command(destdir)