Improved WorkflowRun.finish timing
#357
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
commented
May 23, 2023
| @@ -663,7 +664,6 @@ private void finish(@NonNull Result r, @CheckForNull Throwable t) { | |||
| onEndBuilding(); | |||
| } finally { // Ensure this is ALWAYS removed from FlowExecutionList | |||
| FlowExecutionList.get().unregister(new Owner(this)); | |||
| listener = null; | |||
There was a problem hiding this comment.
Also need to move up listener clearing. Otherwise listener wold be non-null (thus still logUpdated) at the moment finish saved, thus failing WorkflowRunTest.basics.
| @@ -118,7 +118,7 @@ public class WorkflowRunRestartTest { | |||
|
|
|||
| @Issue({"JENKINS-45585", "JENKINS-50784"}) // Verifies execution lazy-load | |||
| @Test public void lazyLoadExecution() { | |||
| story.thenWithHardShutdown(r -> { | |||
| story.then(r -> { | |||
This comment was marked as resolved.
This comment was marked as resolved.
…h`, to minimize impact on functional tests
jglick
commented
May 24, 2023
| } | ||
|
|
||
| try { | ||
| StashManager.maybeClearAll(this, /* or move up before closing getListener()? */new LogTaskListener(LOGGER, Level.FINE)); |
There was a problem hiding this comment.
Fixes a longstanding issue, that for example https://github.com/jenkinsci/artifact-manager-s3-plugin/blob/b8c98c6978ea3d17517e936b73ac4e98b735e934/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/JCloudsArtifactManager.java#L355 would not be seen.
jglick
changed the title
WorkflowRun.saveWithoutFailingWorkflowRun.finish timing
dwnusbaum
reviewed
May 24, 2023
src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
Outdated
Show resolved
Hide resolved
car-roll
approved these changes
May 24, 2023
Co-authored-by: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
dwnusbaum
approved these changes
May 24, 2023
This was referenced May 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I found that
BulkChangefromCpsFlowExecution.notifyListenerscausedWorkflowRun.completedto befalseinbuild.xmlat the momentRunListener.onFinalizedis called. Was noted in 18d78f3 in #27.