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 08b8e3ed7b3 IGNITE-29120 Exclude deprecated fields from node-to-node
transmission after RU is completed (#13687)
08b8e3ed7b3 is described below
commit 08b8e3ed7b375df9e47dcd59e632f3f5c14cc552
Author: Mikhail Petrov <[email protected]>
AuthorDate: Wed Oct 21 23:02:11 2026 +0300
IGNITE-29120 Exclude deprecated fields from node-to-node transmission after
RU is completed (#13687)
---
.../internal/MessageSerializerGenerator.java | 19 ++++---
.../direct/IgniteMessageSerializationContext.java | 8 ++-
.../rollingupgrade/RollingUpgradeClusterData.java | 15 +-----
.../rollingupgrade/RollingUpgradeProcessor.java | 7 +--
.../feature/CoreFeatureRegistry.java | 6 +++
.../feature/IgniteFeatureManager.java | 27 +---------
.../rollingupgrade/AbstractRollingUpgradeTest.java | 50 -----------------
.../CoreVersionRollingUpgradeTest.java | 7 ---
.../PluginVersionRollingUpgradeTest.java | 2 -
.../RollingUpgradeMessageSerializationTest.java | 63 +++++++++++++++++++++-
.../message/TestContainerMessage_2_20_0.java | 21 ++++++++
.../resources/codegen/TestFeatureRegistry.java | 3 ++
.../codegen/TestMixedRegistryMessage.java | 2 +-
.../codegen/TestRollingUpgradeAwareMessage.java | 4 ++
.../codegen/TestRollingUpgradeAwareMessage.json | 3 +-
.../TestRollingUpgradeAwareMessageSerializer.java | 35 ++++++++++++
...s.rollingupgrade.RollingUpgradeClusterData.json | 2 +-
17 files changed, 152 insertions(+), 122 deletions(-)
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
index ff683bee5c3..3c9120bf00e 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
@@ -154,7 +154,7 @@ public class MessageSerializerGenerator extends
MessageCompanionGenerator {
@Override protected void generateBody(List<VariableElement> fields) throws
Exception {
generateMethods(fields);
- if (!isSchemaImmutable(env, type) && hasIntroducedFields(fields))
+ if (!isSchemaImmutable(env, type) && hasGatedFields(fields))
generateRawFieldsConsumer(fields);
// Include superclass types in imports so generated code can cast to
them for inherited fields.
@@ -386,7 +386,7 @@ public class MessageSerializerGenerator extends
MessageCompanionGenerator {
code.add(EMPTY);
- if (hasIntroducedFields(fields)) {
+ if (hasGatedFields(fields)) {
code.add(indentedLine("rawFields.removeIf(f ->
consumeKnownField(msg, f, reader, ctx));"));
code.add(EMPTY);
}
@@ -418,7 +418,7 @@ public class MessageSerializerGenerator extends
MessageCompanionGenerator {
indent++;
for (VariableElement field : fields) {
- if (!introducedByFeature(field))
+ if (!gatedByFeature(field))
continue;
rawFieldsConsumerCode.add(indentedLine("if (f.tag() == %s) {",
tagExpression(field)));
@@ -445,13 +445,15 @@ public class MessageSerializerGenerator extends
MessageCompanionGenerator {
}
/** */
- private static boolean hasIntroducedFields(List<VariableElement> fields) {
- return
fields.stream().anyMatch(MessageSerializerGenerator::introducedByFeature);
+ private static boolean hasGatedFields(List<VariableElement> fields) {
+ return
fields.stream().anyMatch(MessageSerializerGenerator::gatedByFeature);
}
/** */
- private static boolean introducedByFeature(VariableElement field) {
- return !field.getAnnotation(Order.class).introducedBy().isEmpty();
+ private static boolean gatedByFeature(VariableElement field) {
+ Order order = field.getAnnotation(Order.class);
+
+ return !order.introducedBy().isEmpty() ||
!order.deprecatedBy().isEmpty();
}
/** */
@@ -527,9 +529,6 @@ public class MessageSerializerGenerator extends
MessageCompanionGenerator {
indent--;
write.add(indentedLine("}"));
- }
-
- if (introducedByFeature(field)) {
write.add(indentedLine("else if (ctx.includeRawFields() && %s)",
defaultValueCondition(field)));
indent++;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
index 1e2824fa886..dabd257a6fd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/direct/IgniteMessageSerializationContext.java
@@ -139,11 +139,9 @@ public class IgniteMessageSerializationContext implements
MessageSerializationCo
if (c == 0) {
assert locCmpFeatures.features().equals(rmtCmpFeatures.features());
- // Both newly introduced and deprecated fields are included.
During an RU, a node builds messages according
- // to both the old logical version (while RU is in progress,
deprecated fields are used and newly introduced
- // fields are not) and the new logical version (after RU is
finished, newly introduced fields are used and
- // deprecated fields are not).
- return new ComponentMessageSerializationContext(null,
rmtCmpFeatures.features());
+ // Newly introduced fields are included. Deprecated fields are
excluded. A deprecated field holding a
+ // non-default value is written to the raw-field suffix instead.
+ return new
ComponentMessageSerializationContext(rmtCmpFeatures.features(),
rmtCmpFeatures.features());
}
else {
IgniteComponentFeatureSet src = c < 0 ? locCmpFeatures :
rmtCmpFeatures;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeClusterData.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeClusterData.java
index ee6369b16ce..fe915cfed21 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeClusterData.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeClusterData.java
@@ -38,7 +38,7 @@ public class RollingUpgradeClusterData extends
AbstractMessage {
IgniteNodeFeatureSet activeFeatures;
/** */
- @Order(3)
+ @Order(value = 3, deprecatedBy = "PREV_CLUSTER_VER_DEPRECATED_FEATURE")
@Nullable IgniteNodeFeatureSet prevActiveFeatures;
/** */
@@ -47,25 +47,14 @@ public class RollingUpgradeClusterData extends
AbstractMessage {
}
/** */
- public RollingUpgradeClusterData(
- boolean isVersionUpgradeEnabled,
- UUID curFinalizeProcId,
- IgniteNodeFeatureSet activeFeatures,
- @Nullable IgniteNodeFeatureSet prevActiveFeatures
- ) {
+ public RollingUpgradeClusterData(boolean isVersionUpgradeEnabled, UUID
curFinalizeProcId, IgniteNodeFeatureSet activeFeatures) {
this.isVersionUpgradeEnabled = isVersionUpgradeEnabled;
this.curFinalizeProcId = curFinalizeProcId;
this.activeFeatures = activeFeatures;
- this.prevActiveFeatures = prevActiveFeatures;
}
/** */
public IgniteNodeFeatureSet activeFeatures() {
return activeFeatures;
}
-
- /** */
- @Nullable public IgniteNodeFeatureSet previousActiveFeatures() {
- return prevActiveFeatures;
- }
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java
index f8538bcbfbe..09453d68aff 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java
@@ -371,12 +371,7 @@ public class RollingUpgradeProcessor extends
GridProcessorAdapter implements Dis
/** */
private RollingUpgradeClusterData collectRollingUpgradeClusterData() {
- return new RollingUpgradeClusterData(
- isVerUpgradeEnabled,
- curFinalizeProcId,
- featureMgr.activeFeatures(),
- featureMgr.previousActiveFeatures()
- );
+ return new RollingUpgradeClusterData(isVerUpgradeEnabled,
curFinalizeProcId, featureMgr.activeFeatures());
}
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/CoreFeatureRegistry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/CoreFeatureRegistry.java
index 664226a4b3f..4e67d42d174 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/CoreFeatureRegistry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/CoreFeatureRegistry.java
@@ -99,4 +99,10 @@ public class CoreFeatureRegistry {
* positional fields of every message.
*/
public static final IgniteFeature RAW_FIELDS_FEATURE = new
IgniteCoreFeature(1);
+
+ /**
+ * Feature that deprecates the mechanism for tracking the features of the
previous version under which the node operated.
+ * This mechanism was replaced by the raw-field suffix.
+ */
+ public static final IgniteFeature PREV_CLUSTER_VER_DEPRECATED_FEATURE =
new IgniteCoreFeature(2);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/IgniteFeatureManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/IgniteFeatureManager.java
index af63c1be2ed..61f6f29781b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/IgniteFeatureManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/feature/IgniteFeatureManager.java
@@ -36,19 +36,6 @@ public class IgniteFeatureManager {
/** */
private final IgniteNodeFeatureSet locVerFeatures;
- /**
- * During the RU process, updated nodes operate in accordance with both
the old logical version (prior to RU completion)
- * and the new one (after RU completion). This variable stores the
features of the previous version under which this
- * node operated.
- *
- * <p>
- * If a node joins the cluster after the Rolling Upgrade has been
finalized, this value is inherited from the
- * existing cluster nodes (after Rolling Upgrade finalization, all
cluster nodes are guaranteed to hold the same
- * value for this field).
- *</p>
- */
- @Nullable private volatile IgniteNodeFeatureSet prevActiveFeatures;
-
/** */
private volatile IgniteNodeFeatureSet activeFeatures;
@@ -81,11 +68,6 @@ public class IgniteFeatureManager {
return finalActiveFeatures;
}
- /** @return The feature set corresponding to the previous version under
which this node operated. */
- @Nullable public IgniteNodeFeatureSet previousActiveFeatures() {
- return prevActiveFeatures;
- }
-
/** @return {@code true} if the specified {@link IgniteFeature} is active
in the cluster; {@code false} otherwise. */
public boolean isActive(IgniteFeature feature) {
final IgniteNodeFeatureSet finalActiveFeatures = activeFeatures;
@@ -117,15 +99,10 @@ public class IgniteFeatureManager {
? activeClusterFeatures.containsAll(locVerFeatures)
: locVerFeatures.equals(activeClusterFeatures);
- if (hasSameFeaturesAsCluster) {
- prevActiveFeatures = clusterData.previousActiveFeatures();
-
+ if (hasSameFeaturesAsCluster)
activateLocalVersionFeatures();
- }
- else {
+ else
activeFeatures = activeClusterFeatures;
- prevActiveFeatures = activeClusterFeatures;
- }
}
/** */
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 446b9b9aa7a..ab612e766c5 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
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -52,10 +51,7 @@ import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteCompon
import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteCoreFeature;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteCoreFeatureSet;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteFeature;
-import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteFeatureManager;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteFeatureSet;
-import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteNodeFeatureSet;
-import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgnitePluginFeatureSet;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.TestIgniteReleaseFeatures_2_18_0;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.TestPluginComponentFeatureSetProvider;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.TestPluginFeature;
@@ -298,7 +294,6 @@ public abstract class AbstractRollingUpgradeTest extends
GridCommonAbstractTest
startClientGrid(2, ver);
checkVersionUpgradeInactive(ver);
- checkPreviousClusterFeatures(null);
}
/** */
@@ -388,34 +383,6 @@ public abstract class AbstractRollingUpgradeTest extends
GridCommonAbstractTest
);
}
- /** */
- protected void checkPreviousClusterFeatures(@Nullable String expVer)
throws Exception {
- TestVersions expVersions = expVer == null ? null :
TestVersions.parse(expVer);
-
- IgniteCoreFeatureSet expPrevCoreFeatures = expVersions != null ?
createCoreFeatureSet(expVersions.coreVersion()) : null;
-
- IgnitePluginFeatureSet expPrevPluginFeatures = expVersions != null &&
expVersions.containsPlugin()
- ? new IgnitePluginFeatureSet(
- TestPluginFeature.COMPONENT_NAME,
- IgniteProductVersion.fromString(expVersions.pluginVersion()),
-
IgniteFeatureSet.buildFrom(readDeclaredPluginFeatures(expVersions.pluginVersion())))
- : null;
-
- for (Ignite ignite : Ignition.allGrids()) {
- IgniteNodeFeatureSet prevFeatures =
ru(ignite).features().previousActiveFeatures();
-
- if (expVersions == null)
- assertNull(prevFeatures);
- else {
- assertNotNull(prevFeatures);
- assertEquals(expPrevCoreFeatures,
prevFeatures.componentFeatures(IgniteCoreFeature.COMPONENT_NAME));
-
- if (expVersions.containsPlugin())
- assertEquals(expPrevPluginFeatures,
prevFeatures.componentFeatures(TestPluginFeature.COMPONENT_NAME));
- }
- }
- }
-
/** */
public static IgniteCoreFeatureSet createCoreFeatureSet(String ver) throws
Exception {
return new IgniteCoreFeatureSet(
@@ -533,18 +500,9 @@ public abstract class AbstractRollingUpgradeTest extends
GridCommonAbstractTest
/** */
protected void finalizeClusterVersion(int nodeIdx, String expVer) throws
Exception {
- IgniteFeatureManager featureMgr = ru(nodeIdx).features();
-
- String prevLogicalVer =
featureMgr.localVersionFeatures().equals(featureMgr.activeFeatures())
- ? null // No actual version upgrade was performed.
- : resolveCompoundVersion(ru(nodeIdx).features().activeFeatures());
-
- checkPreviousClusterFeatures(prevLogicalVer);
-
ru(nodeIdx).finalizeClusterVersion();
checkVersionUpgradeInactive(expVer);
- checkPreviousClusterFeatures(prevLogicalVer);
}
/** */
@@ -579,14 +537,6 @@ public abstract class AbstractRollingUpgradeTest extends
GridCommonAbstractTest
return
node.cluster().localNode().attribute(COMPONENT_VERSIONS_ATTRIBUTE);
}
- /** */
- protected String resolveCompoundVersion(IgniteNodeFeatureSet features) {
- return Arrays.stream(features.values())
-
.sorted(Comparator.comparing(IgniteComponentFeatureSet::componentName))
- .map(f -> IGNITE_VERSION.equals(f.version()) ? MASTER_VER_REF :
semanticVersion(f.version()))
- .collect(Collectors.joining(" | "));
- }
-
/** */
protected void checkRollingUpgradeState(String expLogicalVer, String
expSrcVer, String expTargetVer) {
TestVersions expLogicalVersions = TestVersions.parse(expLogicalVer);
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 0f8a8b113fb..dbb8cc8267a 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
@@ -54,7 +54,6 @@ public class CoreVersionRollingUpgradeTest extends
AbstractRollingUpgradeTest {
startGrid(0);
checkVersionUpgradeInactive("2.19.0");
- checkPreviousClusterFeatures(null);
}
/** */
@@ -89,8 +88,6 @@ public class CoreVersionRollingUpgradeTest extends
AbstractRollingUpgradeTest {
restartNode(1);
restartNode(2);
-
- checkPreviousClusterFeatures(null);
}
/** */
@@ -215,7 +212,6 @@ public class CoreVersionRollingUpgradeTest extends
AbstractRollingUpgradeTest {
checkJoinSuccess(4, "2.19.2", true);
checkVersionUpgradeInactive("2.19.2");
- checkPreviousClusterFeatures(TEST_DEFAULT_VER);
}
/** */
@@ -292,21 +288,18 @@ public class CoreVersionRollingUpgradeTest extends
AbstractRollingUpgradeTest {
finalizeClusterVersion(1, "2.19.2");
restartNode(0);
- checkPreviousClusterFeatures(TEST_DEFAULT_VER);
ru(1).enableVersionUpgrade();
forAllNodes(nodeIdx -> upgradeNodeVersion(nodeIdx, "2.19.2",
"2.20.0"));
finalizeClusterVersion(1, "2.20.0");
restartNode(1);
- checkPreviousClusterFeatures("2.19.2");
ru(1).enableVersionUpgrade();
forAllNodes(nodeIdx -> upgradeNodeVersion(nodeIdx, "2.20.0",
"2.21.0"));
finalizeClusterVersion(1, "2.21.0");
restartNode(2);
- checkPreviousClusterFeatures("2.20.0");
}
/** */
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/PluginVersionRollingUpgradeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/PluginVersionRollingUpgradeTest.java
index 68b404de6f3..9242cdd556e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/PluginVersionRollingUpgradeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/PluginVersionRollingUpgradeTest.java
@@ -70,7 +70,6 @@ public class PluginVersionRollingUpgradeTest extends
AbstractRollingUpgradeTest
finalizeClusterVersion(1, "2.19.0 | 2.0.0");
restartNode(1);
- checkPreviousClusterFeatures("2.19.0 | 1.0.0");
ru(1).enableVersionUpgrade();
@@ -81,7 +80,6 @@ public class PluginVersionRollingUpgradeTest extends
AbstractRollingUpgradeTest
finalizeClusterVersion(1, "2.19.0 | 3.0.0");
restartNode(2);
- checkPreviousClusterFeatures("2.19.0 | 2.0.0");
}
/** */
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/RollingUpgradeMessageSerializationTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/RollingUpgradeMessageSerializationTest.java
index 666ec3ba7db..0ad2d658ec0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/RollingUpgradeMessageSerializationTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/RollingUpgradeMessageSerializationTest.java
@@ -200,7 +200,7 @@ public class RollingUpgradeMessageSerializationTest extends
AbstractRollingUpgra
public void testDefaultRegistryMixedPair() throws Exception {
startServerNodes("2.19.0", "2.20.0");
- checkMutualMessageSend(grid(0), grid(1), DEFAULT_REGISTRY_MSG, A,
null, C, D, E, F);
+ checkMutualMessageSend(grid(0), grid(1), DEFAULT_REGISTRY_MSG, A, B,
C, D, E, F);
}
/** */
@@ -580,6 +580,67 @@ public class RollingUpgradeMessageSerializationTest
extends AbstractRollingUpgra
assertNull(send(grid(0), grid(1), CORE_MSG).rawFields());
}
+ /** */
+ @Test
+ public void testDeprecatedFieldsDuringUpgrade() throws Exception {
+ startServerNodes("2.19.2", "2.20.0", "2.20.0");
+
+ checkMutualCoreMessageSend(grid(1), grid(2), A, B, null, D, E, null);
+ checkMutualCoreMessageSend(grid(0), grid(1), A, B, null, D, null,
null);
+ checkMutualCoreMessageSend(grid(0), grid(2), A, B, null, D, null,
null);
+
+ TestContainerMessage_2_20_0 rcvd =
(TestContainerMessage_2_20_0)send(grid(1), grid(2), CONTAINER_MSG);
+
+ assertEquals(7, rcvd.oldCnt);
+ assertFields(A, B, null, D, E, null, rcvd.oldCompressedMsg);
+ }
+
+ /** */
+ @Test
+ public void testEmptyDeprecatedValueIsSent() throws Exception {
+ startServerNodes("2.19.2", "2.20.0", "2.20.0");
+
+ TestCoreMessage_2_20_0 msg =
(TestCoreMessage_2_20_0)buildMessage(grid(1), CORE_MSG);
+
+ msg.fldB = "";
+
+ assertEquals("", send(grid(1), grid(2), msg).fldB());
+ }
+
+ /** */
+ @Test
+ public void testDeletedFieldIsRelayed() throws Exception {
+ startServerNodes("2.20.1", "2.21.0", "2.20.1");
+
+ TestDiscoveryMessage msg = CORE_MSG.build("2.20.1", feature -> false);
+
+ TestMessage held = send(grid(0), grid(1), msg);
+
+ assertEquals(TestCoreMessage_2_21_0.class, held.getClass());
+ assertFields(A, null, null, null, E, F, held);
+ assertEquals(3, held.rawFields().size());
+
+ assertFields(A, B, C, D, E, F, send(grid(1), grid(0), held));
+
+ Map<String, TestDiscoveryMessage> rcvd = sendOverDiscovery(grid(0),
msg);
+
+ assertEquals(3, rcvd.get(grid(1).name()).rawFields().size());
+
+ assertFields(A, B, C, D, E, F, rcvd.get(grid(2).name()));
+ assertNull(rcvd.get(grid(2).name()).rawFields());
+ }
+
+ /** */
+ @Test
+ public void testNewerVersionWithoutDeprecatedFields() throws Exception {
+ startServerNodes("2.20.1", "2.21.0");
+
+ checkMutualCoreMessageSend(grid(0), grid(1), A, null, null, null, E,
F);
+
+ assertNull(send(grid(0), grid(1), CORE_MSG).rawFields());
+ assertNull(sendOverDiscovery(grid(0),
CORE_MSG).get(grid(1).name()).rawFields());
+ }
+
/** */
private void checkMessagesTransmissionBetweenAllNodes(
String expA,
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/TestContainerMessage_2_20_0.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/TestContainerMessage_2_20_0.java
index dc73b0d4847..095e57453e3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/TestContainerMessage_2_20_0.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rollingupgrade/message/TestContainerMessage_2_20_0.java
@@ -23,10 +23,16 @@ import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
import org.apache.ignite.internal.Compress;
+import org.apache.ignite.internal.FeatureGated;
import org.apache.ignite.internal.Order;
import
org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteFeature;
+import
org.apache.ignite.internal.processors.rollingupgrade.feature.TestIgniteReleaseFeatures_2_20_0;
+
+import static
org.apache.ignite.internal.processors.rollingupgrade.feature.TestIgniteReleaseFeatures_2_20_0.VER_2_20_0_ID_3_FEATURE;
+import static
org.apache.ignite.internal.processors.rollingupgrade.feature.TestIgniteReleaseFeatures_2_20_0.VER_2_20_0_ID_5_FEATURE;
/** */
+@FeatureGated(registry = TestIgniteReleaseFeatures_2_20_0.class)
public class TestContainerMessage_2_20_0 extends TestDiscoveryMessage {
/** */
@Order(0)
@@ -54,6 +60,15 @@ public class TestContainerMessage_2_20_0 extends
TestDiscoveryMessage {
@Order(5)
Map<Integer, TestCoreMessage_2_20_0> compressedMap;
+ /** */
+ @Order(value = 6, deprecatedBy = "VER_2_20_0_ID_3_FEATURE")
+ int oldCnt;
+
+ /** */
+ @Compress
+ @Order(value = 7, deprecatedBy = "VER_2_20_0_ID_5_FEATURE")
+ TestCoreMessage_2_20_0 oldCompressedMsg;
+
/** {@inheritDoc} */
@Override public void fill(Predicate<IgniteFeature> featureStatusProvider)
{
msg = nestedMessage(featureStatusProvider);
@@ -62,6 +77,12 @@ public class TestContainerMessage_2_20_0 extends
TestDiscoveryMessage {
arr = new TestCoreMessage_2_20_0[]
{nestedMessage(featureStatusProvider)};
compressedMsg = nestedMessage(featureStatusProvider);
compressedMap = Map.of(0, nestedMessage(featureStatusProvider));
+
+ if (!featureStatusProvider.test(VER_2_20_0_ID_3_FEATURE))
+ oldCnt = 7;
+
+ if (!featureStatusProvider.test(VER_2_20_0_ID_5_FEATURE))
+ oldCompressedMsg = nestedMessage(featureStatusProvider);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/resources/codegen/TestFeatureRegistry.java
b/modules/core/src/test/resources/codegen/TestFeatureRegistry.java
index ab5f5e07611..efafc24e4cc 100644
--- a/modules/core/src/test/resources/codegen/TestFeatureRegistry.java
+++ b/modules/core/src/test/resources/codegen/TestFeatureRegistry.java
@@ -30,4 +30,7 @@ public class TestFeatureRegistry {
/** */
public static final IgniteFeature THIRD_FEATURE = new IgniteCoreFeature(2);
+
+ /** */
+ public static final IgniteFeature FOURTH_FEATURE = new
IgniteCoreFeature(3);
}
diff --git
a/modules/core/src/test/resources/codegen/TestMixedRegistryMessage.java
b/modules/core/src/test/resources/codegen/TestMixedRegistryMessage.java
index eb260f53295..cdf17e57d8a 100644
--- a/modules/core/src/test/resources/codegen/TestMixedRegistryMessage.java
+++ b/modules/core/src/test/resources/codegen/TestMixedRegistryMessage.java
@@ -21,6 +21,6 @@ package org.apache.ignite.internal;
@FeatureGated(registry = TestSecondFeatureRegistry.class)
public class TestMixedRegistryMessage extends TestMixedRegistryBaseMessage {
/** */
- @Order(value = 1, introducedBy = "OTHER_FEATURE")
+ @Order(value = 0, introducedBy = "OTHER_FEATURE")
int newFld;
}
diff --git
a/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.java
b/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.java
index 55af8793f1a..13deeb63e90 100644
---
a/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.java
+++
b/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.java
@@ -38,6 +38,10 @@ public class TestRollingUpgradeAwareMessage extends
AbstractMessage {
@Order(value = 3, introducedBy = "THIRD_FEATURE")
long newCnt;
+ /** */
+ @Order(value = 4, deprecatedBy = "FOURTH_FEATURE")
+ int oldCnt;
+
/** {@inheritDoc} */
@Override public short directType() {
return 0;
diff --git
a/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.json
b/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.json
index 4dcf9c89915..cb944f2ef3a 100644
---
a/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.json
+++
b/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessage.json
@@ -5,6 +5,7 @@
{"order": 0, "type": "int", "name": "plain"},
{"order": 1, "type": "java.lang.String", "name": "oldFld", "annotations":
["@org.apache.ignite.internal.Order(value=1, deprecatedBy=\"FIRST_FEATURE\")"]},
{"order": 2, "type": "java.lang.String", "name": "newFld", "annotations":
["@org.apache.ignite.internal.Order(value=2,
introducedBy=\"SECOND_FEATURE\")"]},
- {"order": 3, "type": "long", "name": "newCnt", "annotations":
["@org.apache.ignite.internal.Order(value=3, introducedBy=\"THIRD_FEATURE\")"]}
+ {"order": 3, "type": "long", "name": "newCnt", "annotations":
["@org.apache.ignite.internal.Order(value=3, introducedBy=\"THIRD_FEATURE\")"]},
+ {"order": 4, "type": "int", "name": "oldCnt", "annotations":
["@org.apache.ignite.internal.Order(value=4, deprecatedBy=\"FOURTH_FEATURE\")"]}
]
}
diff --git
a/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessageSerializer.java
b/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessageSerializer.java
index ab19a20284c..edde78a7520 100644
---
a/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessageSerializer.java
+++
b/modules/core/src/test/resources/codegen/TestRollingUpgradeAwareMessageSerializer.java
@@ -53,6 +53,8 @@ public final class TestRollingUpgradeAwareMessageSerializer
implements MessageSe
if (!writer.writeString(msg.oldFld))
return false;
}
+ else if (ctx.includeRawFields() && msg.oldFld != null)
+
writer.addPendingRawField(TestFeatureRegistry.FIRST_FEATURE.id(), w ->
w.writeString(msg.oldFld));
writer.incrementState();
@@ -77,6 +79,16 @@ public final class TestRollingUpgradeAwareMessageSerializer
implements MessageSe
writer.incrementState();
case 4:
+ if
(ctx.includeFieldDeprecatedBy(TestFeatureRegistry.FOURTH_FEATURE)) {
+ if (!writer.writeInt(msg.oldCnt))
+ return false;
+ }
+ else if (ctx.includeRawFields() && msg.oldCnt != 0)
+
writer.addPendingRawField(TestFeatureRegistry.FOURTH_FEATURE.id(), w ->
w.writeInt(msg.oldCnt));
+
+ writer.incrementState();
+
+ case 5:
if (ctx.includeRawFields()) {
if (!writer.writeRawFields(msg.rawFields()))
return false;
@@ -130,6 +142,16 @@ public final class
TestRollingUpgradeAwareMessageSerializer implements MessageSe
reader.incrementState();
case 4:
+ if
(ctx.includeFieldDeprecatedBy(TestFeatureRegistry.FOURTH_FEATURE)) {
+ msg.oldCnt = reader.readInt();
+
+ if (!reader.isLastRead())
+ return false;
+ }
+
+ reader.incrementState();
+
+ case 5:
if (ctx.includeRawFields()) {
List<RawField> rawFields = reader.readRawFields();
@@ -150,6 +172,12 @@ public final class
TestRollingUpgradeAwareMessageSerializer implements MessageSe
/** */
private static boolean consumeKnownField(TestRollingUpgradeAwareMessage
msg, RawField f, MessageReader reader, MessageSerializationContext ctx) {
+ if (f.tag() == TestFeatureRegistry.FIRST_FEATURE.id()) {
+ msg.oldFld = reader.deserializeRawField(f, in -> in.readString());
+
+ return true;
+ }
+
if (f.tag() == TestFeatureRegistry.SECOND_FEATURE.id()) {
msg.newFld = reader.deserializeRawField(f, in -> in.readString());
@@ -162,6 +190,12 @@ public final class
TestRollingUpgradeAwareMessageSerializer implements MessageSe
return true;
}
+ if (f.tag() == TestFeatureRegistry.FOURTH_FEATURE.id()) {
+ msg.oldCnt = reader.deserializeRawField(f, in -> in.readInt());
+
+ return true;
+ }
+
return false;
}
@@ -172,6 +206,7 @@ public final class TestRollingUpgradeAwareMessageSerializer
implements MessageSe
assert msg.oldFld == null : "A field gated by a feature must have no
initial value [field=oldFld]";
assert msg.newFld == null : "A field gated by a feature must have no
initial value [field=newFld]";
assert msg.newCnt == 0 : "A field gated by a feature must have no
initial value [field=newCnt]";
+ assert msg.oldCnt == 0 : "A field gated by a feature must have no
initial value [field=oldCnt]";
return msg;
}
diff --git
a/modules/wire-compatibility-check/wire/messages/org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeClusterData.json
b/modules/wire-compatibility-check/wire/messages/org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeClusterData.json
index 020ddd23fe4..d1e198bb751 100644
---
a/modules/wire-compatibility-check/wire/messages/org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeClusterData.json
+++
b/modules/wire-compatibility-check/wire/messages/org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeClusterData.json
@@ -4,6 +4,6 @@
{"order": 0, "type": "boolean", "name": "isVersionUpgradeEnabled"},
{"order": 1, "type": "java.util.UUID", "name": "curFinalizeProcId"},
{"order": 2, "type":
"org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteNodeFeatureSet",
"name": "activeFeatures"},
- {"order": 3, "type":
"org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteNodeFeatureSet",
"name": "prevActiveFeatures"}
+ {"order": 3, "type":
"org.apache.ignite.internal.processors.rollingupgrade.feature.IgniteNodeFeatureSet",
"name": "prevActiveFeatures", "annotations":
["@org.apache.ignite.internal.Order(value=3,
deprecatedBy=\"PREV_CLUSTER_VER_DEPRECATED_FEATURE\")"]}
]
}