zuul
/
zuul
Code Issues Proposed changes

Merge "Add safety when setting refs"

changes/24/901624/1
Zuul 2023-11-21 07:59:15 +00:00 committed by Gerrit Code Review
parent 90746cb286 9409efae1e
commit 4e5700ee22
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/test_merger_repo.py
View File

@ -234,6 +234,7 @@ class TestMergerRepo(ZuulTestCase):
work_repo.setRefs({
'refs/heads/master': new_sha,
'refs/remotes/origin/master': new_sha,
'refs/heads/broken': 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef',
})
self.assertEqual(work_repo.getBranchHead('master').hexsha, new_sha)
self.assertIn('master', repo.remotes.origin.refs)

23
zuul/merger/merger.py
View File

@ -308,6 +308,12 @@ class Repo(object):
# object files the repository is essentially broken and
# needs to be cloned cleanly.
shutil.rmtree(self.local_path)
elif 'bad object' in e.stderr.lower():
# If we get here the git.Repo object was happy with its
# lightweight way of checking if this is a valid git
# repository. However if git reports a bad object, then
# we may have written the repo refs with bad data.
shutil.rmtree(self.local_path)
else:
time.sleep(self.retry_interval)
log.exception("Retry %s: Fetch %s %s %s" % (
@ -540,10 +546,19 @@ class Repo(object):
sorted_paths = sorted(refs.keys())
for path in sorted_paths:
hexsha = refs[path]
f.write(f'{hexsha} {path}\n'.encode(encoding))
if log:
log.debug("Set reference %s at %s in %s",
path, hexsha, repo.git_dir)
try:
# Attempt a lookup for the side effect of
# verifying the object exists.
binsha = gitdb.util.to_bin_sha(hexsha)
repo.odb.info(binsha)
f.write(f'{hexsha} {path}\n'.encode(encoding))
if log:
log.debug("Set reference %s at %s in %s",
path, hexsha, repo.git_dir)
except ValueError:
# If the object does not exist, skip setting it.
log.warning("Unable to resolve reference %s at %s in %s",
path, hexsha, repo.git_dir)
# Delete all the loose refs
for dname in ('remotes', 'tags', 'heads'):