Repository: ignite Updated Branches: refs/heads/ignite-1758 63cab5d9d -> d2f948d93
ignite-1758 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2f948d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2f948d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2f948d9 Branch: refs/heads/ignite-1758 Commit: d2f948d9324d354a40b14325c676e5ac808e30ce Parents: 63cab5d Author: sboikov <sboi...@gridgain.com> Authored: Thu Nov 5 17:22:51 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Nov 5 17:22:51 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 5 ++++- .../spi/discovery/tcp/internal/TcpDiscoveryNode.java | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f948d9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- 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 638ccb4..89669b5 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 @@ -2200,7 +2200,10 @@ class ServerImpl extends TcpDiscoveryImpl { e.printStackTrace(); synchronized (System.out) { - System.out.println("Error: " + e + " " + Thread.currentThread().getName() + ", msg=" + msg); + System.out.println("Error [err=" + e + + ", thread=" + Thread.currentThread().getName() + + ", msg=" + msg + + ", ring= " + ring + ']'); debugLog(msg, "Error: " + e); http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f948d9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java ---------------------------------------------------------------------- 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 362fa2f..85dff47 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 @@ -71,18 +71,19 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste private Map<String, Object> attrs; /** Internal discovery addresses as strings. */ - @GridToStringInclude + @GridToStringExclude private Collection<String> addrs; /** Internal discovery host names as strings. */ + @GridToStringExclude private Collection<String> hostNames; /** */ - @GridToStringInclude + @GridToStringExclude private Collection<InetSocketAddress> sockAddrs; /** */ - @GridToStringInclude + @GridToStringExclude private int discPort; /** Node metrics. */ @@ -104,6 +105,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste private volatile long lastUpdateTime = U.currentTimeMillis(); /** The most recent time when node exchanged a message with a remote node. */ + @GridToStringExclude private volatile long lastExchangeTime = U.currentTimeMillis(); /** Metrics provider (transient). */ @@ -111,13 +113,13 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste private DiscoveryMetricsProvider metricsProvider; /** Visible flag (transient). */ - @GridToStringExclude private boolean visible; /** Grid local node flag (transient). */ private boolean loc; /** Version. */ + @GridToStringExclude private IgniteProductVersion ver; /** Alive check (used by clients). */
