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

Do not unregister completed executions when iterating over FlowExecutionList to avoid unnecessary log warnings #304

Merged
merged 5 commits into from
Aug 28, 2023
Merged

Do not unregister completed executions when iterating over FlowExecutionList to avoid unnecessary log warnings #304

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4521fef
computeNext() should not cause a side-effect in the normal case
Vlatombe Aug 25, 2023
1589b4a
Still need to return a non-completed FlowExecution
Vlatombe Aug 25, 2023
e75eec2
On load, unregister any complete FlowExecution to clean up stale entries
Vlatombe Aug 25, 2023
f166590
Use a different method to iterate while loading so that we can discar…
Vlatombe Aug 25, 2023
ca179a2
Remove from FlowExecutionList using iterator#remove to be safe
Vlatombe Aug 25, 2023
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
34 changes: 25 additions & 9 deletions src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import java.util.logging.Logger;
import org.jenkinsci.plugins.workflow.graph.FlowNode;
import org.jenkinsci.plugins.workflow.graphanalysis.LinearBlockHoppingScanner;
import org.jvnet.hudson.reactor.Milestone;

import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.Beta;
Expand Down Expand Up @@ -80,7 +79,7 @@ public FlowExecutionList() {
*/
@Override
public Iterator<FlowExecution> iterator() {
return new AbstractIterator<FlowExecution>() {
return new AbstractIterator<>() {
final Iterator<FlowExecutionOwner> base = runningTasks.iterator();

@Override
Expand All @@ -89,9 +88,7 @@ protected FlowExecution computeNext() {
FlowExecutionOwner o = base.next();
try {
FlowExecution e = o.get();
if (e.isComplete()) {
unregister(o);
} else {
if (!e.isComplete()) {
return e;
}
} catch (Throwable e) {
Expand Down Expand Up @@ -208,13 +205,32 @@ public boolean isResumptionComplete() {
public static class ItemListenerImpl extends ItemListener {
@Override
public void onLoaded() {
FlowExecutionList list = FlowExecutionList.get();
for (final FlowExecution e : list) {
// The call to FlowExecutionOwner.get in the implementation of iterator() is sufficent to load the Pipeline.
FlowExecutionList.get().resume();
}
}

private void resume() {
boolean needSave = false;
for (var it = runningTasks.iterator(); it.hasNext(); ) {
var o = it.next();
try {
FlowExecution e = o.get();
LOGGER.log(Level.FINE, "Eagerly loaded {0}", e);
if (e.isComplete()) {
Vlatombe marked this conversation as resolved.
Show resolved Hide resolved
LOGGER.log(Level.FINE, "Unregistering completed " + o, e);
it.remove();
needSave = true;
}
} catch (IOException ex) {
LOGGER.log(Level.FINE, "Failed to load " + o + ". Unregistering", ex);
it.remove();
needSave = true;
}
list.resumptionComplete = true;
}
if (needSave) {
saveLater();
}
resumptionComplete = true;
}

/**
Expand Down