ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1758 debug
Date Thu, 05 Nov 2015 08:55:28 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 1857ea526 -> eaa011476


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/eaa01147
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eaa01147
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eaa01147

Branch: refs/heads/ignite-1758
Commit: eaa011476adaf1d191cd36259934fcac366d6867
Parents: 1857ea5
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Nov 5 11:42:50 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Nov 5 11:55:21 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 21 +++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/eaa01147/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 b70f8aa..da5debf 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
@@ -3119,6 +3119,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                 nodeAddedMsg.client(msg.client());
 
+                debugLog(nodeAddedMsg, "Process join, internalOrder=" + node.internalOrder()
+ ", msg=" + nodeAddedMsg);
+
                 processNodeAddedMessage(nodeAddedMsg);
 
                 if (nodeAddedMsg.verified())
@@ -3310,6 +3312,8 @@ class ServerImpl extends TcpDiscoveryImpl {
                     TcpDiscoveryNodeAddFinishedMessage addFinishMsg = new TcpDiscoveryNodeAddFinishedMessage(locNodeId,
                         node.id());
 
+                    debugLog(addFinishMsg, "Created finish message: " + addFinishMsg);
+
                     if (node.isClient()) {
                         addFinishMsg.clientDiscoData(msg.oldNodesDiscoveryData());
 
@@ -3568,8 +3572,11 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                     return;
                 }
-                else
+                else {
+                    debugLog(msg, "Coordinator incremented topVer=" + ring.topologyVersion()
+ " " + msg);
+
                     msg.topologyVersion(ring.incrementTopologyVersion());
+                }
 
                 msg.verify(locNodeId);
             }
@@ -3644,6 +3651,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                 node.order(topVer);
 
+                debugLog(msg, "Node set topVer=" + topVer + " " + msg);
+
                 synchronized (mux) {
                     spiState = CONNECTED;
 
@@ -3761,6 +3770,8 @@ class ServerImpl extends TcpDiscoveryImpl {
                     topVer = ring.incrementTopologyVersion();
 
                     msg.topologyVersion(topVer);
+
+                    debugLog(msg, "Coordinator incremented topVer=" + ring.topologyVersion()
+ " " + msg);
                 }
                 else {
                     topVer = msg.topologyVersion();
@@ -3769,6 +3780,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                     boolean b = ring.topologyVersion(topVer);
 
+                    debugLog(msg, "Node set topVer=" + topVer + " " + b + " " + msg);
+
                     assert b : "Topology version has not been updated: [ring=" + ring + ",
msg=" + msg +
                         ", lastMsg=" + lastMsg + ", spiState=" + spiStateCopy() + ']';
 
@@ -3944,6 +3957,8 @@ class ServerImpl extends TcpDiscoveryImpl {
                     topVer = ring.incrementTopologyVersion();
 
                     msg.topologyVersion(topVer);
+
+                    debugLog(msg, "Coordinator incremented topVer=" + ring.topologyVersion()
+ " " + msg);
                 }
                 else {
                     topVer = msg.topologyVersion();
@@ -3952,6 +3967,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                     boolean b = ring.topologyVersion(topVer);
 
+                    debugLog(msg, "Node set topVer=" + topVer + " " + b + " " + msg);
+
                     assert b : "Topology version has not been updated: [ring=" + ring + ",
msg=" + msg +
                         ", lastMsg=" + lastMsg + ", spiState=" + spiStateCopy() + ']';
 
@@ -4234,6 +4251,8 @@ class ServerImpl extends TcpDiscoveryImpl {
                                         TcpDiscoveryNodeFailedMessage nodeFailedMsg = new
TcpDiscoveryNodeFailedMessage(
                                             locNodeId, clientNode.id(), clientNode.internalOrder());
 
+                                        debugLog(nodeFailedMsg, "Created failed message="
+ nodeFailedMsg);
+
                                         processNodeFailedMessage(nodeFailedMsg);
 
                                         if (nodeFailedMsg.verified())


Mime
View raw message