zuul
/
zuul
Code Issues Proposed changes

Revert "Tune automatic garbage collection of git repos" 

This reverts commit 79e50c0410.

We suspect this is causing this error:

Traceback (most recent call last):
  File "/usr/local/lib/python3.5/dist-packages/zuul/merger/merger.py", line 841, in _mergeChange
    zuul_event_id=zuul_event_id)
  File "/usr/local/lib/python3.5/dist-packages/zuul/merger/merger.py", line 525, in merge
    repo.git.merge(*args)
  File "/usr/local/lib/python3.5/dist-packages/git/cmd.py", line 542, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/usr/local/lib/python3.5/dist-packages/git/cmd.py", line 1005, in _call_process
    return self.execute(call, **exec_kwargs)
  File "/usr/local/lib/python3.5/dist-packages/git/cmd.py", line 822, in execute
    raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(128)
  cmdline: git merge -s resolve FETCH_HEAD
  stderr: 'fatal: not something we can merge in .git/FETCH_HEAD: 3298c8f88b7b3fd49f35b0342ebb98f052f8358f		'refs/changes/83/723083/2' of ssh://review.opendev.org:29418/vexxhost/openstack-operator'

Change-Id: I2e917710110a3ad85690d1cae53122ada005e4e8
This commit is contained in:
James E. Blair 2020-04-25 11:28:50 -07:00
parent 769ecde8fc
commit 9b300bc8df
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zuul/merger/merger.py
View File

@ -189,42 +189,6 @@ class Repo(object):
config_writer.set_value('user', 'email', self.email)
if self.username:
config_writer.set_value('user', 'name', self.username)
# By default automatic garbage collection in git runs
# asynchronously in the background. This can lead to broken repos
# caused by a race in the following scenario:
# 1. git fetch (eventually triggers async gc)
# 2. zuul deletes all refs as part of reset
# 3. git gc looks for unreachable objects
# 4. zuul re-creates all refs as part of reset
# 5. git gc deletes unreachable objects it found
# Result is a repo with refs pointing to not existing objects.
# To prevent this race autoDetach can be disabled so git fetch
# returns after the gc finished.
config_writer.set_value('gc', 'autoDetach', 'false')
# Lower the threshold of how many loose objects can trigger
# automatic garbage collection. With the default value of 6700
# we observed that with some repos automatic garbage collection
# simply refused to do its job because it refuses to prune if the
# number of unreachable objects it needs to prune exceeds a certain
# threshold. Thus lower the threshold to trigger automatic garbage
# collection more often.
config_writer.set_value('gc', 'auto', '512')
# By default garbage collection keeps unreachable objects for two
# weeks. However we don't need to carry around any unreachable
# objects so just prune them all when gc kicks in.
config_writer.set_value('gc', 'pruneExpire', 'now')
# By default git keeps a reflog of each branch for 90 days. Objects
# that are reachable from a reflog entry are not considered
# unrechable and thus won't be pruned for 90 days. This can blow up
# the repo significantly over time. Since the reflog is only really
# useful for humans working with repos we can just drop all the
# reflog when gc kicks in.
config_writer.set_value('gc', 'reflogExpire', 'now')
config_writer.write()
if rewrite_url:
self._git_set_remote_url(repo, self.remote_url)