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

petrov-mg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 27542ccb2ce IGNITE-29168 Added support for starting node with actual 
master version in rolling upgrade tests (#13707)
27542ccb2ce is described below

commit 27542ccb2ceb34661ec0e9078ea43bd74a5d7204
Author: Vladimir Steshin <[email protected]>
AuthorDate: Tue Oct 20 11:33:53 2026 +0300

    IGNITE-29168 Added support for starting node with actual master version in 
rolling upgrade tests (#13707)
---
 .../rollingupgrade/AbstractRollingUpgradeTest.java | 33 +++++++++++++++-------
 .../CoreVersionRollingUpgradeTest.java             | 18 ++++++++++++
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/AbstractRollingUpgradeTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/AbstractRollingUpgradeTest.java
index 3d7f76477c2..446b9b9aa7a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/AbstractRollingUpgradeTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/AbstractRollingUpgradeTest.java
@@ -40,11 +40,13 @@ import org.apache.ignite.events.Event;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteVersionUtils;
 import org.apache.ignite.internal.IgnitionEx;
 import org.apache.ignite.internal.TestRecordingCommunicationSpi;
 import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
 import org.apache.ignite.internal.managers.eventstorage.HighPriorityListener;
 import 
org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor;
+import 
org.apache.ignite.internal.processors.rollingupgrade.feature.CoreFeatureRegistry;
 import 
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteComponentFeatureSet;
 import 
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteComponentFeatureSetProvider;
 import 
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteCoreFeature;
@@ -109,6 +111,12 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
     /** */
     protected static final String TEST_DEFAULT_VER = "2.19.0";
 
+    /** Reference to the current master version. Corresponds to {@link 
#IGNITE_VERSION}. */
+    protected static final String MASTER_VER_REF = "master";
+
+    /** Current resovled Ignite version. Corresponds to {@link 
#MASTER_VER_REF} and {@link CoreFeatureRegistry}. */
+    protected static final IgniteProductVersion IGNITE_VERSION = 
IgniteVersionUtils.VER;
+
     /** */
     protected static final String COMPONENT_VERSIONS_ATTRIBUTE = 
"test.component.versions";
 
@@ -186,10 +194,7 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
 
         boolean pluginDeclaresFeatures = testVersions.containsPlugin() && 
pluginDeclaresFeatures(testVersions.pluginVersion());
 
-        IgniteCoreFeatureSet testCoreFeatures = new IgniteCoreFeatureSet(
-            IgniteProductVersion.fromString(testVersions.coreVersion()),
-            
IgniteFeatureSet.buildFrom(readDeclaredCoreFeatures(testVersions.coreVersion()))
-        );
+        IgniteCoreFeatureSet testCoreFeatures = 
createCoreFeatureSet(testVersions.coreVersion());
 
         cfg.setPluginProviders(new AbstractTestPluginProvider() {
             @Override public String name() {
@@ -216,7 +221,7 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
 
         TcpDiscoverySpi discoSpi = new TestBlockingTcpDiscoverySpi(cfg) {
             @Override public void setNodeAttributes(Map<String, Object> attrs, 
IgniteProductVersion ignored) {
-                super.setNodeAttributes(attrs, 
IgniteProductVersion.fromString(testVersions.coreVersion()));
+                super.setNodeAttributes(attrs, testCoreFeatures.version());
             }
         };
 
@@ -242,6 +247,9 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
 
     /** */
     public static Collection<IgniteFeature> readDeclaredCoreFeatures(String 
ver) throws Exception {
+        if (MASTER_VER_REF.equals(ver))
+            return 
IgniteFeatureSet.readDeclaredFeatures(CoreFeatureRegistry.class);
+
         Class<?> cls = Class.forName(
             TestIgniteReleaseFeatures_2_18_0.class.getPackageName() + 
".TestIgniteReleaseFeatures_" + ver.replace(".", "_"));
 
@@ -411,7 +419,7 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
     /** */
     public static IgniteCoreFeatureSet createCoreFeatureSet(String ver) throws 
Exception {
         return new IgniteCoreFeatureSet(
-            IgniteProductVersion.fromString(ver),
+            MASTER_VER_REF.equals(ver) ? IGNITE_VERSION : 
IgniteProductVersion.fromString(ver),
             IgniteFeatureSet.buildFrom(readDeclaredCoreFeatures(ver)));
     }
 
@@ -575,7 +583,7 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
     protected String resolveCompoundVersion(IgniteNodeFeatureSet features) {
         return Arrays.stream(features.values())
             
.sorted(Comparator.comparing(IgniteComponentFeatureSet::componentName))
-            .map(f -> semanticVersion(f.version()))
+            .map(f -> IGNITE_VERSION.equals(f.version()) ? MASTER_VER_REF : 
semanticVersion(f.version()))
             .collect(Collectors.joining(" | "));
     }
 
@@ -591,13 +599,13 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
             expLogicalVersions.cmpVersions.forEach((cmp, ver) -> {
                 IgniteComponentFeatureSet cmpFeatures = 
ru(ignite).features().activeComponentFeatures(cmp);
 
-                assertEquals(ver, cmpFeatures == null ? null : 
semanticVersion(cmpFeatures.version()));
+                assertEquals(toSemanticVersion(ver), cmpFeatures == null ? 
null : semanticVersion(cmpFeatures.version()));
             });
 
             expSrcVersions.cmpVersions.forEach((cmp, ver) -> {
                 IgniteComponentUpgradeState state = ru(ignite).state(cmp);
 
-                assertEquals(ver, state.srcVer == null ? null : 
semanticVersion(state.srcVer));
+                assertEquals(toSemanticVersion(ver), state.srcVer == null ? 
null : semanticVersion(state.srcVer));
             });
 
             expTargetVersions.cmpVersions.forEach((cmp, ver) -> {
@@ -605,11 +613,16 @@ public abstract class AbstractRollingUpgradeTest extends 
GridCommonAbstractTest
 
                 String expVer = 
Objects.equals(expSrcVersions.cmpVersions.get(cmp), ver) ? null : ver;
 
-                assertEquals(expVer, state.targetVer == null ? null : 
semanticVersion(state.targetVer));
+                assertEquals(toSemanticVersion(expVer), state.targetVer == 
null ? null : semanticVersion(state.targetVer));
             });
         }
     }
 
+    /** */
+    private static @Nullable String toSemanticVersion(@Nullable String ver) {
+        return MASTER_VER_REF.equals(ver) ? semanticVersion(IGNITE_VERSION) : 
ver;
+    }
+
     /** */
     protected int coordinatorIndex() {
         for (Ignite grid : IgnitionEx.allGridsx()) {
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/CoreVersionRollingUpgradeTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/CoreVersionRollingUpgradeTest.java
index 92d60c49df8..0f8a8b113fb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/CoreVersionRollingUpgradeTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/CoreVersionRollingUpgradeTest.java
@@ -180,6 +180,24 @@ public class CoreVersionRollingUpgradeTest extends 
AbstractRollingUpgradeTest {
         finalizeClusterVersion(1, "2.19.2");
     }
 
+    /** Tests usage of {@link #MASTER_VER_REF}. */
+    @Test
+    public void testUpgradeWithTheMasterVersionReference() throws Exception {
+        startCluster("2.18.0");
+
+        checkVersionUpgradeInactive("2.18.0");
+
+        ru(0).enableVersionUpgrade();
+
+        forAllNodes(nodeIdx -> upgradeNodeVersion(nodeIdx, "2.18.0", 
MASTER_VER_REF));
+
+        checkFeaturesActive("2.18.0");
+
+        checkVersionUpgradeInProgress("2.18.0", MASTER_VER_REF);
+
+        finalizeClusterVersion(0, MASTER_VER_REF);
+    }
+
     /** */
     @Test
     public void testJoinAfterClusterVersionFinalization() throws Exception {

Reply via email to