Skip to content

JENKINS-12093 - Allow per-project & category throttling on the same job #20

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
gcummings wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JENKINS-12093 - Allow per-project & category throttling on the same job #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 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 @@ -38,19 +38,19 @@ public CauseOfBlockage canTake(Node node, Task task) {
CauseOfBlockage cause = canRun(task, tjp);
if (cause != null) return cause;

if (tjp.getThrottleOption().equals("project")) {
if (tjp.getMaxConcurrentPerNode().intValue() > 0) {
int maxConcurrentPerNode = tjp.getMaxConcurrentPerNode().intValue();
int runCount = buildsOfProjectOnNode(node, task);
// Always check per project settings
if (tjp.getMaxConcurrentPerNode().intValue() > 0) {
int maxConcurrentPerNode = tjp.getMaxConcurrentPerNode().intValue();
int runCount = buildsOfProjectOnNode(node, task);

// This would mean that there are as many or more builds currently running than are allowed.
if (runCount >= maxConcurrentPerNode) {
return CauseOfBlockage.fromMessage(Messages._ThrottleQueueTaskDispatcher_MaxCapacityOnNode(runCount));
}
// This would mean that there are as many or more builds currently running than are allowed.
if (runCount >= maxConcurrentPerNode) {
return CauseOfBlockage.fromMessage(Messages._ThrottleQueueTaskDispatcher_MaxCapacityOnNode(runCount));
}
}
else if (tjp.getThrottleOption().equals("category")) {
// If the project is in one or more categories...

// Now check if the project is in one or more categories
if (tjp.getThrottleOption().equals("category")) {
if (tjp.getCategories() != null && !tjp.getCategories().isEmpty()) {
for (String catNm : tjp.getCategories()) {
// Quick check that catNm itself is a real string.
Expand Down Expand Up @@ -130,18 +130,18 @@ public CauseOfBlockage canRun(Task task, ThrottleJobProperty tjp) {
if (Hudson.getInstance().getQueue().isPending(task)) {
return CauseOfBlockage.fromMessage(Messages._ThrottleQueueTaskDispatcher_BuildPending());
}
if (tjp.getThrottleOption().equals("project")) {
if (tjp.getMaxConcurrentTotal().intValue() > 0) {
int maxConcurrentTotal = tjp.getMaxConcurrentTotal().intValue();
int totalRunCount = buildsOfProjectOnAllNodes(task);
// Always check per project settings
if (tjp.getMaxConcurrentTotal().intValue() > 0) {
int maxConcurrentTotal = tjp.getMaxConcurrentTotal().intValue();
int totalRunCount = buildsOfProjectOnAllNodes(task);

if (totalRunCount >= maxConcurrentTotal) {
return CauseOfBlockage.fromMessage(Messages._ThrottleQueueTaskDispatcher_MaxCapacityTotal(totalRunCount));
}
if (totalRunCount >= maxConcurrentTotal) {
return CauseOfBlockage.fromMessage(Messages._ThrottleQueueTaskDispatcher_MaxCapacityTotal(totalRunCount));
}
}
// If the project is in one or more categories...
else if (tjp.getThrottleOption().equals("category")) {

// Now check if the project is in one or more categories...
if (tjp.getThrottleOption().equals("category")) {
if (tjp.getCategories() != null && !tjp.getCategories().isEmpty()) {
for (String catNm : tjp.getCategories()) {
// Quick check that catNm itself is a real string.
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/hudson/plugins/throttleconcurrents/ThrottleJobProperty/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<f:radio name="throttleOption" checked="${instance.throttleOption==null || instance.throttleOption=='project'}"
title="${%Throttle this project alone}" value="project"/>
</f:entry>
<f:entry title="${%Throttle this project as part of one or more categories}">
<f:entry title="${%Also throttle this project as part of one or more categories}">
<f:radio name="throttleOption" checked="${instance.throttleOption=='category'}"
title="${%Throttle this project as part of one or more categories}" value="category"/>
title="${%Also throttle this project as part of one or more categories}" value="category"/>
</f:entry>

<f:entry title="${%Maximum Total Concurrent Builds}"
Expand Down