Skip to content

Fix busy loop when "Cancel build on update" is enabled #688

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

Fix busy loop when "Cancel build on update" is enabled #688

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
40 changes: 20 additions & 20 deletions src/main/java/org/jenkinsci/plugins/ghprb/extensions/build/GhprbCancelBuildsOnUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jenkinsci.plugins.ghprb.extensions.build;

import hudson.Extension;
import hudson.model.AbstractProject;
import hudson.model.Cause;
import hudson.model.Job;
import hudson.model.Queue;
Expand Down Expand Up @@ -52,31 +53,30 @@ private void cancelCurrentBuilds(Job<?, ?> project,
+ ", checking for queued items to cancel."
);

Queue queue = Jenkins.getInstance().getQueue();
Queue.Item queueItem = project.getQueueItem();
while (queueItem != null) {
GhprbCause qcause = null;
if (project instanceof AbstractProject<?, ?>) {
Queue queue = Jenkins.getInstance().getQueue();
for (Queue.Item queueItem : queue.getItems((AbstractProject<?, ?>) project)) {
GhprbCause qcause = null;

for (Cause cause : queueItem.getCauses()) {
if (cause instanceof GhprbCause) {
qcause = (GhprbCause) cause;
for (Cause cause : queueItem.getCauses()) {
if (cause instanceof GhprbCause) {
qcause = (GhprbCause) cause;
}
}
}

if (qcause != null && qcause.getPullID() == prId) {
try {
LOGGER.log(
Level.FINER,
"Cancelling queued build of " + project.getName() + " for PR # "
+ qcause.getPullID() + ", checking for queued items to cancel."
);
queue.cancel(queueItem);
} catch (Exception e) {
LOGGER.log(Level.SEVERE, "Unable to cancel queued build", e);
if (qcause != null && qcause.getPullID() == prId) {
try {
LOGGER.log(
Level.FINER,
"Cancelling queued build of " + project.getName() + " for PR # "
+ qcause.getPullID() + ", checking for queued items to cancel."
);
queue.cancel(queueItem);
} catch (Exception e) {
LOGGER.log(Level.SEVERE, "Unable to cancel queued build", e);
}
}
}

queueItem = project.getQueueItem();
}

LOGGER.log(Level.FINER, "New build scheduled for " + project.getName() + " on PR # " + prId);
Expand Down