Skip to content
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

Save build.xml during CpsFlowExecution.suspendAll #923

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Save build.xml during CpsFlowExecution.suspendAll #923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
469ca85
Save `build.xml` during `CpsFlowExecution.suspendAll`
jglick Aug 24, 2024
7f2150a
Merge branch 'master' into CpsFlowExecution-save
jglick Oct 13, 2024
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
12 changes: 11 additions & 1 deletion plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,17 @@ public static void suspendAll() {
CpsFlowExecution cpsExec = (CpsFlowExecution) execution;
try {
cpsExec.checkAndAbortNonresumableBuild();

if (cpsExec.owner != null) {
try {
Queue.Executable exec = cpsExec.owner.getExecutable();
if (exec instanceof Saveable) {
LOGGER.fine(() -> "saving " + exec);
((Saveable) exec).save();
}
} catch (IOException x) {
LOGGER.log(Level.WARNING, "failed to save " + cpsExec, x);
}
}
Comment on lines +1663 to +1673
Copy link
Member Author

@jglick jglick Oct 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

or perhaps just

Suggested change
if (cpsExec.owner != null) {
try {
Queue.Executable exec = cpsExec.owner.getExecutable();
if (exec instanceof Saveable) {
LOGGER.fine(() -> "saving " + exec);
((Saveable) exec).save();
}
} catch (IOException x) {
LOGGER.log(Level.WARNING, "failed to save " + cpsExec, x);
}
}
cpsExec.saveOwner();

though OTOH does

workflow-cps-plugin/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

Line 1675 in dc9d3ae

cpsExec.checkpoint(true);
not already do just this?

LOGGER.log(Level.FINE, "waiting to suspend {0}", execution);
// Like waitForSuspension but with a timeout:
if (cpsExec.programPromise != null) {
Expand Down
Loading