Skip to content

Moving check for new Pull Requests into separate thread pool #147

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

Moving check for new Pull Requests into separate thread pool #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4ed53
Moving check for new Pull Requests into separate thread pool to avoid…
Jul 26, 2018
2a06aa4
Adding exception handling for checking for new Pull Requests to be lo…
Dec 6, 2018
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
45 changes: 39 additions & 6 deletions src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
import hudson.security.ACL;
import hudson.triggers.Trigger;
import hudson.triggers.TriggerDescriptor;
import hudson.util.DaemonThreadFactory;
import hudson.util.ExceptionCatchingThreadFactory;
import hudson.util.ListBoxModel;
import hudson.util.NamingThreadFactory;
import jenkins.model.Jenkins;
import jenkins.model.ParameterizedJobMixIn;
import net.sf.json.JSONObject;
Expand All @@ -41,6 +44,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -71,6 +77,7 @@ public class StashBuildTrigger extends Trigger<Job<?, ?>> {
private final boolean cancelOutdatedJobsEnabled;

transient private StashPullRequestsBuilder stashPullRequestsBuilder;
transient private AtomicBoolean checkAlreadyQueued;

@Extension
public static final StashBuildTriggerDescriptor descriptor = new StashBuildTriggerDescriptor();
Expand Down Expand Up @@ -202,6 +209,7 @@ public void start(Job<?, ?> job, boolean newInstance) {
this.stashPullRequestsBuilder.setJob(job);
this.stashPullRequestsBuilder.setTrigger(this);
this.stashPullRequestsBuilder.setupBuilder();
this.checkAlreadyQueued = new AtomicBoolean(false);
} catch(IllegalStateException e) {
logger.log(Level.SEVERE, "Can't start trigger", e);
return;
Expand All @@ -213,7 +221,7 @@ public static StashBuildTrigger getTrigger(Job job) {
if (!(job instanceof ParameterizedJobMixIn.ParameterizedJob)) {
return null;
}

ParameterizedJobMixIn.ParameterizedJob pjob = (ParameterizedJobMixIn.ParameterizedJob) job;

Trigger trigger = pjob.getTriggers().get(descriptor);
Expand Down Expand Up @@ -248,13 +256,13 @@ public QueueTaskFuture<?> startJob(StashCause cause) {
cancelPreviousJobsInQueueThatMatch(cause);
abortRunningJobsThatMatch(cause);
}

return new ParameterizedJobMixIn() {
@Override
protected Job asJob() {
return StashBuildTrigger.this.job;
}
}.scheduleBuild2(0, new ParametersAction(values), new CauseAction(cause));
}.scheduleBuild2(0, new ParametersAction(values), new CauseAction(cause));
}

private void cancelPreviousJobsInQueueThatMatch(@Nonnull StashCause stashCause) {
Expand Down Expand Up @@ -309,11 +317,24 @@ private List<ParameterValue> getDefaultParameters() {

@Override
public void run() {
if(!this.getBuilder().getJob().isBuildable()) {
if (!this.getBuilder().getJob().isBuildable()) {
logger.info(format("Build Skip (%s).", getBuilder().getJob().getName()));
} else {
} else if(checkAlreadyQueued.compareAndSet(false, true)) {
logger.info(format("Build started (%s).", getBuilder().getJob().getName()));
this.stashPullRequestsBuilder.run();
descriptor.getExecutorService().execute(new Runnable() {
@Override
public void run() {
try {
stashPullRequestsBuilder.run();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it by intentention that all exceptions are ignored now?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's say it is not intentional. Let me add the fix for this.

} catch (Exception e) {
logger.log(Level.WARNING, "Stash Pull Request Builder failed when checking for changes", e);
} finally {
checkAlreadyQueued.set(false);
}
}
});
} else {
logger.info(format("Build check already queued - skipping (%s).", getBuilder().getJob().getName()));
}
this.getDescriptor().save();
}
Expand All @@ -336,10 +357,22 @@ public boolean isOnlyBuildOnComment() {
}

public static final class StashBuildTriggerDescriptor extends TriggerDescriptor {

private transient final ExecutorService executorService;

public StashBuildTriggerDescriptor() {
executorService = Executors.newFixedThreadPool(
10,
new ExceptionCatchingThreadFactory(
new NamingThreadFactory(new DaemonThreadFactory(), "StashBuildTriggerDescriptor.executorService")));
load();
}

@Nonnull
public ExecutorService getExecutorService() {
return executorService;
}

@Override
public boolean isApplicable(Item item) {
return true;
Expand Down