From a853c5fbba67f7961f03a27f9e6471fe33752ce7 Mon Sep 17 00:00:00 2001
From: Anton Vinogradov <av@apache.org>
Date: Fri, 10 Jul 2026 21:02:23 +0300
Subject: [PATCH 1/2] IGNITE-28877 .NET tests: fail fast when embedded node
 cannot join topology instead of hanging the suite

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../Compute/ComputeTaskSessionTest.cs                    | 3 ++-
 .../dotnet/Apache.Ignite.Core.Tests/TestUtils.cs         | 9 ++++++++-
 .../platforms/dotnet/Apache.Ignite.Core.Tests/app.config | 6 +++---
 .../dotnet/Apache.Ignite.Core.Tests/custom_app.config    | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeTaskSessionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeTaskSessionTest.cs
index e336b52a6f1d8..6c4639dfa5d90 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeTaskSessionTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeTaskSessionTest.cs
@@ -75,7 +75,8 @@ private static IgniteConfiguration GetIgniteConfiguration(string igniteName, boo
                 ConsistentId = igniteName,
                 IgniteInstanceName = igniteName,
                 DiscoverySpi = GetStaticDiscovery(),
-                JvmOptions = TestJavaOptions()
+                JvmOptions = TestJavaOptions(),
+                Localhost = "127.0.0.1"
             };
 
         /// <summary>
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TestUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TestUtils.cs
index c9ef65f4ab4b9..6652a87440b5a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TestUtils.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TestUtils.cs
@@ -371,7 +371,14 @@ public static TcpDiscoverySpi GetStaticDiscovery(int? maxPort = null)
                 {
                     Endpoints = new[] { "127.0.0.1:47500" + (maxPort == null ? null : (".." + maxPort)) }
                 },
-                SocketTimeout = TimeSpan.FromSeconds(0.3)
+                SocketTimeout = TimeSpan.FromSeconds(0.3),
+                // If the finder port is squatted at bind time (e.g. lingering teardown of the previous
+                // fixture), the node binds the next port and the default infinite join retries the finder
+                // address forever, eating the whole suite execution timeout: fail the test fast instead.
+                // MaxAckTimeout caps the exponential handshake backoff, otherwise a single retry sweep
+                // takes up to 20 minutes and JoinTimeout, checked between sweeps, never gets a chance.
+                JoinTimeout = TimeSpan.FromMinutes(2),
+                MaxAckTimeout = TimeSpan.FromSeconds(10)
             };
         }
 
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config
index 845680633c3bd..b2bc4c8437858 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config
@@ -32,8 +32,8 @@
         <gcServer enabled="true"/>
     </runtime>
 
-    <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection" igniteInstanceName="myGrid1">
-        <discoverySpi type="TcpDiscoverySpi">
+    <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection" igniteInstanceName="myGrid1" localhost="127.0.0.1">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>
@@ -47,7 +47,7 @@
     </igniteConfiguration>
 
     <igniteConfiguration2 igniteInstanceName="myGrid2" localhost="127.0.0.1">
-        <discoverySpi type="TcpDiscoverySpi">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config
index 9fa96f5a4985a..68d31ef7273c7 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config
@@ -27,7 +27,7 @@
     </configSections>
 
     <igniteConfiguration3 igniteInstanceName="myGrid3" localhost="127.0.0.1">
-        <discoverySpi type="TcpDiscoverySpi">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>

From 6d708f6b20e994d8db66bd314093592fca2c72af Mon Sep 17 00:00:00 2001
From: Anton Vinogradov <av@apache.org>
Date: Fri, 10 Jul 2026 23:03:45 +0300
Subject: [PATCH 2/2] IGNITE-28877 Cover AspNet/EntityFramework test
 app.configs as well

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../dotnet/Apache.Ignite.AspNet.Tests/App.config          | 8 ++++----
 .../dotnet/Apache.Ignite.EntityFramework.Tests/App.config | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config
index 016078e069ac5..9dad03a80002b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config
@@ -29,8 +29,8 @@
         <gcServer enabled="true"/>
     </runtime>
 
-    <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection" igniteInstanceName="myGrid1">
-        <discoverySpi type="TcpDiscoverySpi">
+    <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection" igniteInstanceName="myGrid1" localhost="127.0.0.1">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>
@@ -44,7 +44,7 @@
     </igniteConfiguration>
 
     <igniteConfiguration2 igniteInstanceName="myGrid2" localhost="127.0.0.1">
-        <discoverySpi type="TcpDiscoverySpi">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>
@@ -58,7 +58,7 @@
     </igniteConfiguration2>
 
     <igniteConfiguration3 igniteInstanceName="myGrid3" localhost="127.0.0.1">
-        <discoverySpi type="TcpDiscoverySpi">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>
diff --git a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config
index 0e0da8d457653..7c1ce90ee4c4f 100644
--- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config
+++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config
@@ -25,8 +25,8 @@
         <gcServer enabled="true" />
     </runtime>
 
-    <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection" igniteInstanceName="myGrid1">
-        <discoverySpi type="TcpDiscoverySpi">
+    <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection" igniteInstanceName="myGrid1" localhost="127.0.0.1">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>
@@ -39,7 +39,7 @@
     </igniteConfiguration>
 
     <igniteConfiguration2 igniteInstanceName="myGrid2" localhost="127.0.0.1">
-        <discoverySpi type="TcpDiscoverySpi">
+        <discoverySpi type="TcpDiscoverySpi" joinTimeout="0:2:0">
             <ipFinder type="TcpDiscoveryStaticIpFinder">
                 <endpoints>
                     <string>127.0.0.1:47500</string>