Skip to content

[JENKINS-60434] Allow pipelines to continue running when preparing for shutdown #846

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

[JENKINS-60434] Allow pipelines to continue running when preparing for shutdown #846

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
10 changes: 8 additions & 2 deletions plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import hudson.model.Result;
import hudson.util.XStream2;
import jenkins.model.Jenkins;
import jenkins.util.SystemProperties;
import jenkins.util.Timer;
import org.jenkinsci.plugins.workflow.actions.ErrorAction;
import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn;
Expand Down Expand Up @@ -94,6 +95,11 @@
@PersistIn(PersistenceContext.PROGRAM)
@SuppressFBWarnings("SE_BAD_FIELD") // bogus warning about closures
public final class CpsThreadGroup implements Serializable {
/**
* Whether to keep pipelines running when preparing for shutdown. Defaults to false (pipelines are paused).
*/
private static boolean keepPipelinesRunningWhenQuietingDown = SystemProperties.getBoolean(CpsThreadGroup.class.getName() + ".keepPipelinesRunningWhenQuietingDown");

/**
* {@link CpsThreadGroup} always belong to the same {@link CpsFlowExecution}.
*
Expand Down Expand Up @@ -303,8 +309,8 @@ public Void call() throws Exception {
LOGGER.log(Level.WARNING, null, e);
}
}
if (paused.get() || j == null || (execution != null && j.isQuietingDown())) {
if (j != null && j.isQuietingDown() && execution != null && pausedByQuietMode.compareAndSet(false, true)) {
if (paused.get() || j == null || (execution != null && j.isQuietingDown() && !keepPipelinesRunningWhenQuietingDown)) {
if (j != null && j.isQuietingDown() && execution != null && !keepPipelinesRunningWhenQuietingDown && pausedByQuietMode.compareAndSet(false, true)) {
try {
execution.getOwner().getListener().getLogger().println("Pausing (Preparing for shutdown)");
} catch (IOException e) {
Expand Down