x
/
gearman-plugin
Code Issues Proposed changes

fix function registration. 

Fixed registration for slaves that have the 'usage' configuration set to
"Leave this machine for tied jobs only"

Change-Id: Ieeb16ae9070915b3461379af9e50ae6fd69f22d7
Closes-Bug: #1253429
This commit is contained in:
Khai Do 2013-11-24 17:40:21 +00:00
parent ad75b7e0b0
commit 67f6b2342b
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/hudson/plugins/gearman/ExecutorWorkerThread.java
View File

@ -22,6 +22,7 @@ import hudson.model.AbstractProject;
import hudson.model.Computer;
import hudson.model.Label;
import hudson.model.Node;
import hudson.model.Node.Mode;
import java.util.HashMap;
import java.util.HashSet;
@ -166,11 +167,13 @@ public class ExecutorWorkerThread extends AbstractWorkerThread{
Label label = project.getAssignedLabel();
if (label == null) { // project has no label -> so register
// "build:projectName" on all nodes
String jobFunctionName = "build:" + projectName;
newFunctionMap.put(jobFunctionName, new CustomGearmanFunctionFactory(
// "build:projectName" on all non exclusive nodes
if (node.getMode() != Mode.EXCLUSIVE) {
String jobFunctionName = "build:" + projectName;
newFunctionMap.put(jobFunctionName, new CustomGearmanFunctionFactory(
jobFunctionName, StartJobWorker.class.getName(),
project, computer, this.masterName, worker));
}
} else { // register "build:$projectName:$projectLabel" if this
// node matches a node from the project label

40
src/test/java/hudson/plugins/gearman/ExecutorWorkerThreadTest.java
View File

@ -19,6 +19,7 @@
package hudson.plugins.gearman;
import hudson.maven.MavenModuleSet;
import hudson.model.Node.Mode;
import hudson.model.Project;
import hudson.model.labels.LabelAtom;
import hudson.slaves.DumbSlave;
@ -130,22 +131,54 @@ public class ExecutorWorkerThreadTest extends HudsonTestCase {
}
/*
* This test verifies that gearman functions correctly registered for a
* project that contains no labels
* This test verifies that gearman functions get correctly registered for a
* project has no labels and slave is set to normal mode (i.e. 'Utilize this
* slave as much as possible')
*/
@Test
public void testRegisterJobs_ProjectNoLabel() throws Exception {
Project<?, ?> lemon = createFreeStyleProject("lemon");
AbstractWorkerThread oneiric = new ExecutorWorkerThread("GearmanServer", 4730, "MyWorker", slave.toComputer(), "master", new NoopAvailabilityMonitor());
AbstractWorkerThread oneiric = new ExecutorWorkerThread(
"GearmanServer",
4730,
"MyWorker",
slave.toComputer(),
"master",
new NoopAvailabilityMonitor());
oneiric.testInitWorker();
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
assertEquals(1, functions.size());
assertTrue(functions.contains("build:lemon"));
}
/*
* This test verifies that a gearman function does not get registered for
* a project that has no label and slave is set to exclusive mode
* (i.e. 'leave this machine for tied jobs only')
*/
@Test
public void testRegisterJobs_ProjectNoLabel_Exclusive() throws Exception {
Project<?, ?> lemon = createFreeStyleProject("lemon");
DumbSlave exclusive_slave = createOnlineSlave(new LabelAtom("foo"));
exclusive_slave.setMode(Mode.EXCLUSIVE);
AbstractWorkerThread oneiric = new ExecutorWorkerThread(
"GearmanServer",
4730,
"MyWorker",
exclusive_slave.toComputer(),
"master",
new NoopAvailabilityMonitor());
oneiric.testInitWorker();
oneiric.registerJobs();
Set<String> functions = oneiric.worker.getRegisteredFunctions();
assertEquals(0, functions.size());
}
/*
@ -229,4 +262,5 @@ public class ExecutorWorkerThreadTest extends HudsonTestCase {
assertEquals(0, functions.size());
}
}