GG-22143 senderNodeId is absent in StatusCheckMessage

gridgain · Aug 6, 2019 · 449bbdf · 449bbdf
1 parent e3dbe4c
commit 449bbdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 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
@@ -643,7 +643,7 @@ else if (log.isInfoEnabled()) {
      * @return <code>null</code> if <code>creatorNode</code> is null and we cannot retrieve creator node from ring
      * by <code>creatorNodeId</code>, and new instance of {@link TcpDiscoveryStatusCheckMessage} in other cases.
      */
-    private  @Nullable TcpDiscoveryStatusCheckMessage createTcpDiscoveryStatusCheckMessage(
+    private @Nullable TcpDiscoveryStatusCheckMessage createTcpDiscoveryStatusCheckMessage(
         @Nullable TcpDiscoveryNode creatorNode,
         UUID creatorNodeId,
         UUID failedNodeId
@@ -5595,10 +5595,11 @@ private void processStatusCheckMessage(final TcpDiscoveryStatusCheckMessage msg)
                                             "[recipient=" + msg0.creatorNodeId() + ", status=" + msg0.status() + ']', e);
                                     }
                                     else if (!spi.isNodeStopping0()) {
-                                        if (pingNode(msg0.creatorNode()))
+                                        if (pingNode(msg0.creatorNodeId())) {
                                             // Node exists and accepts incoming connections.
                                             U.error(log, "Failed to respond to status check message [recipient=" +
                                                 msg0.creatorNodeId() + ", status=" + msg0.status() + ']', e);
+                                        }
                                         else if (log.isDebugEnabled()) {
                                             log.debug("Failed to respond to status check message (did the node stop?)" +
                                                 "[recipient=" + msg0.creatorNodeId() +

diff --git a/...ain/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/...ain/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java
@@ -22,6 +22,7 @@
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Message sent by node to its next to ensure that next node and
@@ -87,7 +88,7 @@ public TcpDiscoveryStatusCheckMessage(UUID creatorNodeId, Collection<InetSocketA
      *
      * @return Creator node.
      */
-    public TcpDiscoveryNode creatorNode() {
+    public @Nullable TcpDiscoveryNode creatorNode() {
         return creatorNode;
     }