ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [1/2] incubator-ignite git commit: # IGNITE-709 Remove test code.
Date Sat, 02 May 2015 15:32:47 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709_2 4903dcec4 -> 5fc945e1a


# IGNITE-709 Remove test code.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98aa2f63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98aa2f63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98aa2f63

Branch: refs/heads/ignite-709_2
Commit: 98aa2f6303a6d19f2af706fe8e4748ba8c188f78
Parents: 4903dce
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Sat May 2 18:15:12 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Sat May 2 18:15:12 2015 +0300

----------------------------------------------------------------------
 .../spi/discovery/tcp/TcpClientDiscoverySpi.java    | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/98aa2f63/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index c6badf2..0ac67ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -311,9 +311,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
             msgWorker.addMessage(SPI_STOP);
 
             try {
-                if (!leaveLatch.await(10000, MILLISECONDS)) {
-                    System.out.println("leaveLatch Timeout!!!!");
-
+                if (!leaveLatch.await(netTimeout, MILLISECONDS)) {
                     if (log.isDebugEnabled())
                         U.error(log, "Failed to left node: timeout [nodeId=" + locNode +
']');
                 }
@@ -634,8 +632,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
 
                             try {
                                 msg = marsh.unmarshal(in, U.gridClassLoader());
-
-                                System.out.println("TcpClientDiscoverySpi.SocketReader: read:
" + msg);
                             }
                             catch (IgniteCheckedException e) {
                                 if (log.isDebugEnabled())
@@ -674,8 +670,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
                         }
                     }
                     catch (IOException e) {
-                        System.out.println("TcpClientDiscoverySpi.SocketReader: IOException:
" + e);
-
                         msgWorker.addMessage(new SocketClosedMessage(sock));
 
                         if (log.isDebugEnabled())
@@ -683,8 +677,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
                     }
                 }
                 finally {
-                    System.out.println("TcpClientDiscoverySpi.SocketReader: Closed");
-
                     U.closeQuiet(sock);
 
                     synchronized (mux) {
@@ -781,8 +773,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
                     msg = null;
                 }
                 catch (IOException e) {
-                    System.out.println("TcpClientDiscoverSpi.SocketWriter: IOException: "
+ e);
-
                     if (log.isDebugEnabled())
                         U.error(log, "Failed to send node left message (will stop anyway)
[sock=" + sock + ']', e);
 
@@ -794,8 +784,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
                     }
                 }
                 catch (IgniteCheckedException e) {
-                    System.out.println("TcpClientDiscoverSpi.SocketWriter: ICException: "
+ e);
-
                     log.error("Failed to send message: " + msg, e);
 
                     msg = null;
@@ -927,8 +915,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
                 while (true) {
                     Object msg = queue.take();
 
-                    System.out.println("TcpClientDiscoverySpi.MessageWorker: process: " +
msg);
-
                     if (msg == JOIN_TIMEOUT) {
                         if (joinLatch.getCount() > 0) {
                             joinErr = new IgniteSpiException("Join process timed out [sock="
+ sock +


Mime
View raw message