zuul/zuul
Code Issues Proposed changes

Clone jobdir git repos from the launcher's cache

Browse Source 
One of the main reasons we made the update thread in the launcher
was so that we could keep current copies of all the git repos
needed by jobs in the launcher, and then clone from there to the
jobdir so that we generally clone from cache.  We weren't actually
doing that, but instead were cloning from the source for each job.

This changes the jobdir merger to clone from the cached repos.

Change-Id: I2be41424c26028068671aecec2520a4a6ad7ae66
This commit is contained in:
James E. Blair 2017-02-22 22:27:11 -05:00
parent bb85e6f05c
commit e29f80a503
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zuul/launcher/server.py
View File

@ -27,6 +27,7 @@ import traceback
import yaml
import gear
import git
import zuul.merger.merger
import zuul.ansible.action
@ -238,6 +239,10 @@ class LaunchServer(object):
self.merge_name = None
self.connections = connections
# This merger and its git repos are used to maintain
# up-to-date copies of all the repos that are used by jobs, as
# well as to support the merger:cat functon to supply
# configuration information to Zuul when it starts.
self.merger = self._getMerger(self.merge_root)
self.update_queue = DeduplicateQueue()
@ -356,7 +361,7 @@ class LaunchServer(object):
self.log.exception("Exception in update thread:")
def _innerUpdateLoop(self):
# Inside of a loop that keeps the main repository up to date
# Inside of a loop that keeps the main repositories up to date
task = self.update_queue.get()
if task is None:
# We are asked to stop
@ -368,6 +373,7 @@ class LaunchServer(object):
task.setComplete()
def update(self, project, url):
# Update a repository in the main merger
task = UpdateTask(project, url)
task = self.update_queue.put(task)
return task
@ -518,6 +524,16 @@ class AnsibleJob(object):
task.wait()
self.log.debug("Job %s: git updates complete" % (self.job.unique,))
for project in args['projects']:
self.log.debug("Cloning %s" % (project['name'],))
repo = git.Repo.clone_from(
os.path.join(self.launcher_server.merge_root,
project['name']),
os.path.join(self.jobdir.git_root,
project['name']))
repo.remotes.origin.config_writer.set('url', project['url'])
# Get a merger in order to update the repos involved in this job.
merger = self.launcher_server._getMerger(self.jobdir.git_root)
merge_items = [i for i in args['items'] if i.get('refspec')]
if merge_items: