From 7ccd6ce49d7c4dbee5f0ad4e0fb1f252bb477be7 Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 17 Feb 2026 14:45:44 +0300 Subject: [PATCH 1/3] raw --- .../discovery/DiscoveryMessageFactory.java | 3 + .../TcpConnectionRequestDiscoveryMessage.java | 58 +++++++++++++++---- 2 files changed, 49 insertions(+), 12 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..163ae8dbd8bc4 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 @@ -21,6 +21,7 @@ import org.apache.ignite.internal.codegen.InetAddressMessageSerializer; import org.apache.ignite.internal.codegen.InetSocketAddressMessageSerializer; import org.apache.ignite.internal.codegen.NodeSpecificDataSerializer; +import org.apache.ignite.internal.codegen.TcpConnectionRequestDiscoveryMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryAuthFailedMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryCacheMetricsMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer; @@ -47,6 +48,7 @@ import org.apache.ignite.internal.codegen.TcpDiscoveryStatusCheckMessageSerializer; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; +import org.apache.ignite.spi.communication.tcp.internal.TcpConnectionRequestDiscoveryMessage; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessage; import org.apache.ignite.spi.discovery.tcp.messages.InetSocketAddressMessage; @@ -110,5 +112,6 @@ 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, TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer()); } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java index c512c2257b650..e792ca5b1f22d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java @@ -18,59 +18,88 @@ package org.apache.ignite.spi.communication.tcp.internal; 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; /** - * Message is part of communication via discovery protocol. - * + * Message to support new communication connection via discovery protocol. * It is used when a node (say node A) cannot establish a communication connection to other node (node B) in topology * due to firewall or network configuration and sends this message requesting inverse connection: * node B receives request and opens communication connection to node A * thus allowing both nodes to communicate to each other. */ -public class TcpConnectionRequestDiscoveryMessage implements DiscoveryCustomMessage { +public class TcpConnectionRequestDiscoveryMessage implements DiscoveryCustomMessage, Message { /** */ private static final long serialVersionUID = 0L; - /** */ - private final IgniteUuid id = IgniteUuid.randomUuid(); + /** Message id. */ + @Order(0) + private IgniteUuid id; - /** */ + /** Receiver node id. */ + @Order(1) @GridToStringInclude - private final UUID receiverNodeId; + private UUID receiverNodeId; - /** */ + /** Connection index. */ + @Order(value = 2, method = "connectionIndex") @GridToStringInclude - private final int connIdx; + private int connIdx; - /** */ + /** + * @param receiverNodeId Receiver node id. + * @param connIdx Connection index. + */ public TcpConnectionRequestDiscoveryMessage(UUID receiverNodeId, int connIdx) { + id = IgniteUuid.randomUuid(); this.receiverNodeId = receiverNodeId; this.connIdx = connIdx; } + /** Constructor for {@link DiscoveryMessageFactory}. */ + public TcpConnectionRequestDiscoveryMessage() { + // No-op. + } + /** {@inheritDoc} */ @Override public IgniteUuid id() { return id; } - /** */ + /** @param id Message id. */ + public void id(IgniteUuid id) { + this.id = id; + } + + /** @return Receiver node id. */ public UUID receiverNodeId() { return receiverNodeId; } - /** */ + /** @param receiverNodeId Receiver node id. */ + public void receiverNodeId(UUID receiverNodeId) { + this.receiverNodeId = receiverNodeId; + } + + /** @return Connection index. */ public int connectionIndex() { return connIdx; } + /** @param connIdx Connection index. */ + public void connectionIndex(int connIdx) { + this.connIdx = connIdx; + } + /** {@inheritDoc} */ @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; @@ -90,6 +119,11 @@ public int connectionIndex() { throw new UnsupportedOperationException("createDiscoCache"); } + /** {@inheritDoc} */ + @Override public short directType() { + return 20; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpConnectionRequestDiscoveryMessage.class, this); From 131ae6e02caf72bd0f79e308c25427bbf93a96c2 Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 17 Feb 2026 15:42:47 +0300 Subject: [PATCH 2/3] impl --- .../discovery/DiscoveryMessageFactory.java | 9 ++- .../DistributedMetaStorageCasAckMessage.java | 22 ++++++- ...istributedMetaStorageUpdateAckMessage.java | 42 ++++++++++++-- .../TcpConnectionRequestDiscoveryMessage.java | 58 ++++--------------- 4 files changed, 75 insertions(+), 56 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 163ae8dbd8bc4..ac5d63605256b 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,10 +18,11 @@ package org.apache.ignite.internal.managers.discovery; import org.apache.ignite.internal.codegen.DiscoveryDataPacketSerializer; +import org.apache.ignite.internal.codegen.DistributedMetaStorageCasAckMessageSerializer; +import org.apache.ignite.internal.codegen.DistributedMetaStorageUpdateAckMessageSerializer; import org.apache.ignite.internal.codegen.InetAddressMessageSerializer; import org.apache.ignite.internal.codegen.InetSocketAddressMessageSerializer; import org.apache.ignite.internal.codegen.NodeSpecificDataSerializer; -import org.apache.ignite.internal.codegen.TcpConnectionRequestDiscoveryMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryAuthFailedMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryCacheMetricsMessageSerializer; import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer; @@ -46,9 +47,10 @@ 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.DistributedMetaStorageCasAckMessage; +import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageUpdateAckMessage; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; -import org.apache.ignite.spi.communication.tcp.internal.TcpConnectionRequestDiscoveryMessage; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessage; import org.apache.ignite.spi.discovery.tcp.messages.InetSocketAddressMessage; @@ -112,6 +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, TcpConnectionRequestDiscoveryMessage::new, new TcpConnectionRequestDiscoveryMessageSerializer()); + factory.register((short)20, DistributedMetaStorageUpdateAckMessage::new, new DistributedMetaStorageUpdateAckMessageSerializer()); + factory.register((short)21, DistributedMetaStorageCasAckMessage::new, new DistributedMetaStorageCasAckMessageSerializer()); } } 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..cd3d951f49fed 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 @@ -18,15 +18,23 @@ 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.DiscoveryMessageFactory; import org.apache.ignite.internal.util.typedef.internal.S; /** */ -class DistributedMetaStorageCasAckMessage extends DistributedMetaStorageUpdateAckMessage { +public class DistributedMetaStorageCasAckMessage extends DistributedMetaStorageUpdateAckMessage { /** */ private static final long serialVersionUID = 0L; /** */ - private final boolean updated; + @Order(3) + private boolean updated; + + /** Empty constructor of {@link DiscoveryMessageFactory}. */ + public DistributedMetaStorageCasAckMessage() { + // No-op. + } /** */ public DistributedMetaStorageCasAckMessage(UUID reqId, String errorMsg, boolean updated) { @@ -40,6 +48,16 @@ public boolean updated() { return updated; } + /** */ + public void updated(boolean updated) { + this.updated = updated; + } + + /** {@inheritDoc} */ + @Override public short directType() { + return 21; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(DistributedMetaStorageCasAckMessage.class, this); 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..65c32de1af1c6 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 @@ -18,30 +18,42 @@ 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.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; +import org.apache.ignite.plugin.extensions.communication.Message; import org.jetbrains.annotations.Nullable; /** */ -class DistributedMetaStorageUpdateAckMessage implements DiscoveryCustomMessage { +public class DistributedMetaStorageUpdateAckMessage implements DiscoveryCustomMessage, Message { /** */ private static final long serialVersionUID = 0L; /** */ - private final IgniteUuid id = IgniteUuid.randomUuid(); + @Order(0) + private IgniteUuid id; /** Request ID. */ - private final UUID reqId; + @Order(value = 1, method = "requestId") + private UUID reqId; /** */ - private final String errorMsg; + @Order(value = 2, method = "errorMessage") + private String errorMsg; + + /** Empty constructor of {@link DiscoveryMessageFactory}. */ + public DistributedMetaStorageUpdateAckMessage() { + // No-op. + } /** */ public DistributedMetaStorageUpdateAckMessage(UUID reqId, String errorMsg) { + id = IgniteUuid.randomUuid(); this.reqId = reqId; this.errorMsg = errorMsg; } @@ -51,16 +63,31 @@ public DistributedMetaStorageUpdateAckMessage(UUID reqId, String errorMsg) { return id; } - /** */ + /** @param id Message id. */ + public void id(IgniteUuid id) { + this.id = id; + } + + /** @return Request ID. */ public UUID requestId() { return reqId; } + /** @param reqId Request ID. */ + public void requestId(UUID reqId) { + this.reqId = reqId; + } + /** */ public String errorMessage() { return errorMsg; } + /** */ + public void errorMessage(String errorMsg) { + this.errorMsg = errorMsg; + } + /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { return null; @@ -80,6 +107,11 @@ public String errorMessage() { throw new UnsupportedOperationException(); } + /** {@inheritDoc} */ + @Override public short directType() { + return 20; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(DistributedMetaStorageUpdateAckMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java index e792ca5b1f22d..c512c2257b650 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpConnectionRequestDiscoveryMessage.java @@ -18,88 +18,59 @@ package org.apache.ignite.spi.communication.tcp.internal; 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; /** - * Message to support new communication connection via discovery protocol. + * Message is part of communication via discovery protocol. + * * It is used when a node (say node A) cannot establish a communication connection to other node (node B) in topology * due to firewall or network configuration and sends this message requesting inverse connection: * node B receives request and opens communication connection to node A * thus allowing both nodes to communicate to each other. */ -public class TcpConnectionRequestDiscoveryMessage implements DiscoveryCustomMessage, Message { +public class TcpConnectionRequestDiscoveryMessage implements DiscoveryCustomMessage { /** */ private static final long serialVersionUID = 0L; - /** Message id. */ - @Order(0) - private IgniteUuid id; + /** */ + private final IgniteUuid id = IgniteUuid.randomUuid(); - /** Receiver node id. */ - @Order(1) + /** */ @GridToStringInclude - private UUID receiverNodeId; + private final UUID receiverNodeId; - /** Connection index. */ - @Order(value = 2, method = "connectionIndex") + /** */ @GridToStringInclude - private int connIdx; + private final int connIdx; - /** - * @param receiverNodeId Receiver node id. - * @param connIdx Connection index. - */ + /** */ public TcpConnectionRequestDiscoveryMessage(UUID receiverNodeId, int connIdx) { - id = IgniteUuid.randomUuid(); this.receiverNodeId = receiverNodeId; this.connIdx = connIdx; } - /** Constructor for {@link DiscoveryMessageFactory}. */ - public TcpConnectionRequestDiscoveryMessage() { - // No-op. - } - /** {@inheritDoc} */ @Override public IgniteUuid id() { return id; } - /** @param id Message id. */ - public void id(IgniteUuid id) { - this.id = id; - } - - /** @return Receiver node id. */ + /** */ public UUID receiverNodeId() { return receiverNodeId; } - /** @param receiverNodeId Receiver node id. */ - public void receiverNodeId(UUID receiverNodeId) { - this.receiverNodeId = receiverNodeId; - } - - /** @return Connection index. */ + /** */ public int connectionIndex() { return connIdx; } - /** @param connIdx Connection index. */ - public void connectionIndex(int connIdx) { - this.connIdx = connIdx; - } - /** {@inheritDoc} */ @Nullable @Override public DiscoveryCustomMessage ackMessage() { return null; @@ -119,11 +90,6 @@ public void connectionIndex(int connIdx) { throw new UnsupportedOperationException("createDiscoCache"); } - /** {@inheritDoc} */ - @Override public short directType() { - return 20; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpConnectionRequestDiscoveryMessage.class, this); From c6bcc7c17f33949d227267f161216d88c3cfe443 Mon Sep 17 00:00:00 2001 From: Vladimir Steshin Date: Tue, 17 Feb 2026 18:18:44 +0300 Subject: [PATCH 3/3] impl --- .../DistributedMetaStorageCasAckMessage.java | 6 +++--- .../DistributedMetaStorageCasMessage.java | 2 +- .../persistence/DistributedMetaStorageImpl.java | 17 ++++------------- .../DistributedMetaStorageUpdateAckMessage.java | 17 +---------------- .../DistributedMetaStorageUpdateMessage.java | 15 +-------------- 5 files changed, 10 insertions(+), 47 deletions(-) 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 cd3d951f49fed..50b099512dd8e 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 @@ -28,7 +28,7 @@ public class DistributedMetaStorageCasAckMessage extends DistributedMetaStorageU private static final long serialVersionUID = 0L; /** */ - @Order(3) + @Order(2) private boolean updated; /** Empty constructor of {@link DiscoveryMessageFactory}. */ @@ -37,8 +37,8 @@ public DistributedMetaStorageCasAckMessage() { } /** */ - 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..88f64122892d4 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 boolean matches() { /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { - return new DistributedMetaStorageCasAckMessage(requestId(), errorMessage(), matches); + return new DistributedMetaStorageCasAckMessage(requestId(), 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 147b98ceead25..c9c0d6c49f9a1 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); } } 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 65c32de1af1c6..313cf5038a486 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 @@ -42,20 +42,15 @@ public class DistributedMetaStorageUpdateAckMessage implements DiscoveryCustomMe @Order(value = 1, method = "requestId") private UUID reqId; - /** */ - @Order(value = 2, method = "errorMessage") - private String errorMsg; - /** Empty constructor of {@link DiscoveryMessageFactory}. */ public DistributedMetaStorageUpdateAckMessage() { // No-op. } /** */ - public DistributedMetaStorageUpdateAckMessage(UUID reqId, String errorMsg) { + public DistributedMetaStorageUpdateAckMessage(UUID reqId) { id = IgniteUuid.randomUuid(); this.reqId = reqId; - this.errorMsg = errorMsg; } /** {@inheritDoc} */ @@ -78,16 +73,6 @@ public void requestId(UUID reqId) { this.reqId = reqId; } - /** */ - public String errorMessage() { - return errorMsg; - } - - /** */ - public void errorMessage(String errorMsg) { - this.errorMsg = 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..7ea5a8a21a60e 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 @@ -46,9 +46,6 @@ class DistributedMetaStorageUpdateMessage implements DiscoveryCustomMessage { /** */ private final byte[] valBytes; - /** */ - private String errorMsg; - /** */ public DistributedMetaStorageUpdateMessage(UUID reqId, String key, byte[] valBytes) { this.reqId = reqId; @@ -81,19 +78,9 @@ public boolean isAckMessage() { return false; } - /** */ - public void errorMessage(String errorMsg) { - this.errorMsg = errorMsg; - } - - /** */ - protected String errorMessage() { - return errorMsg; - } - /** {@inheritDoc} */ @Override @Nullable public DiscoveryCustomMessage ackMessage() { - return new DistributedMetaStorageUpdateAckMessage(reqId, errorMsg); + return new DistributedMetaStorageUpdateAckMessage(reqId); } /** {@inheritDoc} */