This is an automated email from the ASF dual-hosted git repository. abhishekrb pushed a commit to branch bump_nested_query_timeout in repository https://gitbox.apache.org/repos/asf/druid.git
commit 755660c7adeb8087dd10a3d4e28ece04ab9fdf53 Author: Abhishek Balaji Radhakrishnan <[email protected]> AuthorDate: Fri Dec 5 13:12:06 2025 -0800 Increase latchable timeout to 20s for ForcePushDownNestedQueryTest The MSQ query appearst to take longer than 10s. Other tests like QueryVirtualStorageTest and EmbeddedDurableShuffleStorageTest that use the same query use 20s timeout, so that should help. Also, include the timeout in the error message so it's clear rather than having to look at the stacktrace. --- .../druid/testing/embedded/query/ForcePushDownNestedQueryTest.java | 7 +++++++ .../java/org/apache/druid/server/metrics/LatchableEmitter.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/query/ForcePushDownNestedQueryTest.java b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/query/ForcePushDownNestedQueryTest.java index b921d1c75ac..d57e18f9c25 100644 --- a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/query/ForcePushDownNestedQueryTest.java +++ b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/query/ForcePushDownNestedQueryTest.java @@ -40,6 +40,7 @@ import org.apache.druid.query.groupby.having.OrHavingSpec; import org.apache.druid.segment.TestHelper; import org.apache.druid.sql.calcite.planner.Calcites; import org.apache.druid.testing.embedded.EmbeddedClusterApis; +import org.apache.druid.testing.embedded.EmbeddedDruidCluster; import org.apache.druid.testing.embedded.msq.EmbeddedMSQApis; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; @@ -63,6 +64,12 @@ public class ForcePushDownNestedQueryTest extends QueryTestBase private final String interval = "2015-09-12/2015-09-13"; private final Map<String, Object> forcePushDownNestedContext = Map.of("forcePushDownNestedQuery", "true"); + @Override + protected EmbeddedDruidCluster createCluster() + { + return super.createCluster().useDefaultTimeoutForLatchableEmitter(20); + } + @Override public void beforeAll() throws IOException { diff --git a/server/src/test/java/org/apache/druid/server/metrics/LatchableEmitter.java b/server/src/test/java/org/apache/druid/server/metrics/LatchableEmitter.java index 75949084db3..8f5ad497928 100644 --- a/server/src/test/java/org/apache/druid/server/metrics/LatchableEmitter.java +++ b/server/src/test/java/org/apache/druid/server/metrics/LatchableEmitter.java @@ -126,7 +126,7 @@ public class LatchableEmitter extends StubServiceEmitter try { final long awaitTime = timeoutMillis >= 0 ? timeoutMillis : Long.MAX_VALUE; if (!waitCondition.countDownLatch.await(awaitTime, TimeUnit.MILLISECONDS)) { - throw new ISE("Timed out waiting for event"); + throw new ISE("Timed out waiting for event after [%,d]ms", awaitTime); } } catch (InterruptedException e) { @@ -152,7 +152,7 @@ public class LatchableEmitter extends StubServiceEmitter try { final long awaitTime = timeoutMillis >= 0 ? timeoutMillis : Long.MAX_VALUE; if (!waitCondition.countDownLatch.await(awaitTime, TimeUnit.MILLISECONDS)) { - throw new ISE("Timed out waiting for next event"); + throw new ISE("Timed out waiting for next event after [%,d]ms", awaitTime); } } catch (InterruptedException e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
