From 67bda0435cd5268658e1ab2180351564f90774f3 Mon Sep 17 00:00:00 2001 From: Bill Bejeck Date: Thu, 25 Oct 2018 09:46:33 -0400 Subject: [PATCH 1/3] MINOR: Bump timeouts to be consistent with change to 2.0 --- .../streams/integration/GlobalThreadShutDownOrderTest.java | 2 +- .../streams/integration/InternalTopicIntegrationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java index a0ada62e03f9c..65dbf289f4f8b 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java @@ -146,7 +146,7 @@ public void shouldFinishGlobalStoreOperationOnShutDown() throws Exception { public boolean conditionMet() { return firstRecordProcessed; } - }, 10000L, "Has not processed record within 10 seconds"); + }, "Has not processed record within 5 seconds"); kafkaStreams.close(Duration.ofSeconds(30)); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java index 9bd8c65c2dbc1..05028819c5522 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java @@ -163,7 +163,7 @@ public void shouldCompactTopicsForKeyValueStoreChangelogs() throws Exception { // // Step 3: Verify the state changelog topics are compact // - waitForCompletion(streams, 2, 10000); + waitForCompletion(streams, 2, 15000); streams.close(); final Properties changelogProps = getTopicProperties(ProcessorStateManager.storeChangelogTopic(appID, "Counts")); @@ -203,7 +203,7 @@ public void shouldCompactAndDeleteTopicsForWindowStoreChangelogs() throws Except // // Step 3: Verify the state changelog topics are compact // - waitForCompletion(streams, 2, 5000); + waitForCompletion(streams, 2, 15000); streams.close(); final Properties properties = getTopicProperties(ProcessorStateManager.storeChangelogTopic(appID, "CountWindows")); final List policies = Arrays.asList(properties.getProperty(LogConfig.CleanupPolicyProp()).split(",")); From 618675b6b5c5f81674a53b421198fcadf2ddf246 Mon Sep 17 00:00:00 2001 From: Bill Bejeck Date: Thu, 25 Oct 2018 13:29:34 -0400 Subject: [PATCH 2/3] MINOR: Increase low timeouts to help with test flakiness, update error message --- .../streams/integration/GlobalThreadShutDownOrderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java index 65dbf289f4f8b..28f7bffbce634 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java @@ -146,7 +146,7 @@ public void shouldFinishGlobalStoreOperationOnShutDown() throws Exception { public boolean conditionMet() { return firstRecordProcessed; } - }, "Has not processed record within 5 seconds"); + }, "Has not processed record within 15 seconds"); kafkaStreams.close(Duration.ofSeconds(30)); From e2cea79e9ac54932a6833228df6a90166ee214a2 Mon Sep 17 00:00:00 2001 From: Bill Bejeck Date: Fri, 26 Oct 2018 13:03:25 -0400 Subject: [PATCH 3/3] MINOR: Increase timeout to 30 seconds --- .../streams/integration/GlobalThreadShutDownOrderTest.java | 2 +- .../streams/integration/InternalTopicIntegrationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java index 28f7bffbce634..e0bec90f3ce24 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/GlobalThreadShutDownOrderTest.java @@ -146,7 +146,7 @@ public void shouldFinishGlobalStoreOperationOnShutDown() throws Exception { public boolean conditionMet() { return firstRecordProcessed; } - }, "Has not processed record within 15 seconds"); + }, 30000, "Has not processed record within 30 seconds"); kafkaStreams.close(Duration.ofSeconds(30)); diff --git a/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java b/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java index 05028819c5522..8bcaf5d97ec6c 100644 --- a/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java +++ b/streams/src/test/java/org/apache/kafka/streams/integration/InternalTopicIntegrationTest.java @@ -163,7 +163,7 @@ public void shouldCompactTopicsForKeyValueStoreChangelogs() throws Exception { // // Step 3: Verify the state changelog topics are compact // - waitForCompletion(streams, 2, 15000); + waitForCompletion(streams, 2, 30000); streams.close(); final Properties changelogProps = getTopicProperties(ProcessorStateManager.storeChangelogTopic(appID, "Counts")); @@ -203,7 +203,7 @@ public void shouldCompactAndDeleteTopicsForWindowStoreChangelogs() throws Except // // Step 3: Verify the state changelog topics are compact // - waitForCompletion(streams, 2, 15000); + waitForCompletion(streams, 2, 30000); streams.close(); final Properties properties = getTopicProperties(ProcessorStateManager.storeChangelogTopic(appID, "CountWindows")); final List policies = Arrays.asList(properties.getProperty(LogConfig.CleanupPolicyProp()).split(","));