This is an automated email from the ASF dual-hosted git repository.
NSAmelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 249f51fc IGNITE-29247 Fix tests joining foreign clusters via multicast
discovery (#368)
249f51fc is described below
commit 249f51fc89016fa3cb99aaab534310f8f12b8a64
Author: Nikita Amelchev <[email protected]>
AuthorDate: Fri Nov 6 13:35:32 2026 +0300
IGNITE-29247 Fix tests joining foreign clusters via multicast discovery
(#368)
---
.../performancestatistics/PerformanceStatisticsPrinterTest.java | 4 ++++
.../org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java | 3 +++
.../ignite/spark/JavaEmbeddedIgniteRDDWithLocalStoreSelfTest.java | 3 +++
.../boot/autoconfigure/IgniteRepositoriesAutoconfigureTest.java | 4 ++--
...efaultTestConfigutation.java => DefaultTestConfiguration.java} | 8 +++++---
.../boot/autoconfigure/IgniteClientAutoConfigureTest.java | 3 +++
.../autoconfigure/IgniteClientRepositoriesAutoconfigureTest.java | 3 +++
.../compoundkey/CompoundKeyApplicationConfiguration.java | 3 +++
.../java/org/apache/ignite/spring/sessions/IgniteTestUtils.java | 6 +++++-
9 files changed, 31 insertions(+), 6 deletions(-)
diff --git
a/modules/performance-statistics-ext/src/test/java/org/apache/ignite/internal/performancestatistics/PerformanceStatisticsPrinterTest.java
b/modules/performance-statistics-ext/src/test/java/org/apache/ignite/internal/performancestatistics/PerformanceStatisticsPrinterTest.java
index b4e320d9..a474feb7 100644
---
a/modules/performance-statistics-ext/src/test/java/org/apache/ignite/internal/performancestatistics/PerformanceStatisticsPrinterTest.java
+++
b/modules/performance-statistics-ext/src/test/java/org/apache/ignite/internal/performancestatistics/PerformanceStatisticsPrinterTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.logger.java.JavaLogger;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.ListeningTestLogger;
import org.apache.ignite.testframework.LogListener;
import org.apache.ignite.testframework.junits.GridTestKernalContext;
@@ -71,6 +72,7 @@ import static
org.apache.ignite.internal.processors.performancestatistics.Operat
import static
org.apache.ignite.internal.processors.performancestatistics.OperationType.TX_COMMIT;
import static
org.apache.ignite.internal.processors.performancestatistics.OperationType.TX_ROLLBACK;
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
+import static
org.apache.ignite.testframework.junits.GridAbstractTest.LOCAL_IP_FINDER;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -102,6 +104,7 @@ public class PerformanceStatisticsPrinterTest {
public void testSystemViewOperation() throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setNodeId(NODE_ID);
+ cfg.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(LOCAL_IP_FINDER));
ListeningTestLogger log = new ListeningTestLogger(new JavaLogger());
cfg.setGridLogger(log);
@@ -143,6 +146,7 @@ public class PerformanceStatisticsPrinterTest {
public void testSystemViewOperationFilter() throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setNodeId(NODE_ID);
+ cfg.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(LOCAL_IP_FINDER));
ListeningTestLogger log = new ListeningTestLogger(new JavaLogger());
cfg.setGridLogger(log);
diff --git
a/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
b/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
index fa3478f4..2d3031e4 100644
---
a/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
+++
b/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaRDD;
@@ -298,6 +299,8 @@ public class JavaEmbeddedIgniteRDDSelfTest extends
GridCommonAbstractTest {
cfg.setIgniteInstanceName(igniteInstanceName);
+ cfg.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(LOCAL_IP_FINDER));
+
return cfg;
}
diff --git
a/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDWithLocalStoreSelfTest.java
b/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDWithLocalStoreSelfTest.java
index d24acd64..4e59766e 100644
---
a/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDWithLocalStoreSelfTest.java
+++
b/modules/spark-ext/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDWithLocalStoreSelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.cache.store.CacheStoreAdapter;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaSparkContext;
@@ -165,6 +166,8 @@ public class JavaEmbeddedIgniteRDDWithLocalStoreSelfTest
extends GridCommonAbstr
cfg.setIgniteInstanceName(igniteInstanceName);
+ cfg.setDiscoverySpi(new
TcpDiscoverySpi().setIpFinder(LOCAL_IP_FINDER));
+
return cfg;
}
diff --git
a/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteRepositoriesAutoconfigureTest.java
b/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteRepositoriesAutoconfigureTest.java
index 66e71fb9..50055f7b 100644
---
a/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteRepositoriesAutoconfigureTest.java
+++
b/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteRepositoriesAutoconfigureTest.java
@@ -18,7 +18,7 @@
package org.apache.ignite.springframework.boot.autoconfigure;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
-import
org.apache.ignite.springframework.boot.autoconfigure.misc.DefaultTestConfigutation;
+import
org.apache.ignite.springframework.boot.autoconfigure.misc.DefaultTestConfiguration;
import
org.apache.ignite.springframework.boot.autoconfigure.misc.ObjectRepository;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class IgniteRepositoriesAutoconfigureTest {
/** Spring test application context. */
private final ApplicationContextRunner contextRunner = new
ApplicationContextRunner()
- .withUserConfiguration(DefaultTestConfigutation.class)
+ .withUserConfiguration(DefaultTestConfiguration.class)
.withConfiguration(AutoConfigurations.of(IgniteAutoConfiguration.class,
IgniteRepositoryAutoConfiguration.class));
/** Test default autoconfiguration */
diff --git
a/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/misc/DefaultTestConfigutation.java
b/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/misc/DefaultTestConfiguration.java
similarity index 82%
rename from
modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/misc/DefaultTestConfigutation.java
rename to
modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/misc/DefaultTestConfiguration.java
index 3d73da1f..79c9647f 100644
---
a/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/misc/DefaultTestConfigutation.java
+++
b/modules/spring-boot-autoconfigure-ext/spring-boot-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/misc/DefaultTestConfiguration.java
@@ -19,6 +19,8 @@ package
org.apache.ignite.springframework.boot.autoconfigure.misc;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -26,14 +28,14 @@ import org.springframework.context.annotation.Configuration;
* Default Ignite configuration for Ignite Spring Data autoconfigure test
*/
@Configuration
-public class DefaultTestConfigutation {
-
+public class DefaultTestConfiguration {
/** */
@Bean
public IgniteConfiguration igniteConfiguration() {
return new IgniteConfiguration()
.setCacheConfiguration(new CacheConfiguration<Long,
Object>().setName("objectCache"))
.setIgniteInstanceName("test-name")
- .setConsistentId("test-id");
+ .setConsistentId("test-id")
+ .setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(new
TcpDiscoveryVmIpFinder(true)));
}
}
diff --git
a/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
b/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
index 97d32112..c62a08a9 100644
---
a/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
+++
b/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
@@ -25,6 +25,8 @@ import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -58,6 +60,7 @@ public class IgniteClientAutoConfigureTest {
@BeforeAll
public static void beforeClass() {
node = Ignition.start(new IgniteConfiguration()
+ .setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(new
TcpDiscoveryVmIpFinder(true)))
.setClientConnectorConfiguration(
new ClientConnectorConfiguration().setPort(10801)));
diff --git
a/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientRepositoriesAutoconfigureTest.java
b/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientRepositoriesAutoconfigureTest.java
index 4fae8f2a..3ee87811 100644
---
a/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientRepositoriesAutoconfigureTest.java
+++
b/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientRepositoriesAutoconfigureTest.java
@@ -21,6 +21,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import
org.apache.ignite.springframework.boot.autoconfigure.misc.ObjectRepository;
import org.junit.jupiter.api.AfterAll;
@@ -52,6 +54,7 @@ public class IgniteClientRepositoriesAutoconfigureTest {
@BeforeAll
public static void beforeClass() {
node = Ignition.start(new IgniteConfiguration()
+ .setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(new
TcpDiscoveryVmIpFinder(true)))
.setClientConnectorConfiguration(
new ClientConnectorConfiguration().setPort(10801)));
node.createCache(CACHE_NAME);
diff --git
a/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/compoundkey/CompoundKeyApplicationConfiguration.java
b/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/compoundkey/CompoundKeyApplicationConfiguration.java
index 7701f3d6..ad164ef5 100644
---
a/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/compoundkey/CompoundKeyApplicationConfiguration.java
+++
b/modules/spring-data-ext/spring-data/src/test/java/org/apache/ignite/springdata/compoundkey/CompoundKeyApplicationConfiguration.java
@@ -21,6 +21,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -40,6 +42,7 @@ public class CompoundKeyApplicationConfiguration {
@Bean
public Ignite igniteInstance() {
return Ignition.start(new IgniteConfiguration()
+ .setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(new
TcpDiscoveryVmIpFinder(true)))
.setClientConnectorConfiguration(new
ClientConnectorConfiguration().setPort(CLI_CONN_PORT)));
}
}
diff --git
a/modules/spring-session-ext/src/test/java/org/apache/ignite/spring/sessions/IgniteTestUtils.java
b/modules/spring-session-ext/src/test/java/org/apache/ignite/spring/sessions/IgniteTestUtils.java
index a377e6cc..f19f0ff2 100644
---
a/modules/spring-session-ext/src/test/java/org/apache/ignite/spring/sessions/IgniteTestUtils.java
+++
b/modules/spring-session-ext/src/test/java/org/apache/ignite/spring/sessions/IgniteTestUtils.java
@@ -19,6 +19,9 @@ package org.apache.ignite.spring.sessions;
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
/**
* Utility class for Ignite integration tests.
@@ -33,6 +36,7 @@ final class IgniteTestUtils {
* @return the Ignite instance
*/
static Ignite embeddedIgniteServer() {
- return Ignition.start();
+ return Ignition.start(new IgniteConfiguration()
+ .setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(new
TcpDiscoveryVmIpFinder(true))));
}
}