You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/21 09:53:25 UTC
[26/28] incubator-ignite git commit: IGNITE-709 Fix bugs on merge.
IGNITE-709 Fix bugs on merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/10c73632
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/10c73632
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/10c73632
Branch: refs/heads/ignite-23
Commit: 10c73632a510d35ee0a8247618ed9ef67b8a2750
Parents: 9856334
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 20 21:04:58 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 20 21:04:58 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 ++--
.../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10c73632/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index f80f00f..bccbcd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -174,8 +174,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
/** Default socket operations timeout in milliseconds (value is <tt>200ms</tt>). */
public static final long DFLT_SOCK_TIMEOUT = 200;
- /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>200ms</tt>). */
- public static final long DFLT_ACK_TIMEOUT = 200;
+ /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>50ms</tt>). */
+ public static final long DFLT_ACK_TIMEOUT = 50;
/** Node attribute that is mapped to node's external addresses (value is <tt>disc.tcp.ext-addrs</tt>). */
public static final String ATTR_EXT_ADDRS = "disc.tcp.ext-addrs";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10c73632/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index d0990f0..d922761 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -49,15 +49,9 @@ public abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements
/** Default port to listen (value is <tt>47500</tt>). */
public static final int DFLT_PORT = 47500;
- /** Default network timeout in milliseconds (value is <tt>5000ms</tt>). */
- public static final long DFLT_NETWORK_TIMEOUT = 5000;
-
/** Default timeout for joining topology (value is <tt>0</tt>). */
public static final long DFLT_JOIN_TIMEOUT = 0;
- /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>50ms</tt>). */
- public static final long DFLT_ACK_TIMEOUT = 50;
-
/** Default network timeout in milliseconds (value is <tt>5000ms</tt>). */
public static final long DFLT_NETWORK_TIMEOUT = 5000;