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/05 08:56:50 UTC
[04/50] incubator-ignite git commit: timeouts for faster failure
detection
timeouts for faster failure detection
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11f4957f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11f4957f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11f4957f
Branch: refs/heads/ignite-157-2
Commit: 11f4957f90edde2369afe0db8e221f27b53d11b5
Parents: 51dc6aa
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Apr 28 13:56:06 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Apr 28 13:56:06 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ----
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 ----
.../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 8 ++++----
3 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11f4957f/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 e3182c4..4196306 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
@@ -226,10 +226,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
if (netTimeout < 3000)
U.warn(log, "Network timeout is too low (at least 3000 ms recommended): " + netTimeout);
- // Warn on odd heartbeat frequency.
- if (hbFreq < 2000)
- U.warn(log, "Heartbeat frequency is too high (at least 2000 ms recommended): " + hbFreq);
-
registerMBean(gridName, this, TcpClientDiscoverySpiMBean.class);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11f4957f/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 6a5eb25..5bc9184 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
@@ -853,10 +853,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
if (netTimeout < 3000)
U.warn(log, "Network timeout is too low (at least 3000 ms recommended): " + netTimeout);
- // Warn on odd heartbeat frequency.
- if (hbFreq < 2000)
- U.warn(log, "Heartbeat frequency is too high (at least 2000 ms recommended): " + hbFreq);
-
registerMBean(gridName, this, TcpDiscoverySpiMBean.class);
if (ipFinder instanceof TcpDiscoveryMulticastIpFinder) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11f4957f/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 98e048d..6f41cb0 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
@@ -51,8 +51,8 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
/** Default port to listen (value is <tt>47500</tt>). */
public static final int DFLT_PORT = 47500;
- /** Default socket operations timeout in milliseconds (value is <tt>2,000ms</tt>). */
- public static final long DFLT_SOCK_TIMEOUT = 2000;
+ /** 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>5,000ms</tt>). */
public static final long DFLT_ACK_TIMEOUT = 5000;
@@ -63,8 +63,8 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
/** Default value for thread priority (value is <tt>10</tt>). */
public static final int DFLT_THREAD_PRI = 10;
- /** Default heartbeat messages issuing frequency (value is <tt>2,000ms</tt>). */
- public static final long DFLT_HEARTBEAT_FREQ = 2000;
+ /** Default heartbeat messages issuing frequency (value is <tt>500ms</tt>). */
+ public static final long DFLT_HEARTBEAT_FREQ = 500;
/** Default size of topology snapshots history. */
public static final int DFLT_TOP_HISTORY_SIZE = 1000;