commit ba2f93c5a2e53610f85846cc147ca241e4ed5db6
author Jesse Keating <omgjlk@us.ibm.com> Wed May 17 10:58:23 2017 -0700
committer Jesse Keating <omgjlk@us.ibm.com> Wed May 17 10:59:29 2017 -0700
tree 3cc0bf7491038f2d0b3ccfe6a59272a3a3310387
parent e24581dd9f27cb7c4645b70aacbc0a856faabffb

Remove unused merger:update task

This task is no longer used and was the last thing that merger claimed
to do that executor did not. Now what merger does is a subset of
executor, thus merger can scale out to handle things that leave the
executor(s) free to focus on running jobs.

Change-Id: Ibc8638cf7c2109d9b32c27fb98fb84605f5d5ac0
Signed-off-by: Jesse Keating <omgjlk@us.ibm.com>

zuul/merger/client.py

diff --git a/zuul/merger/client.py b/zuul/merger/client.py
index 642bc1b..14c6276 100644
--- a/zuul/merger/client.py
+++ b/zuul/merger/client.py
@@ -113,12 +113,6 @@
                     files=files)
         self.submitJob('merger:merge', data, build_set, precedence)
 
-    def updateRepo(self, connection_name, project_name, build_set,
-                   precedence=zuul.model.PRECEDENCE_NORMAL):
-        data = dict(connection=connection_name,
-                    project=project_name)
-        self.submitJob('merger:update', data, build_set, precedence)
-
     def getFiles(self, connection_name, project_name, branch, files,
                  precedence=zuul.model.PRECEDENCE_HIGH):
         data = dict(connection=connection_name,

zuul/merger/server.py

diff --git a/zuul/merger/server.py b/zuul/merger/server.py
index 39551c9..4daece5 100644
--- a/zuul/merger/server.py
+++ b/zuul/merger/server.py
@@ -67,7 +67,6 @@
 
     def register(self):
         self.worker.registerFunction("merger:merge")
-        self.worker.registerFunction("merger:update")
         self.worker.registerFunction("merger:cat")
 
     def stop(self):
@@ -88,9 +87,6 @@
                     if job.name == 'merger:merge':
                         self.log.debug("Got merge job: %s" % job.unique)
                         self.merge(job)
-                    elif job.name == 'merger:update':
-                        self.log.debug("Got update job: %s" % job.unique)
-                        self.update(job)
                     elif job.name == 'merger:cat':
                         self.log.debug("Got cat job: %s" % job.unique)
                         self.cat(job)
@@ -119,13 +115,6 @@
             result['commit'] = ret
         job.sendWorkComplete(json.dumps(result))
 
-    def update(self, job):
-        args = json.loads(job.arguments)
-        self.merger.updateRepo(args['connection'], args['project'])
-        result = dict(updated=True,
-                      zuul_url=self.zuul_url)
-        job.sendWorkComplete(json.dumps(result))
-
     def cat(self, job):
         args = json.loads(job.arguments)
         self.merger.updateRepo(args['connection'], args['project'])