You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ce...@apache.org on 2024/07/04 19:11:13 UTC

(kafka) 01/01: MINOR: Fix retry logic in DedicatedMirrorIntegrationTest::awaitTaskConfigurations

This is an automated email from the ASF dual-hosted git repository.

cegerton pushed a commit to branch fix-dedicated-mirror-integration-test-multi-node-cluster
in repository https://gitbox.apache.org/repos/asf/kafka.git

commit a87223e0e5bf7289093de0c0bbec476e91c8dae2
Author: Chris Egerton <ch...@aiven.io>
AuthorDate: Thu Jul 4 15:11:06 2024 -0400

    MINOR: Fix retry logic in DedicatedMirrorIntegrationTest::awaitTaskConfigurations
    
    This test is failing very frequently because our retry logic doesn't handle `RebalanceNeededException` instances that are wrapped in an `ExecutionException`; see [Gradle Enterprise](https://ge.apache.org/scans/tests?search.rootProjectNames=kafka&search.startTimeMax=1720120130872&search.startTimeMin=1719460800000&search.timeZoneId=America%2FNew_York&tests.container=org.apache.kafka.connect.mirror.integration.DedicatedMirrorIntegrationTest&tests.test=testMultiNodeCluster()).
---
 .../connect/mirror/integration/DedicatedMirrorIntegrationTest.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java
index 6e35e962ed9..df830027702 100644
--- a/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java
+++ b/connect/mirror/src/test/java/org/apache/kafka/connect/mirror/integration/DedicatedMirrorIntegrationTest.java
@@ -354,8 +354,10 @@ public class DedicatedMirrorIntegrationTest {
                         .map(TaskInfo::config)
                         .allMatch(predicate);
             } catch (Exception ex) {
-                if (ex instanceof RebalanceNeededException) {
-                    // RebalanceNeededException should be retry-able.
+                boolean retriable = (ex instanceof RebalanceNeededException)
+                        || ((ex instanceof ExecutionException) && (ex.getCause() instanceof RebalanceNeededException));
+                if (retriable) {
+                    // RebalanceNeededException should be retriable
                     // This happens when a worker has read a new config from the config topic, but hasn't completed the
                     // subsequent rebalance yet
                     throw ex;