Skip to content

Address how and where we end the AsynchronousExecution #3

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

Closed
svanoort wants to merge 7 commits into from
Closed

Address how and where we end the AsynchronousExecution #3

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d08949e
First hack at correcting the completion of the AsynchronousExecution
svanoort Oct 3, 2018
877dafd
Findbugs fix
svanoort Oct 3, 2018
c6bd9b0
Fixes to completion logic
svanoort Oct 4, 2018
e807997
Remove some pieces that are not strictly required to see if they trig…
svanoort Oct 4, 2018
bfc87ff
One final attempt to debug why lazy loading is not lazy
svanoort Oct 4, 2018
330a2af
hardening testcases against timing quirks
svanoort Oct 4, 2018
d24752d
Revert "One final attempt to debug why lazy loading is not lazy"
svanoort Oct 4, 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
30 changes: 13 additions & 17 deletions src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,16 @@ private void finish(@Nonnull Result r, @CheckForNull Throwable t) {
setResult(r);
completed = Boolean.TRUE;
duration = Math.max(0, System.currentTimeMillis() - getStartTimeInMillis());

Copy link
Owner

@jglick jglick Oct 4, 2018

Choose a reason for hiding this comment

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

could revert

}
Executor executor = getExecutor();
if (executor != null) {
AsynchronousExecution asynchronousExecution = executor.getAsynchronousExecution();
if (asynchronousExecution != null) {
asynchronousExecution.completed(null);
}
} else {
LOGGER.log(Level.SEVERE, "Build tried to complete when in fact already done.");
}
try {
LOGGER.log(Level.INFO, "{0} completed: {1}", new Object[]{toString(), getResult()});
Expand Down Expand Up @@ -1121,23 +1131,9 @@ public void save() throws IOException {
isAtomic = hint.isAtomicWrite();
}

boolean completeAsynchronousExecution = false;
try {
synchronized (this) {
completeAsynchronousExecution = Boolean.TRUE.equals(completed);
PipelineIOUtils.writeByXStream(this, loc, XSTREAM2, isAtomic);
SaveableListener.fireOnChange(this, file);
}
} finally {
if (completeAsynchronousExecution) {
Executor executor = getExecutor();
if (executor != null) {
AsynchronousExecution asynchronousExecution = executor.getAsynchronousExecution();
if (asynchronousExecution != null) {
asynchronousExecution.completed(null);
}
}
}
synchronized (this) {
PipelineIOUtils.writeByXStream(this, loc, XSTREAM2, isAtomic);
SaveableListener.fireOnChange(this, file);
}
}
}