IGNITE-27310 Use MessageSerializer for TcpDiscoveryDiscardMessage and TcpDiscoveryLoopbackProblemMessage

Author: wernerdv

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -20,13 +20,17 @@
 import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer;
+import org.apache.ignite.internal.codegen.TcpDiscoveryDiscardMessageSerializer;
+import org.apache.ignite.internal.codegen.TcpDiscoveryLoopbackProblemMessageSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer;
 import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer;
 import org.apache.ignite.plugin.extensions.communication.MessageFactory;
 import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
 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.TcpDiscoveryDiscardMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
 import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
 
@@ -39,5 +43,7 @@ public class DiscoveryMessageFactory implements MessageFactoryProvider {
         factory.register((short)2, TcpDiscoveryPingResponse::new, new TcpDiscoveryPingResponseSerializer());
         factory.register((short)3, TcpDiscoveryClientPingRequest::new, new TcpDiscoveryClientPingRequestSerializer());
         factory.register((short)4, TcpDiscoveryClientPingResponse::new, new TcpDiscoveryClientPingResponseSerializer());
+        factory.register((short)5, TcpDiscoveryDiscardMessage::new, new TcpDiscoveryDiscardMessageSerializer());
+        factory.register((short)6, TcpDiscoveryLoopbackProblemMessage::new, new TcpDiscoveryLoopbackProblemMessageSerializer());
     }
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java

@@ -6110,7 +6110,7 @@ private void processMetricsUpdateMessage(TcpDiscoveryMetricsUpdateMessage msg) {
         private void processDiscardMessage(TcpDiscoveryDiscardMessage msg) {
             assert msg != null;
 
-            IgniteUuid msgId = msg.msgId();
+            IgniteUuid msgId = msg.messageId();
 
             assert msgId != null;
 

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java

@@ -28,12 +28,13 @@
 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;
 
 /**
  * Base class to implement discovery messages.
  */
-public abstract class TcpDiscoveryAbstractMessage implements Serializable {
+public abstract class TcpDiscoveryAbstractMessage implements Serializable, Message {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -337,4 +338,10 @@ else if (obj instanceof TcpDiscoveryAbstractMessage)
     @Override public String toString() {
         return S.toString(TcpDiscoveryAbstractMessage.class, this, "isClient", getFlag(CLIENT_FLAG_POS));
     }
+
+    /** {@inheritDoc} */
+    // TODO: Remove the method after all inheriting messages switch to using MessageSerializer (IGNITE-25883).
+    @Override public short directType() {
+        return -1;
+    }
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java

@@ -20,12 +20,11 @@
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  * Message telling joining node that it failed coordinator's validation check.
  */
-public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage implements Message {
+public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage {
     /** */
     private static final long serialVersionUID = 0L;
 

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java

@@ -20,13 +20,12 @@
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage implements Message {
+public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage {
     /** */
     private static final long serialVersionUID = 0L;
 

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java

@@ -20,13 +20,12 @@
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage implements Message {
+public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage {
     /** */
     private static final long serialVersionUID = 0L;
 

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java

@@ -18,6 +18,7 @@
 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;
 
@@ -30,10 +31,17 @@ public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage {
     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 +62,17 @@ public TcpDiscoveryDiscardMessage(UUID creatorNodeId, IgniteUuid msgId, boolean
      *
      * @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 +82,20 @@ public boolean customMessageDiscard() {
         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 5;
+    }
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java

@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 import java.util.UUID;
+import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
@@ -30,10 +31,17 @@ public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMess
     private static final long serialVersionUID = 0L;
 
     /** Remote node addresses. */
-    private final Collection<String> addrs;
+    @Order(value = 5, method = "addresses")
+    private Collection<String> addrs;
 
     /** Remote node host names. */
-    private final Collection<String> hostNames;
+    @Order(6)
+    private Collection<String> hostNames;
+
+    /** */
+    public TcpDiscoveryLoopbackProblemMessage() {
+        // No-op.
+    }
 
     /**
      * Constructor.
@@ -57,15 +65,34 @@ public Collection<String> addresses() {
         return addrs;
     }
 
+    /**
+     * @param addrs Remote node addresses.
+     */
+    public void addresses(Collection<String> addrs) {
+        this.addrs = addrs;
+    }
+
     /**
      * @return Remote node host names.
      */
     public Collection<String> hostNames() {
         return hostNames;
     }
 
+    /**
+     * @param hostNames Remote node host names.
+     */
+    public void hostNames(Collection<String> hostNames) {
+        this.hostNames = hostNames;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString());
     }
+
+    /** {@inheritDoc} */
+    @Override public short directType() {
+        return 6;
+    }
 }

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java

@@ -20,13 +20,12 @@
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Ping request.
  */
-public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage implements Message {
+public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage {
     /** */
     private static final long serialVersionUID = 0L;
 

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java

@@ -20,12 +20,11 @@
 import java.util.UUID;
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.plugin.extensions.communication.Message;
 
 /**
  * Ping response.
  */
-public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage implements Message {
+public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage {
     /** */
     private static final long serialVersionUID = 0L;