Skip to content

Modify computeChunkTiming to always use the start time of lastNode as the endTime for parallel branches #164

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
merged 1 commit into from
May 14, 2025
Merged

Modify computeChunkTiming to always use the start time of lastNode as the endTime for parallel branches #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 8 deletions src/main/java/org/jenkinsci/plugins/workflow/pipelinegraphanalysis/StatusAndTiming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,14 +374,10 @@ public static TimingInfo computeChunkTiming(@NonNull WorkflowRun run, long inter
verifySameRun(run, firstNode, lastNode, after);
long endTime = (after != null) ? TimingAction.getStartTime(after) : System.currentTimeMillis();

// Fudge
boolean isLastChunk = after == null || exec.isCurrentHead(lastNode);
if (isLastChunk && run.isBuilding()) {
if (exec.getCurrentHeads().size() > 1 && lastNode instanceof BlockEndNode blockEndNode) { // Check to see if all the action is on other branches
BlockStartNode start = blockEndNode.getStartNode();
if (start.getAction(ThreadNameAction.class) != null) {
endTime = TimingAction.getStartTime(lastNode); // Completed parallel branch, use the block end time
}
if (lastNode instanceof BlockEndNode blockEndNode) {
BlockStartNode start = blockEndNode.getStartNode();
if (start.getAction(ThreadNameAction.class) != null) {
endTime = TimingAction.getStartTime(lastNode); // Completed parallel branch, use the block end time
}
}
// What about null startTime???
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/jenkinsci/plugins/workflow/pipelinegraphanalysis/StatusAndTimingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,13 +319,13 @@ public void testBasicParallelFail() throws Exception {
// Passing branch time, 5 ms pause was a present above
TimingInfo successTiming = branchTimings.get("success");
assertEquals(50L, successTiming.getPauseDurationMillis());
long successRunTime = doTiming(exec, 6, 13);
long successRunTime = doTiming(exec, 6, 12);
assertEquals(successRunTime, successTiming.getTotalDurationMillis());
assertEquals(TimingAction.getStartTime(exec.getNode("6")), successTiming.getStartTimeMillis());

// Failing branch time, 50 ms pause was a present above
TimingInfo failTiming = branchTimings.get("fail");
long failRunTime = doTiming(exec, 7, 13);
long failRunTime = doTiming(exec, 7, 10);
assertEquals(Math.min(5L, failRunTime), failTiming.getPauseDurationMillis());
assertEquals(failRunTime, failTiming.getTotalDurationMillis());
assertEquals(TimingAction.getStartTime(exec.getNode("7")), failTiming.getStartTimeMillis());
Expand Down