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 Mon, 09 Nov 2015 08:36:18 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 0ef5769d4 -> 121d1e0d8


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

Branch: refs/heads/ignite-1758
Commit: 121d1e0d89e66be293543e709985f130125aeb8f
Parents: 0ef5769
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Nov 9 11:36:09 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Nov 9 11:36:09 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java     | 9 ++++++---
 .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java    | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/121d1e0d/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 9084713..810690f 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
@@ -48,7 +48,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -2151,7 +2150,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                     log.debug("Processing message [cls=" + msg.getClass().getSimpleName()
+ ", id=" + msg.id() + ']');
 
                 if (debugMode)
-                    debugLog(msg, "Processing message [cls=" + msg.getClass().getSimpleName()
+ ", id=" + msg.id() + ']');
+                    debugLog(msg, "Processing message [msg=" + msg + ", id=" + msg.id() +
']');
 
                 spi.stats.onMessageProcessingStarted(msg);
 
@@ -2554,7 +2553,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                                             ", res=" + res + ']');
 
                                     if (debugMode)
-                                        debugLog(pendingMsg, "Pending message has been sent
to next node [msgId=" + msg.id() +
+                                        debugLog(pendingMsg, "Pending message has been sent
to next node [msg=" + msg +
                                             ", pendingMsgId=" + pendingMsg.id() + ", next="
+ next.id() +
                                             ", res=" + res + ']');
 
@@ -5657,6 +5656,10 @@ class ServerImpl extends TcpDiscoveryImpl {
                 log.debug("Message has been added to queue: " + msg);
         }
 
+        void addFirst(TcpDiscoveryAbstractMessage msg) {
+            queue.addFirst(msg);
+        }
+
         /**
          * @param msg Message.
          */

http://git-wip-us.apache.org/repos/asf/ignite/blob/121d1e0d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 72549b3..70678d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -113,10 +113,12 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest
{
         if (client())
             cfg.setClientMode(true);
 
+        cfg.setFailureDetectionTimeout(30_000);
+
         cfg.setDiscoverySpi(new TcpDiscoverySpi().
             setIpFinder(ipFinder).
             setJoinTimeout(60_000).
-            setNetworkTimeout(10_000));
+            setNetworkTimeout(30_000));
 
         int[] evts = {EVT_NODE_FAILED, EVT_NODE_LEFT};
 


Mime
View raw message