From 750e96f677a3f3e07754b710dc397fadbed2dd79 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Mon, 29 Dec 2025 15:38:19 +0300 Subject: [PATCH 01/10] walmode consistency check and tests --- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../discovery/GridDiscoveryManager.java | 25 ++++ ...iscoveryManagerWalModeConsistencyTest.java | 123 ++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java index a5fc9270d40b7..7ca3c8b030fac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java @@ -202,6 +202,9 @@ public final class IgniteNodeAttributes { /** Data center ID. */ public static final String ATTR_DATA_CENTER_ID = ATTR_PREFIX + ".datacenter.id"; + /** WAL mode configuration. */ + public static final String ATTR_WAL_MODE = ATTR_PREFIX + ".wal.mode"; + /** * Enforces singleton. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 7334cfc16c9a9..3dc156368fbef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -58,6 +58,7 @@ import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.DefaultCommunicationFailureResolver; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.WALMode; import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; @@ -176,6 +177,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SECURITY_COMPATIBILITY_MODE; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SHUTDOWN_POLICY; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE; import static org.apache.ignite.internal.IgniteVersionUtils.VER; import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT; import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metricName; @@ -484,6 +486,12 @@ private void updateClientNodes(UUID leftNodeId) { ctx.addNodeAttribute(ATTR_OFFHEAP_SIZE, requiredOffheap()); ctx.addNodeAttribute(ATTR_DATA_REGIONS_OFFHEAP_SIZE, configuredOffheap()); + DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration(); + + if (dsCfg != null) { + ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode()); + } + DiscoverySpi spi = getSpi(); discoOrdered = discoOrdered(); @@ -1279,6 +1287,8 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx Boolean locSecurityCompatibilityEnabled = locNode.attribute(ATTR_SECURITY_COMPATIBILITY_MODE); + WALMode locWalMode = locNode.attribute(ATTR_WAL_MODE); + for (ClusterNode n : nodes) { int rmtJvmMajVer = nodeJavaMajorVersion(n); @@ -1383,6 +1393,21 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx ", locNodeId=" + locNode.id() + ", rmtNode=" + U.toShortString(n) + "]"); } } + + WALMode rmtWalMode = n.attribute(ATTR_WAL_MODE); + + if (locWalMode != rmtWalMode) { + throw new IgniteCheckedException("WAL mode validation failed. " + + " Local node(locNodeAddrs=" + U.addressesAsString(locNode) + + ", id=" + locNode.id() + + ", consistentId=" + locNode.consistentId() + + ", WALMode=" + locWalMode + + "), Remote node(rmtNodeAddrs=" + U.addressesAsString(n) + + ", id=" + n.id() + + ", consistentId=" + n.consistentId() + + ", WALMode=" + rmtWalMode + + "). All nodes in the cluster must have the same WALMode configuration."); + } } if (log.isDebugEnabled()) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java new file mode 100644 index 0000000000000..a11b036a8f328 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -0,0 +1,123 @@ +/* + * 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.ignite.internal.managers.discovery; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.WALMode; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.ListeningTestLogger; +import org.apache.ignite.testframework.LogListener; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; + +/** + * Tests for WAL mode consistency validation when nodes join cluster. + */ +public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstractTest { + /** */ + private final ListeningTestLogger testLog = new ListeningTestLogger(log); + + /** */ + private WALMode walMode; + + /** */ + private boolean persistenceEnabled; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName) + .setGridLogger(testLog); + + DataStorageConfiguration dsCfg = new DataStorageConfiguration(); + dsCfg.setWalMode(walMode); + + if (persistenceEnabled) { + dsCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(true); + } + + cfg.setDataStorageConfiguration(dsCfg); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + walMode = null; + persistenceEnabled = false; + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + + super.afterTest(); + } + + /** + * Tests that nodes with same WAL mode can join cluster successfully. + * + * @throws Exception If failed. + */ + @Test + public void testSameWalModeJoinsSuccessfully() throws Exception { + walMode = WALMode.LOG_ONLY; + persistenceEnabled = true; + + IgniteEx ignite0 = startGrid(0); + + IgniteEx ignite1 = startGrid(1); + + assertEquals(2, ignite0.cluster().nodes().size()); + assertEquals(2, ignite1.cluster().nodes().size()); + } + + /** + * Tests that nodes with different WAL modes cannot join cluster. + * + * @throws Exception If failed. + */ + @Test + public void testDifferentWalModesCannotJoin() throws Exception { + walMode = WALMode.LOG_ONLY; + persistenceEnabled = true; + + IgniteEx ignite0 = startGrid(0); + + walMode = WALMode.FSYNC; + + LogListener walModeErrorLsnr = LogListener.matches("WAL mode validation failed") + .andMatches("LOG_ONLY") + .andMatches("FSYNC") + .andMatches("All nodes in the cluster must have the same WALMode configuration") + .build(); + testLog.registerListener(walModeErrorLsnr); + + GridTestUtils.assertThrowsWithCause(() -> startGrid(1), IgniteCheckedException.class); + + assertTrue(walModeErrorLsnr.check()); + assertEquals(1, ignite0.cluster().nodes().size()); + } + + +} From 7b75067316f2b3f99d017d86e6d5168658e49b93 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Mon, 29 Dec 2025 15:51:28 +0300 Subject: [PATCH 02/10] remove persistence --- .../GridDiscoveryManagerWalModeConsistencyTest.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index a11b036a8f328..c44d272d22571 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -39,20 +39,13 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra /** */ private WALMode walMode; - /** */ - private boolean persistenceEnabled; - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName) .setGridLogger(testLog); DataStorageConfiguration dsCfg = new DataStorageConfiguration(); - dsCfg.setWalMode(walMode); - - if (persistenceEnabled) { - dsCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(true); - } + dsCfg.setWalMode(walMode).getDefaultDataRegionConfiguration().setPersistenceEnabled(true); cfg.setDataStorageConfiguration(dsCfg); @@ -64,7 +57,6 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra super.beforeTest(); walMode = null; - persistenceEnabled = false; } /** {@inheritDoc} */ @@ -82,7 +74,6 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra @Test public void testSameWalModeJoinsSuccessfully() throws Exception { walMode = WALMode.LOG_ONLY; - persistenceEnabled = true; IgniteEx ignite0 = startGrid(0); @@ -100,7 +91,6 @@ public void testSameWalModeJoinsSuccessfully() throws Exception { @Test public void testDifferentWalModesCannotJoin() throws Exception { walMode = WALMode.LOG_ONLY; - persistenceEnabled = true; IgniteEx ignite0 = startGrid(0); From c6b8d0cbbb0a77a0f2231141f68b4d930b771291 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Mon, 19 Jan 2026 13:24:37 +0300 Subject: [PATCH 03/10] review fixes 1 --- .../discovery/GridDiscoveryManager.java | 17 +++++------------ ...DiscoveryManagerWalModeConsistencyTest.java | 18 ++++++------------ .../testsuites/IgniteKernalSelfTestSuite.java | 2 ++ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 3dc156368fbef..c5d3c43b9a7b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -488,9 +488,8 @@ private void updateClientNodes(UUID leftNodeId) { DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration(); - if (dsCfg != null) { + if (dsCfg != null) ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode()); - } DiscoverySpi spi = getSpi(); @@ -1397,16 +1396,10 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx WALMode rmtWalMode = n.attribute(ATTR_WAL_MODE); if (locWalMode != rmtWalMode) { - throw new IgniteCheckedException("WAL mode validation failed. " + - " Local node(locNodeAddrs=" + U.addressesAsString(locNode) + - ", id=" + locNode.id() + - ", consistentId=" + locNode.consistentId() + - ", WALMode=" + locWalMode + - "), Remote node(rmtNodeAddrs=" + U.addressesAsString(n) + - ", id=" + n.id() + - ", consistentId=" + n.consistentId() + - ", WALMode=" + rmtWalMode + - "). All nodes in the cluster must have the same WALMode configuration."); + throw new IgniteCheckedException("Remote node has WAL mode different from local " + + "[locId8=" + U.id8(locNode.id()) + ", locWalMode=" + locWalMode + + ", rmtId8=" + U.id8(n.id()) + ", rmtWalMode=" + rmtWalMode + + ", rmtAddrs=" + U.addressesAsString(n) + ", rmtNode=" + U.toShortString(n) + "]"); } } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index c44d272d22571..4d2210d6d2066 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -29,9 +29,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; -/** - * Tests for WAL mode consistency validation when nodes join cluster. - */ +/** Tests for WAL mode consistency validation when nodes join cluster. */ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstractTest { /** */ private final ListeningTestLogger testLog = new ListeningTestLogger(log); @@ -41,8 +39,7 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName) - .setGridLogger(testLog); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName).setGridLogger(testLog); DataStorageConfiguration dsCfg = new DataStorageConfiguration(); dsCfg.setWalMode(walMode).getDefaultDataRegionConfiguration().setPersistenceEnabled(true); @@ -96,11 +93,10 @@ public void testDifferentWalModesCannotJoin() throws Exception { walMode = WALMode.FSYNC; - LogListener walModeErrorLsnr = LogListener.matches("WAL mode validation failed") - .andMatches("LOG_ONLY") - .andMatches("FSYNC") - .andMatches("All nodes in the cluster must have the same WALMode configuration") - .build(); + LogListener walModeErrorLsnr = LogListener.matches("Remote node has WAL mode different from local") + .andMatches("LOG_ONLY") + .andMatches("FSYNC") + .build(); testLog.registerListener(walModeErrorLsnr); GridTestUtils.assertThrowsWithCause(() -> startGrid(1), IgniteCheckedException.class); @@ -108,6 +104,4 @@ public void testDifferentWalModesCannotJoin() throws Exception { assertTrue(walModeErrorLsnr.check()); assertEquals(1, ignite0.cluster().nodes().size()); } - - } diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index 90675f4aa0a02..dd6dd06042cb6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -47,6 +47,7 @@ import org.apache.ignite.internal.managers.deployment.GridDeploymentManagerStopSelfTest; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerAliveCacheSelfTest; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerAttributesSelfTest; +import org.apache.ignite.internal.managers.discovery.GridDiscoveryManagerWalModeConsistencyTest; import org.apache.ignite.internal.managers.discovery.IgniteTopologyPrintFormatSelfTest; import org.apache.ignite.internal.managers.events.GridEventStorageManagerInternalEventsSelfTest; import org.apache.ignite.internal.managers.events.GridEventStorageManagerSelfTest; @@ -91,6 +92,7 @@ GridManagerStopSelfTest.class, GridDiscoveryManagerAttributesSelfTest.class, GridDiscoveryManagerAliveCacheSelfTest.class, + GridDiscoveryManagerWalModeConsistencyTest.class, GridDiscoveryEventSelfTest.class, GridPortProcessorSelfTest.class, GridHomePathSelfTest.class, From 420c6db7bff90c28f81fff3cf47167e7540cbaa4 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Tue, 20 Jan 2026 10:51:26 +0300 Subject: [PATCH 04/10] review 2 fixes --- .../discovery/GridDiscoveryManager.java | 12 +++++++----- ...DiscoveryManagerWalModeConsistencyTest.java | 18 +++++------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index c5d3c43b9a7b0..91855c22bb1ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -488,8 +488,8 @@ private void updateClientNodes(UUID leftNodeId) { DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration(); - if (dsCfg != null) - ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode()); + if (CU.isPersistenceEnabled(dsCfg)) + ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal()); DiscoverySpi spi = getSpi(); @@ -1286,7 +1286,8 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx Boolean locSecurityCompatibilityEnabled = locNode.attribute(ATTR_SECURITY_COMPATIBILITY_MODE); - WALMode locWalMode = locNode.attribute(ATTR_WAL_MODE); + WALMode locWalMode = locNode.attribute(ATTR_WAL_MODE) == null ? null : + WALMode.fromOrdinal(locNode.attribute(ATTR_WAL_MODE)); for (ClusterNode n : nodes) { int rmtJvmMajVer = nodeJavaMajorVersion(n); @@ -1393,9 +1394,10 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx } } - WALMode rmtWalMode = n.attribute(ATTR_WAL_MODE); + WALMode rmtWalMode = locNode.attribute(ATTR_WAL_MODE) == null ? null : + WALMode.fromOrdinal(locNode.attribute(ATTR_WAL_MODE)); - if (locWalMode != rmtWalMode) { + if (!Objects.equals(locWalMode, rmtWalMode)) { throw new IgniteCheckedException("Remote node has WAL mode different from local " + "[locId8=" + U.id8(locNode.id()) + ", locWalMode=" + locWalMode + ", rmtId8=" + U.id8(n.id()) + ", rmtWalMode=" + rmtWalMode + diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index 4d2210d6d2066..81da56fd3afba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -24,22 +24,17 @@ import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.testframework.GridTestUtils; -import org.apache.ignite.testframework.ListeningTestLogger; -import org.apache.ignite.testframework.LogListener; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; /** Tests for WAL mode consistency validation when nodes join cluster. */ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstractTest { - /** */ - private final ListeningTestLogger testLog = new ListeningTestLogger(log); - /** */ private WALMode walMode; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName).setGridLogger(testLog); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); DataStorageConfiguration dsCfg = new DataStorageConfiguration(); dsCfg.setWalMode(walMode).getDefaultDataRegionConfiguration().setPersistenceEnabled(true); @@ -93,15 +88,12 @@ public void testDifferentWalModesCannotJoin() throws Exception { walMode = WALMode.FSYNC; - LogListener walModeErrorLsnr = LogListener.matches("Remote node has WAL mode different from local") - .andMatches("LOG_ONLY") - .andMatches("FSYNC") - .build(); - testLog.registerListener(walModeErrorLsnr); + String errMsg = GridTestUtils.assertThrowsWithCause(() -> startGrid(1), IgniteCheckedException.class) + .getCause().getMessage(); - GridTestUtils.assertThrowsWithCause(() -> startGrid(1), IgniteCheckedException.class); + assertTrue(errMsg.startsWith("Remote node has WAL mode different from local") && + errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=LOG_ONLY")); - assertTrue(walModeErrorLsnr.check()); assertEquals(1, ignite0.cluster().nodes().size()); } } From 434e1ed6936351a854205831fe43ae72c5e6d1e7 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Tue, 20 Jan 2026 11:15:51 +0300 Subject: [PATCH 05/10] review 3 fixes --- .../internal/managers/discovery/GridDiscoveryManager.java | 4 ++-- .../discovery/GridDiscoveryManagerWalModeConsistencyTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 91855c22bb1ea..bc7a1d3318c6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -1394,8 +1394,8 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx } } - WALMode rmtWalMode = locNode.attribute(ATTR_WAL_MODE) == null ? null : - WALMode.fromOrdinal(locNode.attribute(ATTR_WAL_MODE)); + WALMode rmtWalMode = n.attribute(ATTR_WAL_MODE) == null ? null : + WALMode.fromOrdinal(n.attribute(ATTR_WAL_MODE)); if (!Objects.equals(locWalMode, rmtWalMode)) { throw new IgniteCheckedException("Remote node has WAL mode different from local " + diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index 81da56fd3afba..63c43599dcbd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -89,10 +89,10 @@ public void testDifferentWalModesCannotJoin() throws Exception { walMode = WALMode.FSYNC; String errMsg = GridTestUtils.assertThrowsWithCause(() -> startGrid(1), IgniteCheckedException.class) - .getCause().getMessage(); + .getCause().getMessage(); assertTrue(errMsg.startsWith("Remote node has WAL mode different from local") && - errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=LOG_ONLY")); + errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=LOG_ONLY")); assertEquals(1, ignite0.cluster().nodes().size()); } From c3c0c4a0997202e5ee03b6acfdfd1fb024d7880c Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Wed, 21 Jan 2026 12:37:00 +0300 Subject: [PATCH 06/10] review 4 fixes --- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 7 +++++++ .../internal/managers/discovery/GridDiscoveryManager.java | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 56191e68d9ebd..76d5abf7b7c11 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -83,6 +83,7 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.CollectionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -266,6 +267,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_AWARE_QUERIES_ENABLED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_SERIALIZABLE_ENABLED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE; import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR; import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; import static org.apache.ignite.internal.IgniteVersionUtils.VER; @@ -1653,6 +1655,11 @@ private void addDataStorageConfigurationAttributes() throws IgniteCheckedExcepti // Save data storage configuration. add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(cfg.getDataStorageConfiguration())); + + DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration(); + + ctx.addNodeAttribute(ATTR_WAL_MODE, + dsCfg != null ? dsCfg.getWalMode().ordinal() : DataStorageConfiguration.DFLT_WAL_MODE.ordinal()); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index bc7a1d3318c6a..61bc5a88a31ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -486,11 +486,6 @@ private void updateClientNodes(UUID leftNodeId) { ctx.addNodeAttribute(ATTR_OFFHEAP_SIZE, requiredOffheap()); ctx.addNodeAttribute(ATTR_DATA_REGIONS_OFFHEAP_SIZE, configuredOffheap()); - DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration(); - - if (CU.isPersistenceEnabled(dsCfg)) - ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal()); - DiscoverySpi spi = getSpi(); discoOrdered = discoOrdered(); From b1af003515e3e8370c8a6980909336c31e837194 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Fri, 23 Jan 2026 15:45:16 +0300 Subject: [PATCH 07/10] Revert "review 4 fixes" This reverts commit c3c0c4a0997202e5ee03b6acfdfd1fb024d7880c. --- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 7 ------- .../internal/managers/discovery/GridDiscoveryManager.java | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 76d5abf7b7c11..56191e68d9ebd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -83,7 +83,6 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.CollectionConfiguration; -import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -267,7 +266,6 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_AWARE_QUERIES_ENABLED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_SERIALIZABLE_ENABLED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME; -import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE; import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR; import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; import static org.apache.ignite.internal.IgniteVersionUtils.VER; @@ -1655,11 +1653,6 @@ private void addDataStorageConfigurationAttributes() throws IgniteCheckedExcepti // Save data storage configuration. add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(cfg.getDataStorageConfiguration())); - - DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration(); - - ctx.addNodeAttribute(ATTR_WAL_MODE, - dsCfg != null ? dsCfg.getWalMode().ordinal() : DataStorageConfiguration.DFLT_WAL_MODE.ordinal()); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 61bc5a88a31ee..bc7a1d3318c6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -486,6 +486,11 @@ private void updateClientNodes(UUID leftNodeId) { ctx.addNodeAttribute(ATTR_OFFHEAP_SIZE, requiredOffheap()); ctx.addNodeAttribute(ATTR_DATA_REGIONS_OFFHEAP_SIZE, configuredOffheap()); + DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration(); + + if (CU.isPersistenceEnabled(dsCfg)) + ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal()); + DiscoverySpi spi = getSpi(); discoOrdered = discoOrdered(); From 63b4497683453c604fadc210595c0f9423adcc73 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Tue, 27 Jan 2026 12:56:01 +0300 Subject: [PATCH 08/10] new tests --- .../apache/ignite/internal/IgniteKernal.java | 8 + .../discovery/GridDiscoveryManager.java | 5 - ...iscoveryManagerWalModeConsistencyTest.java | 295 +++++++++++++++++- 3 files changed, 295 insertions(+), 13 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 56191e68d9ebd..2fc59143bada7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -83,6 +83,7 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.CollectionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; @@ -266,6 +267,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_AWARE_QUERIES_ENABLED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_SERIALIZABLE_ENABLED; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_WAL_MODE; import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR; import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; import static org.apache.ignite.internal.IgniteVersionUtils.VER; @@ -1653,6 +1655,12 @@ private void addDataStorageConfigurationAttributes() throws IgniteCheckedExcepti // Save data storage configuration. add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(cfg.getDataStorageConfiguration())); + + DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration(); + + if (dsCfg != null) { + ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal()); + } } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index bc7a1d3318c6a..61bc5a88a31ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -486,11 +486,6 @@ private void updateClientNodes(UUID leftNodeId) { ctx.addNodeAttribute(ATTR_OFFHEAP_SIZE, requiredOffheap()); ctx.addNodeAttribute(ATTR_DATA_REGIONS_OFFHEAP_SIZE, configuredOffheap()); - DataStorageConfiguration dsCfg = ctx.config().getDataStorageConfiguration(); - - if (CU.isPersistenceEnabled(dsCfg)) - ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal()); - DiscoverySpi spi = getSpi(); discoOrdered = discoOrdered(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index 63c43599dcbd6..f08c028b448ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -18,7 +18,10 @@ package org.apache.ignite.internal.managers.discovery; +import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.WALMode; @@ -29,17 +32,46 @@ /** Tests for WAL mode consistency validation when nodes join cluster. */ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstractTest { + /** */ + private static final String PERSISTENT_REGION_NAME = "pds-reg"; + /** */ private WALMode walMode; + /** */ + private boolean mixedConfig; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - DataStorageConfiguration dsCfg = new DataStorageConfiguration(); - dsCfg.setWalMode(walMode).getDefaultDataRegionConfiguration().setPersistenceEnabled(true); + DataStorageConfiguration storageCfg = new DataStorageConfiguration(); + + if (mixedConfig) { + storageCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setName("default_in_memory_region") + .setPersistenceEnabled(false)); - cfg.setDataStorageConfiguration(dsCfg); + if (igniteInstanceName.contains("persistent_instance")) { + DataRegionConfiguration persistentRegionCfg = new DataRegionConfiguration().setName(PERSISTENT_REGION_NAME) + .setPersistenceEnabled(true); + + if (walMode != null) + storageCfg.setWalMode(walMode); + + storageCfg.setDataRegionConfigurations(persistentRegionCfg); + } + } + else { + if (walMode != null) { + storageCfg.setWalMode(walMode); + storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(true); + } + else { + storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(false); + } + } + + cfg.setDataStorageConfiguration(storageCfg); return cfg; } @@ -49,12 +81,17 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra super.beforeTest(); walMode = null; + mixedConfig = false; + + cleanPersistenceDir(); } /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { stopAllGrids(); + cleanPersistenceDir(); + super.afterTest(); } @@ -71,8 +108,16 @@ public void testSameWalModeJoinsSuccessfully() throws Exception { IgniteEx ignite1 = startGrid(1); - assertEquals(2, ignite0.cluster().nodes().size()); - assertEquals(2, ignite1.cluster().nodes().size()); + IgniteEx cli = startClientGrid(2); + + ignite0.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + assertEquals(3, ignite0.cluster().nodes().size()); + assertEquals(3, ignite1.cluster().nodes().size()); } /** @@ -86,14 +131,248 @@ public void testDifferentWalModesCannotJoin() throws Exception { IgniteEx ignite0 = startGrid(0); + IgniteEx cli = startClientGrid(2); + + ignite0.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + walMode = WALMode.FSYNC; String errMsg = GridTestUtils.assertThrowsWithCause(() -> startGrid(1), IgniteCheckedException.class) .getCause().getMessage(); assertTrue(errMsg.startsWith("Remote node has WAL mode different from local") && - errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=LOG_ONLY")); + (errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=LOG_ONLY")) || + (errMsg.contains("locWalMode=LOG_ONLY") && errMsg.contains("rmtWalMode=FSYNC"))); + + assertEquals(2, ignite0.cluster().nodes().size()); + } + + /** + * Tests that in-memory node can join cluster with persistence node with default WAL mode. + * + * @throws Exception If failed. + */ + @Test + public void testInMemoryNodeJoinsPersistenceNodeWithDefaultWalMode() throws Exception { + walMode = DataStorageConfiguration.DFLT_WAL_MODE; + + IgniteEx ignite0 = startGrid(0); + + IgniteEx cli = startClientGrid(1); + + ignite0.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = null; + GridTestUtils.assertThrowsWithCause(() -> startGrid(2), IgniteCheckedException.class); + + assertEquals(2, ignite0.cluster().nodes().size()); + } + + /** + * Tests that in-memory node can join cluster with persistence node with FSYNC WAL mode. + * + * @throws Exception If failed. + */ + @Test + public void testInMemoryNodeJoinsPersistenceNodeWithFsyncWalMode() throws Exception { + walMode = WALMode.FSYNC; + + IgniteEx ignite0 = startGrid(0); + + IgniteEx cli = startClientGrid(1); + + ignite0.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = null; + GridTestUtils.assertThrowsWithCause(() -> startGrid(2), IgniteCheckedException.class); + + assertEquals(2, ignite0.cluster().nodes().size()); + } + + /** + * Tests that persistence node with default WAL mode can join cluster. + * + * @throws Exception If failed. + */ + @Test + public void testPersistenceNodeWithDefaultWalModeJoinsSuccessfully() throws Exception { + walMode = DataStorageConfiguration.DFLT_WAL_MODE; + + IgniteEx ignite0 = startGrid(0); + + IgniteEx cli = startClientGrid(2); + + ignite0.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = DataStorageConfiguration.DFLT_WAL_MODE; + IgniteEx ignite1 = startGrid(1); + + assertEquals(3, ignite0.cluster().nodes().size()); + assertEquals(3, ignite1.cluster().nodes().size()); + } + + /** + * Tests that two in-memory nodes can join cluster successfully. + * + * @throws Exception If failed. + */ + @Test + public void testInMemoryNodesJoinSuccessfully() throws Exception { + walMode = null; + + IgniteEx ignite0 = startGrid(0); + + IgniteEx cli = startClientGrid(2); + + ignite0.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = null; + IgniteEx ignite1 = startGrid(1); + + assertEquals(3, ignite0.cluster().nodes().size()); + assertEquals(3, ignite1.cluster().nodes().size()); + } + + /** + * Tests mixed cluster: cluster is in-memory with null walMode, node with + * in-memory + persistent regions joins succesfully, walModes are the same + * + * @throws Exception If failed. + */ + @Test + public void testMixedClusterInMemoryJoinsPersistentWithDefaultWalMode() throws Exception { + mixedConfig = true; + walMode = null; + + IgniteEx inMemoryNode = startGrid("in-memory_instance"); + + IgniteEx cli = startClientGrid("client"); + + inMemoryNode.cluster().baselineAutoAdjustEnabled(false); + + inMemoryNode.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + startGrid("persistent_instance"); + + assertEquals(3, inMemoryNode.cluster().nodes().size()); + } + + /** + * Tests mixed cluster: in-memory node cluster, persistent node joins + * (has default in-memory region + persistent region with FSYNC WAL mode). + * + * @throws Exception If failed. + */ + @Test + public void testMixedClusterInMemoryJoinsPersistentWithFsyncWalMode() throws Exception { + mixedConfig = true; + walMode = null; + + IgniteEx inMemoryNode = startGrid("in-memory_instance"); + + IgniteEx cli = startClientGrid("client"); + + inMemoryNode.cluster().baselineAutoAdjustEnabled(false); + + inMemoryNode.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = WALMode.FSYNC; + String errMsg = GridTestUtils.assertThrowsWithCause(() -> startGrid("persistent_instance"), IgniteCheckedException.class) + .getCause().getMessage(); + + assertTrue(errMsg.startsWith("Remote node has WAL mode different from local") && + (errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=LOG_ONLY")) || + (errMsg.contains("locWalMode=LOG_ONLY") && errMsg.contains("rmtWalMode=FSYNC"))); + + assertEquals(2, inMemoryNode.cluster().nodes().size()); + } + + /** + * Tests mixed cluster: in-memory node cluster, persistent node joins + * (has default in-memory region + persistent region with Default WAL mode). + * + * @throws Exception If failed. + */ + @Test + public void testMixedClusterInMemoryJoinsPersistentWithDfltWalMode() throws Exception { + mixedConfig = true; + walMode = null; + + IgniteEx inMemoryNode = startGrid("in-memory_instance"); + + IgniteEx cli = startClientGrid("client"); + + inMemoryNode.cluster().baselineAutoAdjustEnabled(false); + + inMemoryNode.cluster().state(ClusterState.ACTIVE); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = DataStorageConfiguration.DFLT_WAL_MODE; + startGrid("persistent_instance"); + + assertEquals(3, inMemoryNode.cluster().nodes().size()); + } + + /** + * Tests mixed cluster: persistent node with default WAL mode cannot join + * cluster with persistent node with FSYNC WAL mode. + * + * @throws Exception If failed. + */ + @Test + public void testMixedClusterDifferentWalModesCannotJoin() throws Exception { + walMode = WALMode.FSYNC; + + IgniteEx persistentNode0 = startGrid("persistent_instance0"); + + persistentNode0.cluster().state(ClusterState.ACTIVE); + + IgniteEx cli = startClientGrid("client"); + + IgniteCache cacheCli = cli.getOrCreateCache(DEFAULT_CACHE_NAME); + + cacheCli.put(1, 1); + + walMode = DataStorageConfiguration.DFLT_WAL_MODE; + + String errMsg = GridTestUtils.assertThrowsWithCause(() -> startGrid("persistent_instance1"), IgniteCheckedException.class) + .getCause().getMessage(); + + assertTrue(errMsg.startsWith("Remote node has WAL mode different from local") && + (errMsg.contains("locWalMode=FSYNC") && errMsg.contains("rmtWalMode=" + DataStorageConfiguration.DFLT_WAL_MODE.name())) || + (errMsg.contains("locWalMode=" + DataStorageConfiguration.DFLT_WAL_MODE.name()) && errMsg.contains("rmtWalMode=FSYNC"))); - assertEquals(1, ignite0.cluster().nodes().size()); + assertEquals(2, persistentNode0.cluster().nodes().size()); } -} +} \ No newline at end of file From 5341ece0491736ba7dce7ce25571e68fe4515326 Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Tue, 27 Jan 2026 13:04:03 +0300 Subject: [PATCH 09/10] checkstyle --- .../discovery/GridDiscoveryManagerWalModeConsistencyTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index f08c028b448ef..8f64a22242613 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -375,4 +375,4 @@ public void testMixedClusterDifferentWalModesCannotJoin() throws Exception { assertEquals(2, persistentNode0.cluster().nodes().size()); } -} \ No newline at end of file +} From e1af9740be4b2fe87a36aeed86c17158ef68fcde Mon Sep 17 00:00:00 2001 From: Maxim Pankovich Date: Fri, 30 Jan 2026 12:37:10 +0300 Subject: [PATCH 10/10] null checks and some fixes --- .../org/apache/ignite/internal/IgniteKernal.java | 10 ++++------ .../managers/discovery/GridDiscoveryManager.java | 2 +- .../GridDiscoveryManagerWalModeConsistencyTest.java | 13 +++---------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 2fc59143bada7..17d5bac31c914 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1653,14 +1653,12 @@ private void addDataStorageConfigurationAttributes() throws IgniteCheckedExcepti add(ATTR_MEMORY_CONFIG, memCfg); } - // Save data storage configuration. - add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(cfg.getDataStorageConfiguration())); - DataStorageConfiguration dsCfg = cfg.getDataStorageConfiguration(); - if (dsCfg != null) { - ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg.getWalMode().ordinal()); - } + // Save data storage configuration. + add(ATTR_DATA_STORAGE_CONFIG, ctx.marshallerContext().jdkMarshaller().marshal(dsCfg)); + + ctx.addNodeAttribute(ATTR_WAL_MODE, dsCfg == null ? null : dsCfg.getWalMode().ordinal()); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 61bc5a88a31ee..df3e6639efc03 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -1392,7 +1392,7 @@ private void checkAttributes(Iterable nodes) throws IgniteCheckedEx WALMode rmtWalMode = n.attribute(ATTR_WAL_MODE) == null ? null : WALMode.fromOrdinal(n.attribute(ATTR_WAL_MODE)); - if (!Objects.equals(locWalMode, rmtWalMode)) { + if (locWalMode != null && rmtWalMode != null && locWalMode != rmtWalMode) { throw new IgniteCheckedException("Remote node has WAL mode different from local " + "[locId8=" + U.id8(locNode.id()) + ", locWalMode=" + locWalMode + ", rmtId8=" + U.id8(n.id()) + ", rmtWalMode=" + rmtWalMode + diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java index 8f64a22242613..f31763d65c5a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerWalModeConsistencyTest.java @@ -47,6 +47,8 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra DataStorageConfiguration storageCfg = new DataStorageConfiguration(); + storageCfg.setWalMode(walMode); + if (mixedConfig) { storageCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setName("default_in_memory_region") .setPersistenceEnabled(false)); @@ -55,20 +57,11 @@ public class GridDiscoveryManagerWalModeConsistencyTest extends GridCommonAbstra DataRegionConfiguration persistentRegionCfg = new DataRegionConfiguration().setName(PERSISTENT_REGION_NAME) .setPersistenceEnabled(true); - if (walMode != null) - storageCfg.setWalMode(walMode); - storageCfg.setDataRegionConfigurations(persistentRegionCfg); } } else { - if (walMode != null) { - storageCfg.setWalMode(walMode); - storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(true); - } - else { - storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(false); - } + storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(walMode != null); } cfg.setDataStorageConfiguration(storageCfg);