Skip to content

test: Relax TempLocationManagerTest concurrent cleanup deadline to 60s #12867

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

Draft
jbachorik wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Draft

test: Relax TempLocationManagerTest concurrent cleanup deadline to 60s #12867

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: 6 additions & 6 deletions internal-api/src/test/java/datadog/trace/util/TempLocationManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ private void syncPoint(boolean timeout) {
withTimeout.compareAndSet(false, timeout);
hookReached.countDown();
try {
if (!proceedSignal.await(30, TimeUnit.SECONDS)) {
if (!proceedSignal.await(60, TimeUnit.SECONDS)) {
cleanupError.set(
new AssertionError("Cleanup thread: proceed signal timeout after 30s"));
new AssertionError("Cleanup thread: proceed signal timeout after 60s"));
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
Expand Down Expand Up @@ -207,13 +207,13 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc, boolean tim

try {
assertTrue(
hookReached.await(30, TimeUnit.SECONDS),
"Cleanup thread should reach hook within 30 seconds");
hookReached.await(60, TimeUnit.SECONDS),
"Cleanup thread should reach hook within 60 seconds");
// The visitor may have already deleted the file by this point; tolerate.
Files.deleteIfExists(fakeTempFile);
proceedSignal.countDown();
cleanupThread.join(TimeUnit.SECONDS.toMillis(30));
assertFalse(cleanupThread.isAlive(), "Cleanup should complete within 30s");
cleanupThread.join(TimeUnit.SECONDS.toMillis(60));
assertFalse(cleanupThread.isAlive(), "Cleanup should complete within 60s");

Throwable error = cleanupError.get();
if (error != null) {
Expand Down
Loading