Skip to content

Fix flaky WAFModuleHandleReloadRaceTest wait assertion #13133

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

Open
cgcote wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix flaky WAFModuleHandleReloadRaceTest wait assertion #13133

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
6 changes: 4 additions & 2 deletions ...va-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/WAFModuleHandleReloadRaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,15 @@ void waitsForContextCreationBeforeClosingTheHandle() throws Exception {
assertTrue(creating.await(10, TimeUnit.SECONDS));
updateThread.start();
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(10);
// keep the observed state: a parked thread can transiently leave WAITING, so don't resample
boolean blocked = false;
while (!update.isDone()
&& !blockedInHandleReplacement(updateThread)
&& !(blocked = blockedInHandleReplacement(updateThread))
&& System.nanoTime() < deadline) {
Thread.yield();
}
assertFalse(update.isDone(), "reload must wait for context creation");
assertTrue(blockedInHandleReplacement(updateThread));
assertTrue(blocked, "reload must be parked in initOrUpdateWafHandle");
assertTrue(initialHandle.isOnline(), "handle must remain online during context creation");
} finally {
finishCreation.countDown();
Expand Down
Loading