JiayaoS commented on code in PR #22220: URL: https://github.com/apache/kafka/pull/22220#discussion_r3197629670
########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientTimeoutIntegrationTest.java: ########## @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.clients.admin; + +import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.api.Type; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ClusterTestDefaults(types = { Type.KRAFT }) +public class AdminClientTimeoutIntegrationTest { + + private final ClusterInstance clusterInstance; + + public AdminClientTimeoutIntegrationTest(ClusterInstance clusterInstance) { + this.clusterInstance = clusterInstance; + } + + /** + * Test injecting timeouts for calls that are in flight. + */ + @ClusterTest + public void testCallInFlightTimeouts() throws Exception { + Map<String, Object> config = new HashMap<>(); + config.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, clusterInstance.bootstrapServers()); + config.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, "20000"); + config.put(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG, "100000000"); + config.put(AdminClientConfig.RETRIES_CONFIG, "0"); + + FailureInjectingTimeoutProcessorFactory factory = new FailureInjectingTimeoutProcessorFactory(); + try (Admin client = KafkaAdminClient.createInternal(new AdminClientConfig(config), factory)) { + + var future = client.createTopics(Stream.of("mytopic1", "mytopic2") + .map(t -> new NewTopic(t, 1, (short) 1)).toList(), + new CreateTopicsOptions().validateOnly(true)).all(); + + var e = assertThrows(ExecutionException.class, future::get); + assertInstanceOf(TimeoutException.class, e.getCause()); + + var future2 = client.createTopics(Stream.of("mytopic3", "mytopic4") + .map(t -> new NewTopic(t, 1, (short) 1)).toList(), + new CreateTopicsOptions().validateOnly(true)).all(); + future2.get(); + assertEquals(1, factory.failuresInjected()); + } + } + + + static class FailureInjectingTimeoutProcessorFactory extends KafkaAdminClient.TimeoutProcessorFactory { + + private static final Logger log = LoggerFactory.getLogger(FailureInjectingTimeoutProcessorFactory.class); Review Comment: Done. ########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/AdminClientTimeoutIntegrationTest.java: ########## @@ -0,0 +1,119 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.kafka.clients.admin; + +import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.common.test.api.Type; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ClusterTestDefaults(types = { Type.KRAFT }) +public class AdminClientTimeoutIntegrationTest { + + private final ClusterInstance clusterInstance; + + public AdminClientTimeoutIntegrationTest(ClusterInstance clusterInstance) { + this.clusterInstance = clusterInstance; + } + + /** + * Test injecting timeouts for calls that are in flight. + */ + @ClusterTest + public void testCallInFlightTimeouts() throws Exception { + Map<String, Object> config = new HashMap<>(); Review Comment: Thanks, I fixed this -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
