Skip to content

Comparison of Matrix configurations done by Matrix Root Project #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
papajulio wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Comparison of Matrix configurations done by Matrix Root Project #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f67b71
Merge pull request #1 from jenkinsci/master
papajulio Dec 8, 2013
d4bd1b0
Comparison of Matric configurations done by Matrix Root Project
Jun 7, 2014
79b7ba5
Merge remote-tracking branch 'jenkins/master'
Apr 13, 2015
6a16447
Merge branch 'master' into jjgarcia/fix-single-job-throttle-configura…
Apr 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import hudson.model.labels.LabelAtom;
import hudson.model.queue.CauseOfBlockage;
import hudson.model.queue.QueueTaskDispatcher;
import hudson.model.queue.SubTask;

import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -227,11 +228,20 @@ private int buildsOfProjectOnAllNodes(Task task) {

private int buildsOnExecutor(Task task, Executor exec) {
int runCount = 0;
if (exec.getCurrentExecutable() != null
&& exec.getCurrentExecutable().getParent() == task) {
runCount++;
}
if (exec.getCurrentExecutable() != null){
SubTask taskRunning = exec.getCurrentExecutable().getParent();
if (task instanceof MatrixConfiguration && taskRunning instanceof MatrixConfiguration){
ThrottleJobProperty tjp = getThrottleJobProperty(task);
if (tjp.getThrottleOption().equals("project")){
task = ((MatrixConfiguration)task).getRootProject();
taskRunning = ((MatrixConfiguration)taskRunning).getRootProject();
}
}
if (taskRunning == task) {
runCount++;
}

}
return runCount;
}

Expand Down