You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/03/04 12:46:38 UTC

[ignite] 02/04: IGNITE-11199 Add extra logging for client-server connections in TCP discovery - Fixes #6048.

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ignite-11461-java11
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit 9e0aabc2d1714828c70c9c95d9b50da63aa8fed6
Author: Andrey Kalinin <pr...@gmail.com>
AuthorDate: Mon Mar 4 02:11:28 2019 +0300

    IGNITE-11199 Add extra logging for client-server connections in TCP discovery - Fixes #6048.
    
    Signed-off-by: Ivan Rakov <ir...@apache.org>
---
 .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 12 +++++++++++-
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 +++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index af2f75c..9a6eae3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -1917,7 +1917,7 @@ class ClientImpl extends TcpDiscoveryImpl {
                                     joinError(err);
 
                                 cancel();
-                                
+
                                 break;
                             }
                         }
@@ -2192,6 +2192,16 @@ class ClientImpl extends TcpDiscoveryImpl {
             if (spi.getSpiContext().isStopping())
                 return;
 
+            if (log.isInfoEnabled()) {
+                for (ClusterNode node : getRemoteNodes()) {
+                    if (node.id().equals(locNode.clientRouterNodeId())) {
+                        log.info("Router node: " + node);
+
+                        break;
+                    }
+                }
+            }
+
             if (getLocalNodeId().equals(msg.nodeId())) {
                 if (joining()) {
                     DiscoveryDataPacket dataContainer = msg.clientDiscoData();
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 df863ce..5c777ab 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
@@ -6480,13 +6480,11 @@ class ServerImpl extends TcpDiscoveryImpl {
                         clientMsgWrk = clientMsgWrk0;
                     }
 
-                    if (log.isDebugEnabled())
-                        log.debug("Initialized connection with remote node [nodeId=" + nodeId +
-                            ", client=" + req.client() + ']');
-
-                    if (debugMode) {
-                        debugLog(msg, "Initialized connection with remote node [nodeId=" + nodeId +
-                            ", client=" + req.client() + ']');
+                    if (log.isInfoEnabled()) {
+                        log.info("Initialized connection with remote " +
+                            (req.client() ? "client" : "server") +
+                            " node [nodeId=" + nodeId +
+                            ", rmtAddr=" + sock.getRemoteSocketAddress() + ']');
                     }
                 }
                 catch (IOException e) {