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

Resolve a race condition in FlowDurabilityTest causing test flakes #568

Merged
merged 7 commits into from
Aug 5, 2022
Merged

Resolve a race condition in FlowDurabilityTest causing test flakes #568

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dc4565
BEE-15265
Riliane Jul 20, 2022
30ae3c7
resolve flakes similar to previous
Riliane Jul 25, 2022
34be3fe
Merge branch 'master' into flowdurabilitytest-flake
Riliane Jul 25, 2022
23bdce9
stop checking nodes altogether after a dirty shutdown
Riliane Aug 3, 2022
669b143
Merge remote-tracking branch 'Riliane/flowdurabilitytest-flake' into …
Riliane Aug 3, 2022
dcc6cae
Merge branch 'master' into flowdurabilitytest-flake
Riliane Aug 3, 2022
37b9011
final changes
Riliane Aug 5, 2022
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
23 changes: 17 additions & 6 deletions src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,22 @@ static void verifySucceededCleanly(Jenkins j, WorkflowRun run) throws Exception
assertHasTimingAction(run.getExecution());
}

/** A minimal check of resuming the job with no node checks, in case of a dirty shutdown.
* Currently dirty shutdowns have the potential to lose the head node ID if they happen at the moment of writing
* it to build.xml
*/
private static void verifyDirtyResumed(JenkinsRule rule, WorkflowRun run, String logStart) throws Exception {
assertHasTimingAction(run.getExecution());
rule.waitForCompletion(run);
Assert.assertEquals(Result.SUCCESS, run.getResult());
Copy link
Member

Choose a reason for hiding this comment

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

BTW there is JenkinsRule.assertBuildStatus for this purpose, though it hardly matters.

verifyCompletedCleanly(rule.jenkins, run);
//no checking nodes
rule.assertLogContains(logStart, run);
}

/** If it's a {@link SemaphoreStep} we test less rigorously because that blocks async GraphListeners. */
static void verifySafelyResumed(JenkinsRule rule, WorkflowRun run, boolean isSemaphore, String logStart) throws Exception {
assert run.isBuilding();
private static void verifySafelyResumed(JenkinsRule rule, WorkflowRun run, boolean isSemaphore, String logStart) throws Exception {
Assert.assertTrue(run.isBuilding());
FlowExecution exec = run.getExecution();

// Assert that we have the appropriate flow graph entries
Expand Down Expand Up @@ -728,7 +741,7 @@ public void evaluate() throws Throwable {
@Override
public void evaluate() throws Throwable {
WorkflowRun run = story.j.jenkins.getItemByFullName(jobName, WorkflowJob.class).getLastBuild();
verifySafelyResumed(story.j, run, false, logStart[0]);
verifyDirtyResumed(story.j, run, logStart[0]);
}
});
}
Expand Down Expand Up @@ -761,7 +774,6 @@ public void evaluate() throws Throwable {
public void evaluate() throws Throwable {
WorkflowRun run = story.j.jenkins.getItemByFullName(jobName, WorkflowJob.class).getLastBuild();
verifyFailedCleanly(story.j.jenkins, run);
assertIncludesNodes(nodesOut, run);
}
});
}
Expand All @@ -779,7 +791,7 @@ public void evaluate() throws Throwable {
WorkflowRun run = createAndRunSleeperJob(story.j.jenkins, jobName, FlowDurabilityHint.MAX_SURVIVABILITY, false);
FlowExecution exec = run.getExecution();
if (exec instanceof CpsFlowExecution) {
assert ((CpsFlowExecution) exec).getStorage().isPersistedFully();
assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); // single node xmls written
}
nodesOut.addAll(new DepthFirstScanner().allNodes(run.getExecution()));
nodesOut.sort(FlowScanningUtils.ID_ORDER_COMPARATOR);
Expand All @@ -792,7 +804,6 @@ public void evaluate() throws Throwable {
public void evaluate() throws Throwable {
WorkflowRun run = story.j.jenkins.getItemByFullName(jobName, WorkflowJob.class).getLastBuild();
verifyFailedCleanly(story.j.jenkins, run);
assertIncludesNodes(nodesOut, run);
}
});
}
Expand Down