You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ir...@apache.org on 2019/03/04 10:58:33 UTC
[ignite] branch master updated (7100b05 -> 436d601)
This is an automated email from the ASF dual-hosted git repository.
irakov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 7100b05 How To Document reference was added
new 0f10617 IGNITE-11322 [USABILITY] Extend Node FAILED message by add consistentId if it exist - Fixes #6180.
new 436d601 IGNITE-11199 Add extra logging for client-server connections in TCP discovery - Fixes #6048.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 12 +++++++++++-
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 +++++-------
.../ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 1 +
.../internal/managers/IgniteDiagnosticMessagesTest.java | 2 ++
4 files changed, 19 insertions(+), 8 deletions(-)
[ignite] 01/02: IGNITE-11322 [USABILITY] Extend Node FAILED message
by add consistentId if it exist - Fixes #6180.
Posted by ir...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 0f10617954da2972ef6e2c4e11751ab31c6d53a7
Author: Andrey Kalinin <pr...@gmail.com>
AuthorDate: Mon Mar 4 02:03:16 2019 +0300
IGNITE-11322 [USABILITY] Extend Node FAILED message by add consistentId if it exist - Fixes #6180.
Signed-off-by: Ivan Rakov <ir...@apache.org>
---
.../org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 1 +
.../apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java | 2 ++
2 files changed, 3 insertions(+)
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index ee01bfb..7db5036 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -66,6 +66,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Ignite
private UUID id;
/** Consistent ID. */
+ @GridToStringInclude
private Object consistentId;
/** Node attributes. */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
index 48a7bfc..a98505c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
@@ -185,6 +185,8 @@ public class IgniteDiagnosticMessagesTest extends GridCommonAbstractTest {
GridStringLogger strLog = this.strLog = new GridStringLogger();
+ strLog.logLength(1024 * 100);
+
startGrid(1);
awaitPartitionMapExchange();
[ignite] 02/02: IGNITE-11199 Add extra logging for client-server
connections in TCP discovery - Fixes #6048.
Posted by ir...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 436d601f81132629f98bdb14860543ac6d427c38
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) {