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 8c8a0453863 IGNITE-27887 Use message serializer for
TcpConnectionRequestDiscoveryMessage (#12753)
8c8a0453863 is described below
commit 8c8a0453863763d7eba94dc32e1b89e08b004da4
Author: Vladimir Steshin <[email protected]>
AuthorDate: Fri Mar 6 11:52:44 2026 +0300
IGNITE-27887 Use message serializer for
TcpConnectionRequestDiscoveryMessage (#12753)
---
.../discovery/DiscoveryMessageFactory.java | 3 ++
.../TcpConnectionRequestDiscoveryMessage.java | 36 +++++++++++++++++-----
2 files changed, 31 insertions(+), 8 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 e3b3ca17333..66189823f4a 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
@@ -49,6 +49,8 @@ import
org.apache.ignite.internal.processors.query.schema.message.SchemaProposeD
import
org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessageSerializer;
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.communication.tcp.internal.TcpConnectionRequestDiscoveryMessageSerializer;
import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket;
import
org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacketSerializer;
import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessage;
@@ -154,6 +156,7 @@ 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, TcpConnectionRequestDiscoveryMessage::new,
new TcpConnectionRequestDiscoveryMessageSerializer());
// DiscoveryCustomMessage
factory.register((short)500, CacheStatisticsModeChangeMessage::new,
new CacheStatisticsModeChangeMessageSerializer());
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 c512c2257b6..9a4e10c68bf 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,13 +18,16 @@
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;
/**
@@ -35,27 +38,39 @@ import org.jetbrains.annotations.Nullable;
* 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)
+ IgniteUuid id;
- /** */
+ /** Receiver node id. */
+ @Order(1)
@GridToStringInclude
- private final UUID receiverNodeId;
+ UUID receiverNodeId;
- /** */
+ /** Connection index. */
+ @Order(2)
@GridToStringInclude
- private final int connIdx;
+ 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;
@@ -90,6 +105,11 @@ public class TcpConnectionRequestDiscoveryMessage
implements DiscoveryCustomMess
throw new UnsupportedOperationException("createDiscoCache");
}
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return 23;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpConnectionRequestDiscoveryMessage.class, this);
