From ff5d2bc3e39785d85470a4e9d006c95cbd5335be Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 17 Feb 2026 17:58:54 +0300 Subject: [PATCH 1/4] impl --- .../discovery/DiscoveryMessageFactory.java | 6 ++ .../DistributedMetaStorageCasAckMessage.java | 4 +- .../DistributedMetaStorageCasMessage.java | 30 ++++++++-- .../DistributedMetaStorageImpl.java | 19 ++---- ...istributedMetaStorageUpdateAckMessage.java | 11 +--- .../DistributedMetaStorageUpdateMessage.java | 58 ++++++++++++++----- 6 files changed, 81 insertions(+), 47 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java index 753f00569c5cf..e0e712e1bdf1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java @@ -18,6 +18,8 @@ package org.apache.ignite.internal.managers.discovery; import org.apache.ignite.internal.codegen.DiscoveryDataPacketSerializer; +import org.apache.ignite.internal.codegen.DistributedMetaStorageCasMessageSerializer; +import org.apache.ignite.internal.codegen.DistributedMetaStorageUpdateMessageSerializer; import org.apache.ignite.internal.codegen.InetAddressMessageSerializer; import org.apache.ignite.internal.codegen.InetSocketAddressMessageSerializer; import org.apache.ignite.internal.codegen.NodeSpecificDataSerializer; @@ -45,6 +47,8 @@ import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryRingLatencyCheckMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryStatusCheckMessageSerializer; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessage; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessage; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; @@ -110,5 +114,7 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider { factory.register((short)17, TcpDiscoveryNodeFailedMessage::new, new TcpDiscoveryNodeFailedMessageSerializer()); factory.register((short)18, TcpDiscoveryStatusCheckMessage::new, new TcpDiscoveryStatusCheckMessageSerializer()); factory.register((short)19, TcpDiscoveryNodeAddFinishedMessage::new, new TcpDiscoveryNodeAddFinishedMessageSerializer()); + factory.register((short)20, DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer()); + factory.register((short)21, DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer()); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java index 30dda350ec66a..c293b949ed7e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasAckMessage.java @@ -29,8 +29,8 @@ class DistributedMetaStorageCasAckMessage extends DistributedMetaStorageUpdateAc private final boolean updated; /** */ - public DistributedMetaStorageCasAckMessage(UUID reqId, String errorMsg, boolean updated) { - super(reqId, errorMsg); + public DistributedMetaStorageCasAckMessage(UUID reqId, boolean updated) { + super(reqId); this.updated = updated; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java index fa279596cba85..fb349935d9e9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java @@ -18,26 +18,36 @@ package org.apache.ignite.internal.processors.metastorage.persistence; import java.util.UUID; +import org.apache.ignite.internal.Order; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.managers.discovery.DiscoveryMessageFactory; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; /** */ -class DistributedMetaStorageCasMessage extends DistributedMetaStorageUpdateMessage { +public class DistributedMetaStorageCasMessage extends DistributedMetaStorageUpdateMessage { /** */ private static final long serialVersionUID = 0L; /** */ - private final byte[] expectedVal; + @Order(value = 4, method = "expectedValue") + private byte[] expectedVal; /** */ - private boolean matches = true; + @Order(5) + private boolean matches; + + /** Empty constructor for {@link DiscoveryMessageFactory}. */ + public DistributedMetaStorageCasMessage() { + // No-op. + } /** */ public DistributedMetaStorageCasMessage(UUID reqId, String key, byte[] expValBytes, byte[] valBytes) { super(reqId, key, valBytes); expectedVal = expValBytes; + matches = true; } /** */ @@ -46,7 +56,12 @@ public byte[] expectedValue() { } /** */ - public void setMatches(boolean matches) { + public void expectedValue(byte[] expectedVal) { + this.expectedVal = expectedVal; + } + + /** */ + public void matches(boolean matches) { this.matches = matches; } @@ -57,7 +72,12 @@ public boolean matches() { /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { - return new DistributedMetaStorageCasAckMessage(requestId(), errorMessage(), matches); + return new DistributedMetaStorageCasAckMessage(requestId(), matches); + } + + /** {@inheritDoc} */ + @Override public short directType() { + return 21; } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java index 147b98ceead25..c303b4e240bb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java @@ -1128,9 +1128,6 @@ private void onUpdateMessage( ClusterNode node, DistributedMetaStorageUpdateMessage msg ) { - if (msg.errorMessage() != null) - return; - lock.writeLock().lock(); try { @@ -1166,17 +1163,11 @@ private void onAckMessage( GridFutureAdapter fut = updateFuts.remove(msg.requestId()); if (fut != null) { - String errorMsg = msg.errorMessage(); - - if (errorMsg == null) { - Boolean res = msg instanceof DistributedMetaStorageCasAckMessage - ? ((DistributedMetaStorageCasAckMessage)msg).updated() - : null; + Boolean res = msg instanceof DistributedMetaStorageCasAckMessage + ? ((DistributedMetaStorageCasAckMessage)msg).updated() + : null; - fut.onDone(res); - } - else - fut.onDone(new IllegalStateException(errorMsg)); + fut.onDone(res); } } @@ -1330,7 +1321,7 @@ private void completeCas( Serializable expVal = unmarshal(marshaller, msg.expectedValue()); if (!Objects.deepEquals(oldVal, expVal)) { - msg.setMatches(false); + msg.matches(false); // Do nothing if expected value doesn't match with the actual one. return; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java index 9008f8b72579e..8f032ddfcef60 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateAckMessage.java @@ -38,12 +38,8 @@ class DistributedMetaStorageUpdateAckMessage implements DiscoveryCustomMessage { private final UUID reqId; /** */ - private final String errorMsg; - - /** */ - public DistributedMetaStorageUpdateAckMessage(UUID reqId, String errorMsg) { + public DistributedMetaStorageUpdateAckMessage(UUID reqId) { this.reqId = reqId; - this.errorMsg = errorMsg; } /** {@inheritDoc} */ @@ -56,11 +52,6 @@ public UUID requestId() { return reqId; } - /** */ - public String errorMessage() { - return errorMsg; - } - /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { return null; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index 74dc88f6ade34..9f34fe0ad74cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -18,39 +18,50 @@ package org.apache.ignite.internal.processors.metastorage.persistence; import java.util.UUID; +import org.apache.ignite.internal.Order; import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.managers.discovery.DiscoveryMessageFactory; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.Message; import org.jetbrains.annotations.Nullable; /** */ -class DistributedMetaStorageUpdateMessage implements DiscoveryCustomMessage { +public class DistributedMetaStorageUpdateMessage implements DiscoveryCustomMessage, Message { /** */ private static final long serialVersionUID = 0L; /** */ - private final IgniteUuid id = IgniteUuid.randomUuid(); + @Order(0) + private IgniteUuid id; /** Request ID. */ + @Order(value = 1, method = "requestId") @GridToStringInclude - private final UUID reqId; + private UUID reqId; /** */ + @Order(2) @GridToStringInclude - private final String key; + private String key; /** */ - private final byte[] valBytes; + @Order(value = 3, method = "value") + private byte[] valBytes; - /** */ - private String errorMsg; + /** Empty constructor for {@link DiscoveryMessageFactory}. */ + public DistributedMetaStorageUpdateMessage() { + // No-op. + } /** */ public DistributedMetaStorageUpdateMessage(UUID reqId, String key, byte[] valBytes) { + id = IgniteUuid.randomUuid(); + this.reqId = reqId; this.key = key; this.valBytes = valBytes; @@ -61,39 +72,49 @@ public DistributedMetaStorageUpdateMessage(UUID reqId, String key, byte[] valByt return id; } + /** */ + public void id(IgniteUuid id) { + this.id = id; + } + /** */ public UUID requestId() { return reqId; } + /** */ + public void requestId(UUID reqId) { + this.reqId = reqId; + } + /** */ public String key() { return key; } /** */ - public byte[] value() { - return valBytes; + public void key(String key) { + this.key = key; } /** */ - public boolean isAckMessage() { - return false; + public byte[] value() { + return valBytes; } /** */ - public void errorMessage(String errorMsg) { - this.errorMsg = errorMsg; + public void value(byte[] valBytes) { + this.valBytes = valBytes; } /** */ - protected String errorMessage() { - return errorMsg; + public boolean isAckMessage() { + return false; } /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { - return new DistributedMetaStorageUpdateAckMessage(reqId, errorMsg); + return new DistributedMetaStorageUpdateAckMessage(reqId); } /** {@inheritDoc} */ @@ -110,6 +131,11 @@ protected String errorMessage() { throw new UnsupportedOperationException("createDiscoCache"); } + /** {@inheritDoc} */ + @Override public short directType() { + return 20; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(DistributedMetaStorageUpdateMessage.class, this); From 2240c095291a8ccd84d32101babaf2b546b7fbda Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 24 Feb 2026 12:39:07 +0300 Subject: [PATCH 2/4] merged master --- .../discovery/DiscoveryMessageFactory.java | 4 ++ .../DistributedMetaStorageCasMessage.java | 28 ++--------- .../DistributedMetaStorageImpl.java | 12 ++--- .../DistributedMetaStorageUpdateMessage.java | 47 +++---------------- 4 files changed, 20 insertions(+), 71 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java index a3cefa8d6008e..be8f991adab7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java @@ -17,6 +17,10 @@ package org.apache.ignite.internal.managers.discovery; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessage; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessageSerializer; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessage; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessageSerializer; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java index fb349935d9e9b..3870a64b5dd0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java @@ -30,12 +30,12 @@ public class DistributedMetaStorageCasMessage extends DistributedMetaStorageUpda private static final long serialVersionUID = 0L; /** */ - @Order(value = 4, method = "expectedValue") - private byte[] expectedVal; + @Order(4) + byte[] expectedVal; /** */ @Order(5) - private boolean matches; + boolean matches; /** Empty constructor for {@link DiscoveryMessageFactory}. */ public DistributedMetaStorageCasMessage() { @@ -50,29 +50,9 @@ public DistributedMetaStorageCasMessage(UUID reqId, String key, byte[] expValByt matches = true; } - /** */ - public byte[] expectedValue() { - return expectedVal; - } - - /** */ - public void expectedValue(byte[] expectedVal) { - this.expectedVal = expectedVal; - } - - /** */ - public void matches(boolean matches) { - this.matches = matches; - } - - /** */ - public boolean matches() { - return matches; - } - /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { - return new DistributedMetaStorageCasAckMessage(requestId(), matches); + return new DistributedMetaStorageCasAckMessage(reqId, matches); } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java index c303b4e240bb2..738f39ab02583 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java @@ -1134,7 +1134,7 @@ private void onUpdateMessage( if (msg instanceof DistributedMetaStorageCasMessage) completeCas((DistributedMetaStorageCasMessage)msg); else - completeWrite(new DistributedMetaStorageHistoryItem(msg.key(), msg.value())); + completeWrite(new DistributedMetaStorageHistoryItem(msg.key, msg.valBytes)); } catch (IgniteInterruptedCheckedException e) { throw U.convertException(e); @@ -1313,21 +1313,21 @@ private void completeWrite( private void completeCas( DistributedMetaStorageCasMessage msg ) throws IgniteCheckedException { - if (!msg.matches()) + if (!msg.matches) return; - Serializable oldVal = bridge.read(msg.key()); + Serializable oldVal = bridge.read(msg.key); - Serializable expVal = unmarshal(marshaller, msg.expectedValue()); + Serializable expVal = unmarshal(marshaller, msg.expectedVal); if (!Objects.deepEquals(oldVal, expVal)) { - msg.matches(false); + msg.matches = false; // Do nothing if expected value doesn't match with the actual one. return; } - completeWrite(new DistributedMetaStorageHistoryItem(msg.key(), msg.value())); + completeWrite(new DistributedMetaStorageHistoryItem(msg.key, msg.valBytes)); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index 9f34fe0ad74cf..2594d1e17d5c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -37,21 +37,21 @@ public class DistributedMetaStorageUpdateMessage implements DiscoveryCustomMessa /** */ @Order(0) - private IgniteUuid id; + IgniteUuid id; /** Request ID. */ - @Order(value = 1, method = "requestId") + @Order(1) @GridToStringInclude - private UUID reqId; + UUID reqId; /** */ @Order(2) @GridToStringInclude - private String key; + String key; /** */ - @Order(value = 3, method = "value") - private byte[] valBytes; + @Order(3) + byte[] valBytes; /** Empty constructor for {@link DiscoveryMessageFactory}. */ public DistributedMetaStorageUpdateMessage() { @@ -72,41 +72,6 @@ public DistributedMetaStorageUpdateMessage(UUID reqId, String key, byte[] valByt return id; } - /** */ - public void id(IgniteUuid id) { - this.id = id; - } - - /** */ - public UUID requestId() { - return reqId; - } - - /** */ - public void requestId(UUID reqId) { - this.reqId = reqId; - } - - /** */ - public String key() { - return key; - } - - /** */ - public void key(String key) { - this.key = key; - } - - /** */ - public byte[] value() { - return valBytes; - } - - /** */ - public void value(byte[] valBytes) { - this.valBytes = valBytes; - } - /** */ public boolean isAckMessage() { return false; From c44ca451092d0f6c9ae35b3c06d23fd29cb5a73a Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 24 Feb 2026 16:53:30 +0300 Subject: [PATCH 3/4] + master --- .../persistence/DistributedMetaStorageCasMessage.java | 2 +- .../persistence/DistributedMetaStorageUpdateMessage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java index 3870a64b5dd0c..7fc45d1493483 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java @@ -57,7 +57,7 @@ public DistributedMetaStorageCasMessage(UUID reqId, String key, byte[] expValByt /** {@inheritDoc} */ @Override public short directType() { - return 21; + return 22; } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index 2594d1e17d5c5..6c81746c80c99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -98,7 +98,7 @@ public boolean isAckMessage() { /** {@inheritDoc} */ @Override public short directType() { - return 20; + return 21; } /** {@inheritDoc} */ From 25c0dae3e89e1e6845354a74d6a8089fc6dc6464 Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Fri, 27 Feb 2026 00:10:37 +0300 Subject: [PATCH 4/4] + master --- .../managers/discovery/DiscoveryMessageFactory.java | 9 ++++++--- .../persistence/DistributedMetaStorageCasMessage.java | 2 +- .../persistence/DistributedMetaStorageUpdateMessage.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java index 5f535b28b9687..721831616fd39 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java @@ -19,6 +19,10 @@ import org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessage; import org.apache.ignite.internal.processors.cache.CacheStatisticsModeChangeMessageSerializer; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessage; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageCasMessageSerializer; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessage; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateMessageSerializer; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; @@ -123,11 +127,10 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider { factory.register((short)21, TcpDiscoveryCustomEventMessage::new, new TcpDiscoveryCustomEventMessageSerializer()); factory.register((short)22, TcpDiscoveryServerOnlyCustomEventMessage::new, new TcpDiscoveryServerOnlyCustomEventMessageSerializer()); - + factory.register((short)23, DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer()); + factory.register((short)24, DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer()); // DiscoveryCustomMessage factory.register((short)500, CacheStatisticsModeChangeMessage::new, new CacheStatisticsModeChangeMessageSerializer()); - factory.register((short)21, DistributedMetaStorageUpdateMessage::new, new DistributedMetaStorageUpdateMessageSerializer()); - factory.register((short)22, DistributedMetaStorageCasMessage::new, new DistributedMetaStorageCasMessageSerializer()); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java index 7fc45d1493483..fb7e1bc08ad16 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageCasMessage.java @@ -57,7 +57,7 @@ public DistributedMetaStorageCasMessage(UUID reqId, String key, byte[] expValByt /** {@inheritDoc} */ @Override public short directType() { - return 22; + return 24; } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index 8e0fc42bbff10..e87a21a8c737a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -93,7 +93,7 @@ public DistributedMetaStorageUpdateMessage(UUID reqId, String key, byte[] valByt /** {@inheritDoc} */ @Override public short directType() { - return 21; + return 23; } /** {@inheritDoc} */