Skip to content

Fix a deadlock between WorkflowRun#save and WorkflowRun#reload #523

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

Merged
jglick merged 2 commits into from
Apr 15, 2025
Merged

Fix a deadlock between WorkflowRun#save and WorkflowRun#reload #523

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d080e3
Fix a deadlock between `WorkflowRun#save` and `WorkflowRun#reload`
Vlatombe Apr 10, 2025
f1af84b
Reorganize locks inside reload()
Vlatombe Apr 15, 2025
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
22 changes: 10 additions & 12 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 @@ -556,20 +556,18 @@

// super.reload() forces result to be FAILURE, so working around that
new XmlFile(XSTREAM,new File(getRootDir(),"build.xml")).unmarshal(this);
synchronized (getMetadataGuard()) {
LOGGER.fine(() -> getExternalizableId() + " completed=" + completed + " executionLoaded=" + executionLoaded + " loaded=" + loaded);
if (Boolean.TRUE.equals(completed)) {
if (executionLoaded) {
var _execution = execution;
if (_execution != null) {
_execution.onLoad(new Owner(this));
}
}
synchronized (this) {
var _completed = completed;
var _executionLoaded = executionLoaded;
var _execution = execution;
LOGGER.fine(() -> getExternalizableId() + " completed=" + _completed + " executionLoaded=" + _executionLoaded);
if (Boolean.TRUE.equals(_completed) && _executionLoaded && _execution != null) {

Check warning on line 564 in src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 564 is only partially covered, one branch is missing
_execution.onLoad(new Owner(this));
}
if (loaded) {
super.onLoad();
} // else from WorkflowRun(WorkflowJob, File), and RunMap.retrieve will call onLoad
}
if (loaded) {
super.onLoad();
} // else from WorkflowRun(WorkflowJob, File), and RunMap.retrieve will call onLoad
}

@Override protected void onLoad() {
Expand Down
Loading