IGNITE-11058 Reduce the size of discovery pending message history - F…

…ixes apache#6161. Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com> (cherry picked from commit 01e601d)
gridgain · Feb 22, 2019 · 627919f · 627919f
1 parent 9af34f6
commit 627919f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
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
@@ -2238,6 +2238,8 @@ private class EnsuredMessageHistory {
         void add(TcpDiscoveryAbstractMessage msg) {
             assert spi.ensured(msg) && msg.verified() : msg;
 
+            assert U.hasDeclaredAnnotation(msg, TcpDiscoveryRedirectToClient.class) : msg;
+
             if (msg instanceof TcpDiscoveryNodeAddedMessage) {
                 TcpDiscoveryNodeAddedMessage addedMsg =
                     new TcpDiscoveryNodeAddedMessage((TcpDiscoveryNodeAddedMessage)msg);
@@ -2299,6 +2301,14 @@ else if (msg instanceof TcpDiscoveryNodeLeftMessage)
                 clearClientAddFinished(msg.creatorNodeId());
             else if (msg instanceof TcpDiscoveryNodeFailedMessage)
                 clearClientAddFinished(((TcpDiscoveryNodeFailedMessage)msg).failedNodeId());
+            else if (msg instanceof TcpDiscoveryCustomEventMessage) {
+                TcpDiscoveryCustomEventMessage msg0 = (TcpDiscoveryCustomEventMessage)msg;
+
+                msg = new TcpDiscoveryCustomEventMessage(msg0);
+
+                // We shoulgn't store deserialized message in the queue because of msg is transient.
+                ((TcpDiscoveryCustomEventMessage)msg).clearMessage();
+            }
 
             synchronized (msgs) {
                 msgs.add(msg);

diff --git a/...ain/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/...ain/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -54,6 +54,24 @@ public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, @Nullable DiscoverySpi
         this.msgBytes = msgBytes;
     }
 
+    /**
+     * Copy constructor.
+     * @param msg Message.
+     */
+    public TcpDiscoveryCustomEventMessage(TcpDiscoveryCustomEventMessage msg) {
+        super(msg);
+
+        this.msgBytes = msg.msgBytes;
+        this.msg = msg.msg;
+    }
+
+    /**
+     * Clear deserialized form of wrapped message.
+     */
+    public void clearMessage() {
+        msg = null;
+    }
+
     /**
      * @return Serialized message.
      */