fix: Makes tests wait only 500ms for consumer group cleanup (#8367)

* fix: Makes tests wait only 500ms for consumer group cleanup
confluentinc · Nov 17, 2021 · 1a2f7b2 · 1a2f7b2
1 parent 13382e7
commit 1a2f7b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java b/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
@@ -536,6 +536,12 @@ public class KsqlConfig extends AbstractConfig {
   public static final String KSQL_VARIABLE_SUBSTITUTION_ENABLE_DOC
       = "Enable variable substitution on SQL statements.";
 
+  public static final String KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS
+      = "ksql.query.cleanup.shutdown.timeout.ms";
+  public static final long KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS_DEFAULT = 30000;
+  public static final String KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS_DOC
+      = "The total time that the query cleanup spends trying to clean things up on shutdown.";
+
   private enum ConfigGeneration {
     LEGACY,
     CURRENT
@@ -1179,6 +1185,13 @@ private static ConfigDef buildConfigDef(final ConfigGeneration generation) {
             Importance.LOW,
             KSQL_SOURCE_TABLE_MATERIALIZATION_ENABLED_DOC
         )
+        .define(
+            KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS,
+            Type.LONG,
+            KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS_DEFAULT,
+            Importance.LOW,
+            KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS_DOC
+        )
         .withClientSslSupport();
 
     for (final CompatibilityBreakingConfigDef compatibilityBreakingConfigDef

diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/engine/KsqlEngine.java b/ksqldb-engine/src/main/java/io/confluent/ksql/engine/KsqlEngine.java
@@ -510,7 +510,9 @@ public void close(final boolean closeQueries) {
     primaryContext.getQueryRegistry().close(closeQueries);
 
     try {
-      cleanupService.stopAsync().awaitTerminated(30, TimeUnit.SECONDS);
+      cleanupService.stopAsync().awaitTerminated(
+          ksqlConfig.getLong(KsqlConfig.KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS),
+          TimeUnit.MILLISECONDS);
     } catch (final TimeoutException e) {
       log.warn("Timed out while closing cleanup service. "
               + "External resources for the following applications may be orphaned: {}",

diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/server/TestKsqlRestApp.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/server/TestKsqlRestApp.java
@@ -567,6 +567,7 @@ private static KsqlRestConfig buildConfig(
     configMap.put(KsqlConfig.KSQL_STREAMS_PREFIX + "auto.offset.reset", "earliest");
     configMap.put(KsqlConfig.KSQL_ENABLE_UDFS, false);
     configMap.put(KsqlRestConfig.KSQL_HEARTBEAT_ENABLE_CONFIG, false);
+    configMap.put(KsqlConfig.KSQL_QUERY_CLEANUP_SHUTDOWN_TIMEOUT_MS, 500L);
     configMap.putAll(additionalProps);
     return configMap;
   }