From bde8f40dec29578e87f72e60f7ed6e51164964ad Mon Sep 17 00:00:00 2001 From: James Hughes Date: Sat, 9 Jul 2022 01:42:52 -0400 Subject: [PATCH] =?UTF-8?q?fix:=20Removing=20reverted=20configuration=20or?= =?UTF-8?q?g.apache.kafka.streams.Streams=E2=80=A6=20(#9248)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Removing reverted configuration org.apache.kafka.streams.StreamsConfig.STATESTORE_CACHE_MAX_BYTES_CONFIG The configuration org.apache.kafka.streams.StreamsConfig.STATESTORE_CACHE_MAX_BYTES_CONFIG was reverted in Apache Kafka. --- .../api/auth/DefaultApiSecurityContext.java | 1 - .../integration/HighAvailabilityTestUtil.java | 4 ++- .../PullQueryRoutingFunctionalTest.java | 32 ------------------- .../integration/RestIntegrationTestUtil.java | 1 + .../ksql/rest/entity/PropertiesList.java | 2 -- 5 files changed, 4 insertions(+), 36 deletions(-) diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/api/auth/DefaultApiSecurityContext.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/api/auth/DefaultApiSecurityContext.java index 125c83dfce4d..29063a07eb7b 100644 --- a/ksqldb-rest-app/src/main/java/io/confluent/ksql/api/auth/DefaultApiSecurityContext.java +++ b/ksqldb-rest-app/src/main/java/io/confluent/ksql/api/auth/DefaultApiSecurityContext.java @@ -15,7 +15,6 @@ package io.confluent.ksql.api.auth; -import io.confluent.ksql.api.server.Server; import com.google.common.collect.ImmutableList; import io.confluent.ksql.api.server.Server; import io.confluent.ksql.security.KsqlPrincipal; diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/HighAvailabilityTestUtil.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/HighAvailabilityTestUtil.java index 6e5c33b4cdba..951e233fe29b 100644 --- a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/HighAvailabilityTestUtil.java +++ b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/HighAvailabilityTestUtil.java @@ -467,7 +467,9 @@ public static List makePullQueryWsRequest( sql, Optional.of(mediaType), Optional.of(contentType), - Optional.of(credentials) + Optional.of(credentials), + Optional.empty(), + Optional.empty() ); } } diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/PullQueryRoutingFunctionalTest.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/PullQueryRoutingFunctionalTest.java index fe711c58d242..c38b22f2a829 100644 --- a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/PullQueryRoutingFunctionalTest.java +++ b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/PullQueryRoutingFunctionalTest.java @@ -375,38 +375,6 @@ public void shouldQueryWS() throws Exception { assertThat(rows_0, hasSize(HEADER + 2)); } - @Test - public void shouldQueryWS() throws Exception { - // Given: - ClusterFormation clusterFormation = findClusterFormation(TEST_APP_0, TEST_APP_1, TEST_APP_2); - waitForClusterToBeDiscovered(clusterFormation.standBy.getApp(), 3, USER_CREDS); - waitForRemoteServerToChangeStatus(clusterFormation.router.getApp(), - clusterFormation.router.getHost(), HighAvailabilityTestUtil.lagsReported(3), USER_CREDS); - - waitForRemoteServerToChangeStatus( - clusterFormation.standBy.getApp(), - clusterFormation.active.getHost(), - HighAvailabilityTestUtil::remoteServerIsUp, - USER_CREDS); - - waitForRemoteServerToChangeStatus( - clusterFormation.router.getApp(), - clusterFormation.standBy.getHost(), - HighAvailabilityTestUtil::remoteServerIsUp, - USER_CREDS); - - - final Credentials credentials = new Credentials(USER_WITH_ACCESS, USER_WITH_ACCESS_PWD); - // When: - List rows_0 = - makePullQueryWsRequest(clusterFormation.router.getApp().getWsListener(), sql, "", "", credentials, Optional.empty(), Optional.empty()); - - // Then: - // websocket pull query returns a header, the value row, and an error row indicating that it is done - assertThat(rows_0, hasSize(HEADER + 2)); - } - - public void shouldQueryActiveWhenActiveAliveStandbyDeadQueryIssuedToRouter() { // Given: ClusterFormation clusterFormation = findClusterFormation(TEST_APP_0, TEST_APP_1, TEST_APP_2); diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java index e5b641fb16ef..2dcc42e407a4 100644 --- a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java +++ b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/RestIntegrationTestUtil.java @@ -17,6 +17,7 @@ import static io.netty.handler.codec.http.HttpHeaderNames.ACCEPT; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE; +import static io.vertx.core.http.HttpHeaders.AUTHORIZATION; import static io.vertx.core.http.HttpMethod.POST; import static io.vertx.core.http.HttpVersion.HTTP_1_1; diff --git a/ksqldb-rest-model/src/main/java/io/confluent/ksql/rest/entity/PropertiesList.java b/ksqldb-rest-model/src/main/java/io/confluent/ksql/rest/entity/PropertiesList.java index ef2e0fb8c833..b049f570b00d 100644 --- a/ksqldb-rest-model/src/main/java/io/confluent/ksql/rest/entity/PropertiesList.java +++ b/ksqldb-rest-model/src/main/java/io/confluent/ksql/rest/entity/PropertiesList.java @@ -49,7 +49,6 @@ import static org.apache.kafka.streams.StreamsConfig.POLL_MS_CONFIG; import static org.apache.kafka.streams.StreamsConfig.PROBING_REBALANCE_INTERVAL_MS_CONFIG; import static org.apache.kafka.streams.StreamsConfig.PROCESSING_GUARANTEE_CONFIG; -import static org.apache.kafka.streams.StreamsConfig.STATESTORE_CACHE_MAX_BYTES_CONFIG; import static org.apache.kafka.streams.StreamsConfig.TASK_TIMEOUT_MS_CONFIG; import static org.apache.kafka.streams.StreamsConfig.WINDOW_SIZE_MS_CONFIG; @@ -87,7 +86,6 @@ public class PropertiesList extends KsqlEntity { KSQL_QUERY_PULL_TABLE_SCAN_ENABLED, KSQL_TIMESTAMP_THROW_ON_INVALID, MAX_TASK_IDLE_MS_CONFIG, - STATESTORE_CACHE_MAX_BYTES_CONFIG, TASK_TIMEOUT_MS_CONFIG );