This is an automated email from the ASF dual-hosted git repository.
shishkovilja 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 73dd28ecc78 IGNITE-27310 Use MessageSerializer for
TcpDiscoveryDiscardMessage (#12570)
73dd28ecc78 is described below
commit 73dd28ecc78a6f9f58c0629492a66d177545ce25
Author: Dmitry Werner <[email protected]>
AuthorDate: Thu Dec 18 16:15:12 2025 +0500
IGNITE-27310 Use MessageSerializer for TcpDiscoveryDiscardMessage (#12570)
---
.../discovery/DiscoveryMessageFactory.java | 3 ++
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../tcp/messages/TcpDiscoveryDiscardMessage.java | 36 +++++++++++++++++++---
3 files changed, 36 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 05160eec6bd..c64315bc448 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.TcpDiscoveryCheckFailedMessageSerializ
import
org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer;
import
org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer;
import
org.apache.ignite.internal.codegen.TcpDiscoveryConnectionCheckMessageSerializer;
+import org.apache.ignite.internal.codegen.TcpDiscoveryDiscardMessageSerializer;
import
org.apache.ignite.internal.codegen.TcpDiscoveryHandshakeRequestSerializer;
import
org.apache.ignite.internal.codegen.TcpDiscoveryLoopbackProblemMessageSerializer;
import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer;
@@ -32,6 +33,7 @@ import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessa
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
import
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
@@ -51,5 +53,6 @@ public class DiscoveryMessageFactory implements
MessageFactoryProvider {
factory.register((short)6, TcpDiscoveryConnectionCheckMessage::new,
new TcpDiscoveryConnectionCheckMessageSerializer());
factory.register((short)7, TcpDiscoveryRingLatencyCheckMessage::new,
new TcpDiscoveryRingLatencyCheckMessageSerializer());
factory.register((short)8, TcpDiscoveryHandshakeRequest::new, new
TcpDiscoveryHandshakeRequestSerializer());
+ factory.register((short)9, TcpDiscoveryDiscardMessage::new, new
TcpDiscoveryDiscardMessageSerializer());
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index d1d15557df0..473ff153357 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -6110,7 +6110,7 @@ class ServerImpl extends TcpDiscoveryImpl {
private void processDiscardMessage(TcpDiscoveryDiscardMessage msg) {
assert msg != null;
- IgniteUuid msgId = msg.msgId();
+ IgniteUuid msgId = msg.messageId();
assert msgId != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
index 819e2368a8c..e4d601723fc 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java
@@ -18,22 +18,31 @@
package org.apache.ignite.spi.discovery.tcp.messages;
import java.util.UUID;
+import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
/**
* Message sent by coordinator when some operation handling is over. All
receiving
* nodes should discard this and all preceding messages in local buffers.
*/
-public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
+public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage
implements Message {
/** */
private static final long serialVersionUID = 0L;
/** ID of the message to discard (this and all preceding). */
- private final IgniteUuid msgId;
+ @Order(value = 5, method = "messageId")
+ private IgniteUuid msgId;
/** True if this is discard ID for custom event message. */
- private final boolean customMsgDiscard;
+ @Order(value = 6, method = "customMessageDiscard")
+ private boolean customMsgDiscard;
+
+ /** */
+ public TcpDiscoveryDiscardMessage() {
+ // No-op.
+ }
/**
* Constructor.
@@ -54,10 +63,17 @@ public class TcpDiscoveryDiscardMessage extends
TcpDiscoveryAbstractMessage {
*
* @return Message ID.
*/
- public IgniteUuid msgId() {
+ public IgniteUuid messageId() {
return msgId;
}
+ /**
+ * @param msgId Message ID.
+ */
+ public void messageId(IgniteUuid msgId) {
+ this.msgId = msgId;
+ }
+
/**
* Flag indicating whether the ID to discard is for a custom message or
not.
*
@@ -67,8 +83,20 @@ public class TcpDiscoveryDiscardMessage extends
TcpDiscoveryAbstractMessage {
return customMsgDiscard;
}
+ /**
+ * @param customMsgDiscard Custom message flag.
+ */
+ public void customMessageDiscard(boolean customMsgDiscard) {
+ this.customMsgDiscard = customMsgDiscard;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryDiscardMessage.class, this, "super",
super.toString());
}
+
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 9;
+ }
}
