IGNITE-24334 Fixed flaky ClientSessionOutboundQueueLimitTest

apache · Jan 29, 2025 · d1e8240 · d1e8240
1 parent 348e844
commit d1e8240
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java
@@ -351,7 +351,6 @@ private void unblock(Object waiter) {
     }
 
     /** {@inheritDoc} */
-    @Async.Schedule
     @Override public void listen(IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
         if (!registerWaiter(lsnr))
             notifyListener(lsnr);
@@ -466,7 +465,6 @@ private <T> void applyChainComposeCallback(
      *
      * @param lsnr Listener.
      */
-    @Async.Execute
     private void notifyListener(IgniteInClosure<? super IgniteInternalFuture<R>> lsnr) {
         assert lsnr != null;
 

diff --git a/.../java/org/apache/ignite/internal/processors/odbc/ClientSessionOutboundQueueLimitTest.java b/.../java/org/apache/ignite/internal/processors/odbc/ClientSessionOutboundQueueLimitTest.java
@@ -22,6 +22,8 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.client.ClientCache;
 import org.apache.ignite.client.IgniteClient;
@@ -35,14 +37,34 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import static org.apache.ignite.testframework.GridTestUtils.setFieldValue;
 
 /** */
+@RunWith(Parameterized.class)
 public class ClientSessionOutboundQueueLimitTest extends GridCommonAbstractTest {
     /** */
     public static final int MSG_QUEUE_LIMIT = 100;
 
+    /** Whether a client node is an initiator of the test operations. */
+    @Parameterized.Parameter()
+    public int idx;
+
+    /** */
+    @Parameterized.Parameters(name = "idx={0}")
+    public static Iterable<Object> data() {
+        return IntStream.range(0, 1000).boxed().collect(Collectors.toList());
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        super.afterTest();
+
+        stopAllGrids();
+    }
+
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         return super.getConfiguration(igniteInstanceName)
@@ -68,7 +90,8 @@ public void testClientSessionOutboundQueueLimit() throws Exception {
         try (
             IgniteClient cli = Ignition.startClient(new ClientConfiguration()
                 .setAddresses("127.0.0.1:10800")
-                .setReconnectThrottlingRetries(1)
+                .setTimeout(5000)
+                .setRetryLimit(1)
                 .setEventListeners(new ConnectionEventListener() {
                     @Override public void onConnectionClosed(ConnectionClosedEvent event) {
                         isCliDisconnected.set(true);
@@ -88,8 +111,11 @@ public void testClientSessionOutboundQueueLimit() throws Exception {
             Collection<IgniteClientFuture<byte[]>> futs = new ArrayList<>();
 
             try {
-                while (!isCliDisconnected.get())
+                while (!isCliDisconnected.get()) {
                     futs.add(cache.getAsync(0));
+
+                    U.sleep(10);
+                }
             }
             finally {
                 skipClientWrite(grid(0), false);
@@ -102,10 +128,6 @@ public void testClientSessionOutboundQueueLimit() throws Exception {
                     fut.get();
                 }
                 catch (Exception e) {
-                    assertTrue(
-                        e.getMessage().contains("Channel is closed") || e.getMessage().contains("Reconnect is not allowed")
-                    );
-
                     failedReqsCntr.incrementAndGet();
                 }
             });