5f423346aa
When working with GitHub Enterprise the recommended working model is branch&pull within the same repo. This is especially necessary for workflows that combine multiple repos in a single workspace. This has the side effect that those repos can contain a large number of branches that never will be part of a job. Having many branches in a repo can have a large impact on the executor performance so exclude them from the repo state if we exclude them in the tenant config. This change only affects branches, not tags or other references. Change-Id: Ic8e75fa8bf76d2e5a0b1779fa3538ee9a5c43411
204 lines
7.2 KiB
Python
204 lines
7.2 KiB
Python
# Copyright 2014 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import json
|
|
import logging
|
|
import threading
|
|
from uuid import uuid4
|
|
|
|
import gear
|
|
|
|
import zuul.model
|
|
from zuul.lib.config import get_default
|
|
from zuul.lib.logutil import get_annotated_logger
|
|
|
|
|
|
def getJobData(job):
|
|
if not len(job.data):
|
|
return {}
|
|
d = job.data[-1]
|
|
if not d:
|
|
return {}
|
|
return json.loads(d)
|
|
|
|
|
|
class MergeGearmanClient(gear.Client):
|
|
def __init__(self, merge_client):
|
|
super(MergeGearmanClient, self).__init__('Zuul Merge Client')
|
|
self.__merge_client = merge_client
|
|
|
|
def handleWorkComplete(self, packet):
|
|
job = super(MergeGearmanClient, self).handleWorkComplete(packet)
|
|
self.__merge_client.onBuildCompleted(job)
|
|
return job
|
|
|
|
def handleWorkFail(self, packet):
|
|
job = super(MergeGearmanClient, self).handleWorkFail(packet)
|
|
self.__merge_client.onBuildCompleted(job)
|
|
return job
|
|
|
|
def handleWorkException(self, packet):
|
|
job = super(MergeGearmanClient, self).handleWorkException(packet)
|
|
self.__merge_client.onBuildCompleted(job)
|
|
return job
|
|
|
|
def handleDisconnect(self, job):
|
|
job = super(MergeGearmanClient, self).handleDisconnect(job)
|
|
self.__merge_client.onBuildCompleted(job)
|
|
|
|
|
|
class MergeJob(gear.TextJob):
|
|
def __init__(self, *args, **kw):
|
|
super(MergeJob, self).__init__(*args, **kw)
|
|
self.__event = threading.Event()
|
|
|
|
def setComplete(self):
|
|
self.__event.set()
|
|
|
|
def wait(self, timeout=300):
|
|
return self.__event.wait(timeout)
|
|
|
|
|
|
class MergeClient(object):
|
|
log = logging.getLogger("zuul.MergeClient")
|
|
|
|
def __init__(self, config, sched):
|
|
self.config = config
|
|
self.sched = sched
|
|
server = self.config.get('gearman', 'server')
|
|
port = get_default(self.config, 'gearman', 'port', 4730)
|
|
ssl_key = get_default(self.config, 'gearman', 'ssl_key')
|
|
ssl_cert = get_default(self.config, 'gearman', 'ssl_cert')
|
|
ssl_ca = get_default(self.config, 'gearman', 'ssl_ca')
|
|
self.log.debug("Connecting to gearman at %s:%s" % (server, port))
|
|
self.gearman = MergeGearmanClient(self)
|
|
self.gearman.addServer(server, port, ssl_key, ssl_cert, ssl_ca,
|
|
keepalive=True, tcp_keepidle=60,
|
|
tcp_keepintvl=30, tcp_keepcnt=5)
|
|
self.git_timeout = get_default(
|
|
self.config, 'merger', 'git_timeout', 300)
|
|
self.log.debug("Waiting for gearman")
|
|
self.gearman.waitForServer()
|
|
self.jobs = set()
|
|
|
|
def stop(self):
|
|
self.gearman.shutdown()
|
|
|
|
def areMergesOutstanding(self):
|
|
if self.jobs:
|
|
return True
|
|
return False
|
|
|
|
def submitJob(self, name, data, build_set,
|
|
precedence=zuul.model.PRECEDENCE_NORMAL, event=None):
|
|
log = get_annotated_logger(self.log, event)
|
|
uuid = str(uuid4().hex)
|
|
job = MergeJob(name,
|
|
json.dumps(data),
|
|
unique=uuid)
|
|
job.build_set = build_set
|
|
log.debug("Submitting job %s with data %s", job, data)
|
|
self.jobs.add(job)
|
|
self.gearman.submitJob(job, precedence=precedence,
|
|
timeout=300)
|
|
return job
|
|
|
|
def mergeChanges(self, items, build_set, files=None, dirs=None,
|
|
repo_state=None, precedence=zuul.model.PRECEDENCE_NORMAL,
|
|
branches=None, event=None):
|
|
if event is not None:
|
|
zuul_event_id = event.zuul_event_id
|
|
else:
|
|
zuul_event_id = None
|
|
data = dict(items=items,
|
|
files=files,
|
|
dirs=dirs,
|
|
repo_state=repo_state,
|
|
branches=branches,
|
|
zuul_event_id=zuul_event_id)
|
|
self.submitJob('merger:merge', data, build_set, precedence,
|
|
event=event)
|
|
|
|
def getRepoState(self, items, build_set,
|
|
precedence=zuul.model.PRECEDENCE_NORMAL,
|
|
branches=None, event=None):
|
|
if event is not None:
|
|
zuul_event_id = event.zuul_event_id
|
|
else:
|
|
zuul_event_id = None
|
|
|
|
data = dict(items=items, branches=branches,
|
|
zuul_event_id=zuul_event_id)
|
|
self.submitJob('merger:refstate', data, build_set, precedence,
|
|
event=event)
|
|
|
|
def getFiles(self, connection_name, project_name, branch, files, dirs=[],
|
|
precedence=zuul.model.PRECEDENCE_HIGH, event=None):
|
|
if event is not None:
|
|
zuul_event_id = event.zuul_event_id
|
|
else:
|
|
zuul_event_id = None
|
|
|
|
data = dict(connection=connection_name,
|
|
project=project_name,
|
|
branch=branch,
|
|
files=files,
|
|
dirs=dirs,
|
|
zuul_event_id=zuul_event_id)
|
|
job = self.submitJob('merger:cat', data, None, precedence, event=event)
|
|
return job
|
|
|
|
def getFilesChanges(self, connection_name, project_name, branch,
|
|
tosha=None, precedence=zuul.model.PRECEDENCE_HIGH,
|
|
build_set=None, event=None):
|
|
if event is not None:
|
|
zuul_event_id = event.zuul_event_id
|
|
else:
|
|
zuul_event_id = None
|
|
|
|
data = dict(connection=connection_name,
|
|
project=project_name,
|
|
branch=branch,
|
|
tosha=tosha,
|
|
zuul_event_id=zuul_event_id)
|
|
job = self.submitJob('merger:fileschanges', data, build_set,
|
|
precedence, event=event)
|
|
return job
|
|
|
|
def onBuildCompleted(self, job):
|
|
data = getJobData(job)
|
|
zuul_event_id = data.get('zuul_event_id')
|
|
log = get_annotated_logger(self.log, zuul_event_id)
|
|
|
|
merged = data.get('merged', False)
|
|
job.updated = data.get('updated', False)
|
|
commit = data.get('commit')
|
|
files = data.get('files', {})
|
|
repo_state = data.get('repo_state', {})
|
|
job.files = files
|
|
log.info("Merge %s complete, merged: %s, updated: %s, "
|
|
"commit: %s", job, merged, job.updated, commit)
|
|
job.setComplete()
|
|
if job.build_set:
|
|
if job.name == 'merger:fileschanges':
|
|
self.sched.onFilesChangesCompleted(job.build_set, files)
|
|
else:
|
|
self.sched.onMergeCompleted(job.build_set,
|
|
merged, job.updated, commit, files,
|
|
repo_state)
|
|
|
|
# The test suite expects the job to be removed from the
|
|
# internal account after the wake flag is set.
|
|
self.jobs.remove(job)
|