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 2017/04/26 12:45:08 UTC
[1/3] ignite git commit: ignite-4799 TcpDiscoverySpi: removed
missedHeartbeats properties,
heartbeatFrequency (instead use IgiteConfiguration.metricsUpdateFrequency).
Added IgiteConfiguration.clientFailureDetectionTimeout.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.0 c829aacaf -> 6998785a8
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index 524fdcf..4b61199 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -73,7 +73,6 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.Nullable;
-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
@@ -142,7 +141,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
private boolean longSockTimeouts;
/** */
- private int maxMissedClientHbs = TcpDiscoverySpi.DFLT_MAX_MISSED_CLIENT_HEARTBEATS;
+ private long clientFailureDetectionTimeout = 1000;
/** */
private IgniteInClosure2X<TcpDiscoveryAbstractMessage, Socket> afterWrite;
@@ -154,9 +153,9 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- TcpDiscoverySpi disco = getDiscoverySpi();
+ cfg.setClientFailureDetectionTimeout(clientFailureDetectionTimeout());
- disco.setMaxMissedClientHeartbeats(maxMissedClientHbs);
+ TcpDiscoverySpi disco = getDiscoverySpi();
if (igniteInstanceName.startsWith("server"))
disco.setIpFinder(IP_FINDER);
@@ -269,12 +268,21 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
}
/**
+ * Gets client failure detection timeout to use.
+ *
+ * @return Client failure detection timeout.
+ */
+ protected long clientFailureDetectionTimeout() {
+ return clientFailureDetectionTimeout;
+ }
+
+ /**
* Gets failure detection timeout to use.
*
* @return Failure detection timeout.
*/
protected long failureDetectionTimeout() {
- return 0;
+ return 500;
}
/**
@@ -301,6 +309,21 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ public void testClientToClientPing() throws Exception {
+ startGrid("server-p1");
+ Ignite c1 = startGrid("client-p1");
+
+ startGrid("server-p2");
+ Ignite c2 = startGrid("client-p2");
+
+ boolean res = ((IgniteEx)c1).context().discovery().pingNode(c2.cluster().localNode().id());
+
+ assertTrue(res);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testClientNodeJoin() throws Exception {
startServerNodes(3);
startClientNodes(3);
@@ -358,8 +381,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
failClient(2);
- await(srvFailedLatch);
- await(clientFailedLatch);
+ awaitClient(srvFailedLatch);
+ awaitClient(clientFailedLatch);
checkNodes(3, 2);
}
@@ -588,7 +611,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClientReconnectTopologyChange1() throws Exception {
- maxMissedClientHbs = 100;
+ clientFailureDetectionTimeout = 100000;
clientsPerSrv = 1;
@@ -632,7 +655,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClientReconnectTopologyChange2() throws Exception {
- maxMissedClientHbs = 100;
+ clientFailureDetectionTimeout = 100000;
clientsPerSrv = 1;
@@ -744,8 +767,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
failServer(2);
- await(srvFailedLatch);
- await(clientFailedLatch);
+ awaitClient(srvFailedLatch);
+ awaitClient(clientFailedLatch);
await(client2StoppedLatch);
@@ -796,6 +819,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
}
/**
+ * Test that server not fire client failure event after failure detection timeout.
+ *
* @throws Exception If failed.
*/
public void testClientNodeFailOneServer() throws Exception {
@@ -843,8 +868,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
failClient(1);
failServer(1);
- await(srvFailedLatch);
- await(clientFailedLatch);
+ awaitClient(srvFailedLatch);
+ awaitClient(clientFailedLatch);
checkNodes(1, 1);
}
@@ -1631,7 +1656,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
assertFalse(err.get());
if (!failSrv) {
- await(srvFailedLatch);
+ awaitClient(srvFailedLatch);
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -1721,7 +1746,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
public void testDisconnectAfterNetworkTimeout() throws Exception {
netTimeout = 5000;
joinTimeout = 60_000;
- maxMissedClientHbs = 2;
+ clientFailureDetectionTimeout = 2000;
startServerNodes(1);
@@ -1774,7 +1799,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
clientSpi.brakeConnection();
- assertTrue(disconnectLatch.await(awaitTime(), MILLISECONDS));
+ assertTrue(disconnectLatch.await(awaitClientTime(), MILLISECONDS));
log.info("Fail client connection2.");
@@ -1793,7 +1818,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
@Override public boolean apply() {
return srv.cluster().nodes().size() == 2;
}
- }, awaitTime());
+ }, awaitClientTime());
checkNodes(1, 1);
@@ -2076,6 +2101,15 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
}
/**
+ * @param latch Latch.
+ * @throws InterruptedException If interrupted.
+ */
+ private void awaitClient(CountDownLatch latch) throws InterruptedException {
+ assertTrue("Failed to wait for latch, latch count: " + latch.getCount(),
+ latch.await(awaitClientTime(), MILLISECONDS));
+ }
+
+ /**
* Time to wait for operation completion.
*
* @return Time in milliseconds.
@@ -2085,6 +2119,15 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
}
/**
+ * Time to wait for client operation completion.
+ *
+ * @return Time in milliseconds.
+ */
+ protected long awaitClientTime() {
+ return 20_000;
+ }
+
+ /**
*/
private static class MessageListener implements IgniteBiPredicate<UUID, Object> {
/** */
@@ -2267,7 +2310,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
IgniteSpiOperationTimeoutHelper timeoutHelper) throws IOException, IgniteSpiOperationTimeoutException {
waitFor(openSockLock);
- return super.openSocket(sockAddr, new IgniteSpiOperationTimeoutHelper(this));
+ return super.openSocket(sockAddr, timeoutHelper);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index c6d1147..f8f9baf 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -78,7 +78,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMultic
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage;
@@ -154,16 +154,14 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
spi.setNetworkTimeout(2500);
- spi.setHeartbeatFrequency(1000);
-
- spi.setMaxMissedHeartbeats(3);
-
spi.setIpFinderCleanFrequency(5000);
spi.setJoinTimeout(5000);
cfg.setDiscoverySpi(spi);
+ cfg.setFailureDetectionTimeout(7500);
+
if (ccfgs != null)
cfg.setCacheConfiguration(ccfgs);
else
@@ -173,12 +171,16 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
cfg.setIncludeProperties();
+ cfg.setMetricsUpdateFrequency(1000);
+
if (!igniteInstanceName.contains("LoopbackProblemTest"))
cfg.setLocalHost("127.0.0.1");
if (igniteInstanceName.contains("testFailureDetectionOnNodePing")) {
spi.setReconnectCount(1); // To make test faster: on Windows 1 connect takes 1 second.
- spi.setHeartbeatFrequency(40000);
+
+ cfg.setMetricsUpdateFrequency(40000);
+ cfg.setClientFailureDetectionTimeout(41000);
}
cfg.setConnectorConfiguration(null);
@@ -433,7 +435,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
assertFalse("Ping is ok for node " + failedNodeId + ", but had to fail.", res);
- // Heartbeat interval is 40 seconds, but we should detect node failure faster.
+ // Metrics update interval is 40 seconds, but we should detect node failure faster.
assert cnt.await(7, SECONDS);
}
@@ -2252,7 +2254,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
long timeout) throws IOException, IgniteCheckedException {
boolean add = msgIds.add(msg.id());
- if (checkDuplicates && !add && !(msg instanceof TcpDiscoveryHeartbeatMessage)) {
+ if (checkDuplicates && !add && !(msg instanceof TcpDiscoveryMetricsUpdateMessage)) {
log.error("Send duplicated message: " + msg);
failed = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java
index c349e5f..ea1bb27 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiConfigSelfTest.java
@@ -40,9 +40,7 @@ public class TcpDiscoverySpiConfigSelfTest extends GridSpiAbstractConfigTest<Tcp
checkNegativeSpiProperty(new TcpDiscoverySpi(), "ackTimeout", 0);
checkNegativeSpiProperty(new TcpDiscoverySpi(), "maxAckTimeout", 0);
checkNegativeSpiProperty(new TcpDiscoverySpi(), "reconnectCount", 0);
- checkNegativeSpiProperty(new TcpDiscoverySpi(), "heartbeatFrequency", 0);
checkNegativeSpiProperty(new TcpDiscoverySpi(), "threadPriority", -1);
- checkNegativeSpiProperty(new TcpDiscoverySpi(), "maxMissedHeartbeats", 0);
checkNegativeSpiProperty(new TcpDiscoverySpi(), "statisticsPrintFrequency", 0);
}
@@ -65,4 +63,4 @@ public class TcpDiscoverySpiConfigSelfTest extends GridSpiAbstractConfigTest<Tcp
stopAllGrids();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
index a218bcb..cb5e84b 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiFailureTimeoutSelfTest.java
@@ -24,7 +24,6 @@ import java.net.Socket;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.spi.IgniteSpiOperationTimeoutException;
import org.apache.ignite.spi.IgniteSpiOperationTimeoutHelper;
import org.apache.ignite.spi.discovery.AbstractDiscoverySelfTest;
@@ -93,6 +92,11 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
firstSpi().failureDetectionTimeout());
assertEquals(IgniteConfiguration.DFLT_FAILURE_DETECTION_TIMEOUT.longValue(),
secondSpi().failureDetectionTimeout());
+
+ assertEquals(IgniteConfiguration.DFLT_CLIENT_FAILURE_DETECTION_TIMEOUT.longValue(),
+ firstSpi().clientFailureDetectionTimeout());
+ assertEquals(IgniteConfiguration.DFLT_CLIENT_FAILURE_DETECTION_TIMEOUT.longValue(),
+ secondSpi().clientFailureDetectionTimeout());
}
/**
@@ -102,6 +106,7 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
for (int i = 2; i < spis.size(); i++) {
assertFalse(((TcpDiscoverySpi)spis.get(i)).failureDetectionTimeoutEnabled());
assertEquals(0, ((TcpDiscoverySpi)spis.get(i)).failureDetectionTimeout());
+ assertFalse(0 == ((TcpDiscoverySpi)spis.get(i)).clientFailureDetectionTimeout());
}
}
@@ -112,14 +117,14 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
try {
ClusterNode node = secondSpi().getLocalNode();
- firstSpi().openSocketTimeout = true;
+ firstSpi().openSockTimeout = true;
assertFalse(firstSpi().pingNode(node.id()));
assertTrue(firstSpi().validTimeout);
assertTrue(firstSpi().err.getMessage().equals("Timeout: openSocketTimeout"));
- firstSpi().openSocketTimeout = false;
- firstSpi().openSocketTimeoutWait = true;
+ firstSpi().openSockTimeout = false;
+ firstSpi().openSockTimeoutWait = true;
assertFalse(firstSpi().pingNode(node.id()));
assertTrue(firstSpi().validTimeout);
@@ -138,12 +143,12 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
try {
ClusterNode node = secondSpi().getLocalNode();
- firstSpi().writeToSocketTimeoutWait = true;
+ firstSpi().writeToSockTimeoutWait = true;
assertFalse(firstSpi().pingNode(node.id()));
assertTrue(firstSpi().validTimeout);
- firstSpi().writeToSocketTimeoutWait = false;
+ firstSpi().writeToSockTimeoutWait = false;
assertTrue(firstSpi().pingNode(node.id()));
assertTrue(firstSpi().validTimeout);
@@ -178,13 +183,13 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
assert nextSpi.connCheckStatusMsgCntReceived == 0;
- firstSpi().countConnCheckMsg = true;
- nextSpi.countConnCheckMsg = true;
+ firstSpi().cntConnCheckMsg = true;
+ nextSpi.cntConnCheckMsg = true;
Thread.sleep(firstSpi().failureDetectionTimeout());
- firstSpi().countConnCheckMsg = false;
- nextSpi.countConnCheckMsg = false;
+ firstSpi().cntConnCheckMsg = false;
+ nextSpi.cntConnCheckMsg = false;
int sent = firstSpi().connCheckStatusMsgCntSent;
int received = nextSpi.connCheckStatusMsgCntReceived;
@@ -224,16 +229,16 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
*/
private static class TestTcpDiscoverySpi extends TcpDiscoverySpi {
/** */
- private volatile boolean openSocketTimeout;
+ private volatile boolean openSockTimeout;
/** */
- private volatile boolean openSocketTimeoutWait;
+ private volatile boolean openSockTimeoutWait;
/** */
- private volatile boolean writeToSocketTimeoutWait;
+ private volatile boolean writeToSockTimeoutWait;
/** */
- private volatile boolean countConnCheckMsg;
+ private volatile boolean cntConnCheckMsg;
/** */
private volatile int connCheckStatusMsgCntSent;
@@ -253,11 +258,11 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
IgniteSpiOperationTimeoutHelper timeoutHelper)
throws IOException, IgniteSpiOperationTimeoutException {
- if (openSocketTimeout) {
+ if (openSockTimeout) {
err = new IgniteSpiOperationTimeoutException("Timeout: openSocketTimeout");
throw err;
}
- else if (openSocketTimeoutWait) {
+ else if (openSockTimeoutWait) {
long timeout = timeoutHelper.nextTimeoutChunk(0);
try {
@@ -291,7 +296,7 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
@Override protected void writeToSocket(Socket sock, OutputStream out, TcpDiscoveryAbstractMessage msg, long timeout)
throws IOException, IgniteCheckedException {
if (!(msg instanceof TcpDiscoveryPingRequest)) {
- if (countConnCheckMsg && msg instanceof TcpDiscoveryConnectionCheckMessage)
+ if (cntConnCheckMsg && msg instanceof TcpDiscoveryConnectionCheckMessage)
connCheckStatusMsgCntSent++;
super.writeToSocket(sock, out, msg, timeout);
@@ -305,7 +310,7 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
throw new IgniteCheckedException("Invalid timeout: " + timeout);
}
- if (writeToSocketTimeoutWait) {
+ if (writeToSockTimeoutWait) {
try {
Thread.sleep(timeout);
}
@@ -320,7 +325,7 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
/** {@inheritDoc} */
protected void writeToSocket(TcpDiscoveryAbstractMessage msg, Socket sock, int res, long timeout)
throws IOException {
- if (countConnCheckMsg && msg instanceof TcpDiscoveryConnectionCheckMessage)
+ if (cntConnCheckMsg && msg instanceof TcpDiscoveryConnectionCheckMessage)
connCheckStatusMsgCntReceived++;
super.writeToSocket(msg, sock, res, timeout);
@@ -330,14 +335,14 @@ public class TcpDiscoverySpiFailureTimeoutSelfTest extends AbstractDiscoverySelf
*
*/
private void resetState() {
- openSocketTimeout = false;
- openSocketTimeoutWait = false;
- writeToSocketTimeoutWait = false;
+ openSockTimeout = false;
+ openSockTimeoutWait = false;
+ writeToSockTimeoutWait = false;
err = null;
validTimeout = true;
connCheckStatusMsgCntSent = 0;
connCheckStatusMsgCntReceived = 0;
- countConnCheckMsg = false;
+ cntConnCheckMsg = false;
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 8a7150d..d080b54 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1467,19 +1467,19 @@ public abstract class GridAbstractTest extends TestCase {
TcpDiscoverySpi discoSpi = new TestTcpDiscoverySpi();
if (isDebug()) {
- discoSpi.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
cfg.setNetworkTimeout(Long.MAX_VALUE / 3);
}
else {
// Set network timeout to 10 sec to avoid unexpected p2p class loading errors.
cfg.setNetworkTimeout(10000);
- // Increase max missed heartbeats to avoid unexpected node fails.
- discoSpi.setMaxMissedHeartbeats(30);
+ // Increase failure detection timeoute to avoid unexpected node fails.
+ cfg.setFailureDetectionTimeout(300000);
}
- // Set heartbeat interval to 1 second to speed up tests.
- discoSpi.setHeartbeatFrequency(1000);
+ // Set metrics update interval to 1 second to speed up tests.
+ cfg.setMetricsUpdateFrequency(1000);
String mcastAddr = GridTestUtils.getNextMulticastGroup(getClass());
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
index cb781e0..429ff15 100644
--- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
+++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
@@ -208,7 +208,6 @@
<property name="bucketName" value="YOUR_BUCKET_NAME_IP_FINDER"/>
</bean>
</property>
- <property name="heartbeatFrequency" value="2000"/>
</bean>
</property>
-->
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs
index fd5822a..b409a5a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs
@@ -21,7 +21,6 @@ namespace Apache.Ignite.Core.Tests.Cache
using System.Threading;
using Apache.Ignite.Core.Cache;
using Apache.Ignite.Core.Cache.Configuration;
- using Apache.Ignite.Core.Discovery.Tcp;
using Apache.Ignite.Core.Impl;
using Apache.Ignite.Core.Impl.Cache;
using NUnit.Framework;
@@ -228,7 +227,7 @@ namespace Apache.Ignite.Core.Tests.Cache
localCache.Put(localKey, 1);
localCache.Get(localKey);
// Wait for metrics to propagate.
- Thread.Sleep(TcpDiscoverySpi.DefaultHeartbeatFrequency);
+ Thread.Sleep(IgniteConfiguration.DefaultMetricsUpdateFrequency);
var localMetrics = func(localCache);
Assert.IsTrue(localMetrics.IsStatisticsEnabled);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
index 31dd887..0524c05 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs
@@ -726,7 +726,6 @@ namespace Apache.Ignite.Core.Tests
},
ClientReconnectDisabled = true,
ForceServerMode = true,
- HeartbeatFrequency = TimeSpan.FromSeconds(3),
IpFinderCleanFrequency = TimeSpan.FromMinutes(7),
LocalAddress = "127.0.0.1",
LocalPort = 49900,
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs
index 8da2616..b0ed0d2 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs
@@ -480,7 +480,6 @@ namespace Apache.Ignite.Core.Tests
},
ClientReconnectDisabled = true,
ForceServerMode = true,
- HeartbeatFrequency = TimeSpan.FromSeconds(3),
IpFinderCleanFrequency = TimeSpan.FromMinutes(7),
LocalAddress = "127.0.0.1",
LocalPort = 49900,
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/TcpDiscoverySpi.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/TcpDiscoverySpi.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/TcpDiscoverySpi.cs
index a99f7b0..bdf5780 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/TcpDiscoverySpi.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Discovery/Tcp/TcpDiscoverySpi.cs
@@ -88,11 +88,6 @@ namespace Apache.Ignite.Core.Discovery.Tcp
public const int DefaultThreadPriority = 10;
/// <summary>
- /// Default value for the <see cref="HeartbeatFrequency"/> property.
- /// </summary>
- public static readonly TimeSpan DefaultHeartbeatFrequency = TimeSpan.FromSeconds(2);
-
- /// <summary>
/// Default value for the <see cref="TopologyHistorySize"/> property.
/// </summary>
public const int DefaultTopologyHistorySize = 1000;
@@ -114,7 +109,6 @@ namespace Apache.Ignite.Core.Discovery.Tcp
MaxMissedClientHeartbeats = DefaultMaxMissedClientHeartbeats;
IpFinderCleanFrequency = DefaultIpFinderCleanFrequency;
ThreadPriority = DefaultThreadPriority;
- HeartbeatFrequency = DefaultHeartbeatFrequency;
TopologyHistorySize = DefaultTopologyHistorySize;
}
@@ -143,7 +137,6 @@ namespace Apache.Ignite.Core.Discovery.Tcp
StatisticsPrintFrequency = reader.ReadLongAsTimespan();
IpFinderCleanFrequency = reader.ReadLongAsTimespan();
ThreadPriority = reader.ReadInt();
- HeartbeatFrequency = reader.ReadLongAsTimespan();
TopologyHistorySize = reader.ReadInt();
}
@@ -248,13 +241,6 @@ namespace Apache.Ignite.Core.Discovery.Tcp
public int ThreadPriority { get; set; }
/// <summary>
- /// Gets or sets delay between issuing of heartbeat messages. SPI sends heartbeat messages
- /// in configurable time interval to other nodes to notify them about its state.
- /// </summary>
- [DefaultValue(typeof(TimeSpan), "0:0:2")]
- public TimeSpan HeartbeatFrequency { get; set; }
-
- /// <summary>
/// Gets or sets the size of topology snapshots history.
/// </summary>
[DefaultValue(DefaultTopologyHistorySize)]
@@ -298,7 +284,6 @@ namespace Apache.Ignite.Core.Discovery.Tcp
writer.WriteLong((long) StatisticsPrintFrequency.TotalMilliseconds);
writer.WriteLong((long) IpFinderCleanFrequency.TotalMilliseconds);
writer.WriteInt(ThreadPriority);
- writer.WriteLong((long) HeartbeatFrequency.TotalMilliseconds);
writer.WriteInt(TopologyHistorySize);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
index 67f2715..728e62b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@ -873,11 +873,6 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="heartbeatFrequency" type="xs:string">
- <xs:annotation>
- <xs:documentation>Delay between issuing of heartbeat messages. SPI sends heartbeat messages in configurable time interval to other nodes to notify them about its state.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="ipFinderCleanFrequency" type="xs:string">
<xs:annotation>
<xs:documentation>IP finder clean frequency.</xs:documentation>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Datagrid/MultiTieredCacheExample.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Datagrid/MultiTieredCacheExample.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Datagrid/MultiTieredCacheExample.cs
index c40814c..f7caa78 100644
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Datagrid/MultiTieredCacheExample.cs
+++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Datagrid/MultiTieredCacheExample.cs
@@ -93,7 +93,7 @@ namespace Apache.Ignite.Examples.Datagrid
Console.WriteLine(">>> Waiting for metrics final update...");
- Thread.Sleep(TcpDiscoverySpi.DefaultHeartbeatFrequency);
+ Thread.Sleep(IgniteConfiguration.DefaultMetricsUpdateFrequency);
PrintCacheMetrics(cache);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
index da51d68..2cfaa46 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
@@ -83,7 +83,7 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest {
cfg.setDeploymentSpi(depSpi);
}
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500);
+ cfg.setMetricsUpdateFrequency(500);
return cfg;
}
@@ -212,4 +212,4 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest {
checkGar();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml
----------------------------------------------------------------------
diff --git a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml b/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml
index e504fe7..9cb2761 100644
--- a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml
+++ b/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml
@@ -199,7 +199,6 @@
<property name="bucketName" value="YOUR_BUCKET_NAME_IP_FINDER"/>
</bean>
</property>
- <property name="heartbeatFrequency" value="2000"/>
</bean>
</property>
-->
[2/3] ignite git commit: ignite-4799 TcpDiscoverySpi: removed
missedHeartbeats properties,
heartbeatFrequency (instead use IgiteConfiguration.metricsUpdateFrequency).
Added IgiteConfiguration.clientFailureDetectionTimeout.
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
deleted file mode 100644
index 0ae253a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.tcp.messages;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.cache.CacheMetrics;
-import org.apache.ignite.cluster.ClusterMetrics;
-import org.apache.ignite.internal.ClusterMetricsSnapshot;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.C1;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-/**
- * Heartbeat message.
- * <p>
- * It is sent by coordinator node across the ring once a configured period.
- * Message makes two passes:
- * <ol>
- * <li>During first pass, all nodes add their metrics to the message and
- * update local metrics with metrics currently present in the message.</li>
- * <li>During second pass, all nodes update all metrics present in the message
- * and remove their own metrics from the message.</li>
- * </ol>
- * When message reaches coordinator second time it is discarded (it finishes the
- * second pass).
- */
-@TcpDiscoveryRedirectToClient
-public class TcpDiscoveryHeartbeatMessage extends TcpDiscoveryAbstractMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Map to store nodes metrics. */
- @GridToStringExclude
- private final Map<UUID, MetricsSet> metrics = new HashMap<>();
-
- /** Client node IDs. */
- private final Collection<UUID> clientNodeIds = new HashSet<>();
-
- /** Cahce metrics by node. */
- @GridToStringExclude
- private final Map<UUID, Map<Integer, CacheMetrics>> cacheMetrics = new HashMap<>();
-
- /**
- * Constructor.
- *
- * @param creatorNodeId Creator node.
- */
- public TcpDiscoveryHeartbeatMessage(UUID creatorNodeId) {
- super(creatorNodeId);
- }
-
- /**
- * Sets metrics for particular node.
- *
- * @param nodeId Node ID.
- * @param metrics Node metrics.
- */
- public void setMetrics(UUID nodeId, ClusterMetrics metrics) {
- assert nodeId != null;
- assert metrics != null;
- assert !this.metrics.containsKey(nodeId);
-
- this.metrics.put(nodeId, new MetricsSet(metrics));
- }
-
- /**
- * Sets cache metrics for particular node.
- *
- * @param nodeId Node ID.
- * @param metrics Node cache metrics.
- */
- public void setCacheMetrics(UUID nodeId, Map<Integer, CacheMetrics> metrics) {
- assert nodeId != null;
- assert metrics != null;
- assert !this.cacheMetrics.containsKey(nodeId);
-
- if (!F.isEmpty(metrics))
- this.cacheMetrics.put(nodeId, metrics);
- }
-
- /**
- * Sets metrics for a client node.
- *
- * @param nodeId Server node ID.
- * @param clientNodeId Client node ID.
- * @param metrics Node metrics.
- */
- public void setClientMetrics(UUID nodeId, UUID clientNodeId, ClusterMetrics metrics) {
- assert nodeId != null;
- assert clientNodeId != null;
- assert metrics != null;
- assert this.metrics.containsKey(nodeId);
-
- this.metrics.get(nodeId).addClientMetrics(clientNodeId, metrics);
- }
-
- /**
- * Removes metrics for particular node from the message.
- *
- * @param nodeId Node ID.
- */
- public void removeMetrics(UUID nodeId) {
- assert nodeId != null;
-
- metrics.remove(nodeId);
- }
-
- /**
- * Removes cache metrics for particular node from the message.
- *
- * @param nodeId Node ID.
- */
- public void removeCacheMetrics(UUID nodeId) {
- assert nodeId != null;
-
- cacheMetrics.remove(nodeId);
- }
-
- /**
- * Gets metrics map.
- *
- * @return Metrics map.
- */
- public Map<UUID, MetricsSet> metrics() {
- return metrics;
- }
-
- /**
- * Gets cache metrics map.
- *
- * @return Cache metrics map.
- */
- public Map<UUID, Map<Integer, CacheMetrics>> cacheMetrics() {
- return cacheMetrics;
- }
-
- /**
- * @return {@code True} if this message contains metrics.
- */
- public boolean hasMetrics() {
- return !metrics.isEmpty();
- }
-
- /**
- * @return {@code True} this message contains cache metrics.
- */
- public boolean hasCacheMetrics() {
- return !cacheMetrics.isEmpty();
- }
-
- /**
- * @return {@code True} if this message contains metrics.
- */
- public boolean hasMetrics(UUID nodeId) {
- assert nodeId != null;
-
- return metrics.get(nodeId) != null;
- }
-
- /**
- * @param nodeId Node ID.
- *
- * @return {@code True} if this message contains cache metrics for particular node.
- */
- public boolean hasCacheMetrics(UUID nodeId) {
- assert nodeId != null;
-
- return cacheMetrics.get(nodeId) != null;
- }
-
- /**
- * Gets client node IDs for particular node.
- *
- * @return Client node IDs.
- */
- public Collection<UUID> clientNodeIds() {
- return clientNodeIds;
- }
-
- /**
- * Adds client node ID.
- *
- * @param clientNodeId Client node ID.
- */
- public void addClientNodeId(UUID clientNodeId) {
- clientNodeIds.add(clientNodeId);
- }
-
- /** {@inheritDoc} */
- @Override public boolean traceLogLevel() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean highPriority() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(TcpDiscoveryHeartbeatMessage.class, this, "super", super.toString());
- }
-
- /**
- * @param nodeId Node ID.
- * @param metrics Metrics.
- * @return Serialized metrics.
- */
- private static byte[] serializeMetrics(UUID nodeId, ClusterMetrics metrics) {
- assert nodeId != null;
- assert metrics != null;
-
- byte[] buf = new byte[16 + ClusterMetricsSnapshot.METRICS_SIZE];
-
- U.longToBytes(nodeId.getMostSignificantBits(), buf, 0);
- U.longToBytes(nodeId.getLeastSignificantBits(), buf, 8);
-
- ClusterMetricsSnapshot.serialize(buf, 16, metrics);
-
- return buf;
- }
-
- /**
- */
- @SuppressWarnings("PublicInnerClass")
- public static class MetricsSet implements Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Metrics. */
- private byte[] metrics;
-
- /** Client metrics. */
- private Collection<byte[]> clientMetrics;
-
- /**
- */
- public MetricsSet() {
- // No-op.
- }
-
- /**
- * @param metrics Metrics.
- */
- public MetricsSet(ClusterMetrics metrics) {
- assert metrics != null;
-
- this.metrics = ClusterMetricsSnapshot.serialize(metrics);
- }
-
- /**
- * @return Deserialized metrics.
- */
- public ClusterMetrics metrics() {
- return ClusterMetricsSnapshot.deserialize(metrics, 0);
- }
-
- /**
- * @return Client metrics.
- */
- public Collection<T2<UUID, ClusterMetrics>> clientMetrics() {
- return F.viewReadOnly(clientMetrics, new C1<byte[], T2<UUID, ClusterMetrics>>() {
- @Override public T2<UUID, ClusterMetrics> apply(byte[] bytes) {
- UUID nodeId = new UUID(U.bytesToLong(bytes, 0), U.bytesToLong(bytes, 8));
-
- return new T2<>(nodeId, ClusterMetricsSnapshot.deserialize(bytes, 16));
- }
- });
- }
-
- /**
- * @param nodeId Client node ID.
- * @param metrics Client metrics.
- */
- private void addClientMetrics(UUID nodeId, ClusterMetrics metrics) {
- assert nodeId != null;
- assert metrics != null;
-
- if (clientMetrics == null)
- clientMetrics = new ArrayList<>();
-
- clientMetrics.add(serializeMetrics(nodeId, metrics));
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeByteArray(out, metrics);
-
- out.writeInt(clientMetrics != null ? clientMetrics.size() : -1);
-
- if (clientMetrics != null) {
- for (byte[] arr : clientMetrics)
- U.writeByteArray(out, arr);
- }
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- metrics = U.readByteArray(in);
-
- int clientMetricsSize = in.readInt();
-
- if (clientMetricsSize >= 0) {
- clientMetrics = new ArrayList<>(clientMetricsSize);
-
- for (int i = 0; i < clientMetricsSize; i++)
- clientMetrics.add(U.readByteArray(in));
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
new file mode 100644
index 0000000..9bf33cf
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java
@@ -0,0 +1,338 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.discovery.tcp.messages;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.ignite.cache.CacheMetrics;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+/**
+ * Metrics update message.
+ * <p>
+ * It is sent by coordinator node across the ring once a configured period.
+ * Message makes two passes:
+ * <ol>
+ * <li>During first pass, all nodes add their metrics to the message and
+ * update local metrics with metrics currently present in the message.</li>
+ * <li>During second pass, all nodes update all metrics present in the message
+ * and remove their own metrics from the message.</li>
+ * </ol>
+ * When message reaches coordinator second time it is discarded (it finishes the
+ * second pass).
+ */
+@TcpDiscoveryRedirectToClient
+public class TcpDiscoveryMetricsUpdateMessage extends TcpDiscoveryAbstractMessage {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Map to store nodes metrics. */
+ @GridToStringExclude
+ private final Map<UUID, MetricsSet> metrics = new HashMap<>();
+
+ /** Client node IDs. */
+ private final Collection<UUID> clientNodeIds = new HashSet<>();
+
+ /** Cahce metrics by node. */
+ @GridToStringExclude
+ private final Map<UUID, Map<Integer, CacheMetrics>> cacheMetrics = new HashMap<>();
+
+ /**
+ * Constructor.
+ *
+ * @param creatorNodeId Creator node.
+ */
+ public TcpDiscoveryMetricsUpdateMessage(UUID creatorNodeId) {
+ super(creatorNodeId);
+ }
+
+ /**
+ * Sets metrics for particular node.
+ *
+ * @param nodeId Node ID.
+ * @param metrics Node metrics.
+ */
+ public void setMetrics(UUID nodeId, ClusterMetrics metrics) {
+ assert nodeId != null;
+ assert metrics != null;
+ assert !this.metrics.containsKey(nodeId);
+
+ this.metrics.put(nodeId, new MetricsSet(metrics));
+ }
+
+ /**
+ * Sets cache metrics for particular node.
+ *
+ * @param nodeId Node ID.
+ * @param metrics Node cache metrics.
+ */
+ public void setCacheMetrics(UUID nodeId, Map<Integer, CacheMetrics> metrics) {
+ assert nodeId != null;
+ assert metrics != null;
+ assert !this.cacheMetrics.containsKey(nodeId);
+
+ if (!F.isEmpty(metrics))
+ this.cacheMetrics.put(nodeId, metrics);
+ }
+
+ /**
+ * Sets metrics for a client node.
+ *
+ * @param nodeId Server node ID.
+ * @param clientNodeId Client node ID.
+ * @param metrics Node metrics.
+ */
+ public void setClientMetrics(UUID nodeId, UUID clientNodeId, ClusterMetrics metrics) {
+ assert nodeId != null;
+ assert clientNodeId != null;
+ assert metrics != null;
+ assert this.metrics.containsKey(nodeId);
+
+ this.metrics.get(nodeId).addClientMetrics(clientNodeId, metrics);
+ }
+
+ /**
+ * Removes metrics for particular node from the message.
+ *
+ * @param nodeId Node ID.
+ */
+ public void removeMetrics(UUID nodeId) {
+ assert nodeId != null;
+
+ metrics.remove(nodeId);
+ }
+
+ /**
+ * Removes cache metrics for particular node from the message.
+ *
+ * @param nodeId Node ID.
+ */
+ public void removeCacheMetrics(UUID nodeId) {
+ assert nodeId != null;
+
+ cacheMetrics.remove(nodeId);
+ }
+
+ /**
+ * Gets metrics map.
+ *
+ * @return Metrics map.
+ */
+ public Map<UUID, MetricsSet> metrics() {
+ return metrics;
+ }
+
+ /**
+ * Gets cache metrics map.
+ *
+ * @return Cache metrics map.
+ */
+ public Map<UUID, Map<Integer, CacheMetrics>> cacheMetrics() {
+ return cacheMetrics;
+ }
+
+ /**
+ * @return {@code True} if this message contains metrics.
+ */
+ public boolean hasMetrics() {
+ return !metrics.isEmpty();
+ }
+
+ /**
+ * @return {@code True} this message contains cache metrics.
+ */
+ public boolean hasCacheMetrics() {
+ return !cacheMetrics.isEmpty();
+ }
+
+ /**
+ * @return {@code True} if this message contains metrics.
+ */
+ public boolean hasMetrics(UUID nodeId) {
+ assert nodeId != null;
+
+ return metrics.get(nodeId) != null;
+ }
+
+ /**
+ * @param nodeId Node ID.
+ *
+ * @return {@code True} if this message contains cache metrics for particular node.
+ */
+ public boolean hasCacheMetrics(UUID nodeId) {
+ assert nodeId != null;
+
+ return cacheMetrics.get(nodeId) != null;
+ }
+
+ /**
+ * Gets client node IDs for particular node.
+ *
+ * @return Client node IDs.
+ */
+ public Collection<UUID> clientNodeIds() {
+ return clientNodeIds;
+ }
+
+ /**
+ * Adds client node ID.
+ *
+ * @param clientNodeId Client node ID.
+ */
+ public void addClientNodeId(UUID clientNodeId) {
+ clientNodeIds.add(clientNodeId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean traceLogLevel() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean highPriority() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(TcpDiscoveryMetricsUpdateMessage.class, this, "super", super.toString());
+ }
+
+ /**
+ * @param nodeId Node ID.
+ * @param metrics Metrics.
+ * @return Serialized metrics.
+ */
+ private static byte[] serializeMetrics(UUID nodeId, ClusterMetrics metrics) {
+ assert nodeId != null;
+ assert metrics != null;
+
+ byte[] buf = new byte[16 + ClusterMetricsSnapshot.METRICS_SIZE];
+
+ U.longToBytes(nodeId.getMostSignificantBits(), buf, 0);
+ U.longToBytes(nodeId.getLeastSignificantBits(), buf, 8);
+
+ ClusterMetricsSnapshot.serialize(buf, 16, metrics);
+
+ return buf;
+ }
+
+ /**
+ */
+ @SuppressWarnings("PublicInnerClass")
+ public static class MetricsSet implements Externalizable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Metrics. */
+ private byte[] metrics;
+
+ /** Client metrics. */
+ private Collection<byte[]> clientMetrics;
+
+ /**
+ */
+ public MetricsSet() {
+ // No-op.
+ }
+
+ /**
+ * @param metrics Metrics.
+ */
+ public MetricsSet(ClusterMetrics metrics) {
+ assert metrics != null;
+
+ this.metrics = ClusterMetricsSnapshot.serialize(metrics);
+ }
+
+ /**
+ * @return Deserialized metrics.
+ */
+ public ClusterMetrics metrics() {
+ return ClusterMetricsSnapshot.deserialize(metrics, 0);
+ }
+
+ /**
+ * @return Client metrics.
+ */
+ public Collection<T2<UUID, ClusterMetrics>> clientMetrics() {
+ return F.viewReadOnly(clientMetrics, new C1<byte[], T2<UUID, ClusterMetrics>>() {
+ @Override public T2<UUID, ClusterMetrics> apply(byte[] bytes) {
+ UUID nodeId = new UUID(U.bytesToLong(bytes, 0), U.bytesToLong(bytes, 8));
+
+ return new T2<>(nodeId, ClusterMetricsSnapshot.deserialize(bytes, 16));
+ }
+ });
+ }
+
+ /**
+ * @param nodeId Client node ID.
+ * @param metrics Client metrics.
+ */
+ private void addClientMetrics(UUID nodeId, ClusterMetrics metrics) {
+ assert nodeId != null;
+ assert metrics != null;
+
+ if (clientMetrics == null)
+ clientMetrics = new ArrayList<>();
+
+ clientMetrics.add(serializeMetrics(nodeId, metrics));
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ U.writeByteArray(out, metrics);
+
+ out.writeInt(clientMetrics != null ? clientMetrics.size() : -1);
+
+ if (clientMetrics != null) {
+ for (byte[] arr : clientMetrics)
+ U.writeByteArray(out, arr);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ metrics = U.readByteArray(in);
+
+ int clientMetricsSize = in.readInt();
+
+ if (clientMetricsSize >= 0) {
+ clientMetrics = new ArrayList<>(clientMetricsSize);
+
+ for (int i = 0; i < clientMetricsSize; i++)
+ clientMetrics.add(U.readByteArray(in));
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
index cfd4fc7..1a3a7fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
@@ -97,13 +97,13 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
* You should tune these values based on the level of accuracy needed vs. the additional memory
* that would be required for storing metrics.
* <p>
- * You should also keep in mind that metrics for remote nodes are delayed (usually by the
- * heartbeat frequency). So if it is acceptable in your environment, set the heartbeat frequency
- * to be more inline with job execution time. Generally, the more often heartbeats between nodes
+ * You should also keep in mind that metrics for remote nodes are delayed (usually by the metrics
+ * update frequency). So if it is acceptable in your environment, set the metrics update frequency
+ * to be more inline with job execution time. Generally, the more often metrics update between nodes
* are exchanged, the more precise the metrics are. However, you should keep in mind that if
- * heartbeats are exchanged too often then it may create unnecessary traffic in the network.
- * Heartbeats (or metrics update frequency) can be configured via underlying
- * {@link org.apache.ignite.spi.discovery.DiscoverySpi} used in your grid.
+ * metrics update are exchanged too often then it may create unnecessary traffic in the network.
+ * Metrics update frequency can be configured via underlying
+ * {@link org.apache.ignite.configuration.IgniteConfiguration} used in your grid.
* <p>
* Here is an example of how probing can be implemented to use
* number of active and waiting jobs as probing mechanism:
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 2cc83a4..bc1e534 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1962,7 +1962,7 @@ org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponse
-org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientHeartbeatMessage
+org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientMetricsUpdateMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage
@@ -1972,9 +1972,9 @@ org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse
-org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage
-org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage$MetricsSet
-org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage$MetricsSet$1
+org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage
+org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage$MetricsSet
+org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage$MetricsSet$1
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/config/load/dsi-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml
index c57b5e0..7d7f2ba 100644
--- a/modules/core/src/test/config/load/dsi-load-base.xml
+++ b/modules/core/src/test/config/load/dsi-load-base.xml
@@ -48,10 +48,11 @@
<property name="ackTimeout" value="4000"/>
<property name="socketTimeout" value="4000"/>
- <property name="heartbeatFrequency" value="6000"/>
</bean>
</property>
+ <property name="metricsUpdateFrequency" value="6000"/>
+
<property name="lifecycleBeans" ref="lifecycleBeans"/>
<property name="peerClassLoadingEnabled" value="false"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/config/load/merge-sort-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml
index aba0108..44b26bb 100644
--- a/modules/core/src/test/config/load/merge-sort-base.xml
+++ b/modules/core/src/test/config/load/merge-sort-base.xml
@@ -68,6 +68,10 @@
<property name="peerClassLoadingThreadPoolSize" value="100"/>
+ <property name="metricsUpdateFrequency" value="10000"/>
+
+ <property name="failureDetectionTimeout" value="60000"/>
+
<!-- Discovery SPI configuration. -->
<property name="discoverySpi">
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
@@ -75,9 +79,6 @@
<property name="socketTimeout" value="5000"/>
<property name="ackTimeout" value="5000"/>
- <property name="heartbeatFrequency" value="10000"/>
- <property name="maxMissedHeartbeats" value="6"/>
-
<property name="statisticsPrintFrequency" value="60000"/>
<property name="ipFinder">
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/config/streamer/spring-streamer-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/streamer/spring-streamer-base.xml b/modules/core/src/test/config/streamer/spring-streamer-base.xml
index 746dd95..ddb96a7 100644
--- a/modules/core/src/test/config/streamer/spring-streamer-base.xml
+++ b/modules/core/src/test/config/streamer/spring-streamer-base.xml
@@ -66,12 +66,13 @@
<constructor-arg value="127.0.0.1"/>
</bean>
+ <property name="failureDetectionTimeout" value="45000"/>
+ <property name="metricsUpdateFrequency" value="15000"/>
+
<bean id="discoSpi" class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
<property name="ackTimeout" value="5000"/>
<property name="socketTimeout" value="5000"/>
<property name="reconnectCount" value="5"/>
- <property name="heartbeatFrequency" value="15000"/>
- <property name="maxMissedHeartbeats" value="3"/>
<property name="ipFinder">
<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
index a4dbe53..3750585 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestJob.java
@@ -20,6 +20,8 @@ package org.apache.ignite;
import org.apache.ignite.compute.ComputeJobAdapter;
import org.apache.ignite.resources.LoggerResource;
+import java.util.concurrent.CountDownLatch;
+
/**
* Test job.
*/
@@ -28,6 +30,8 @@ public class GridTestJob extends ComputeJobAdapter {
@LoggerResource
private IgniteLogger log;
+ CountDownLatch latch;
+
/** */
public GridTestJob() {
// No-op.
@@ -40,10 +44,25 @@ public class GridTestJob extends ComputeJobAdapter {
super(arg);
}
+ /**
+ * @param arg Job argument.
+ */
+ public GridTestJob(String arg, CountDownLatch latch) {
+ super(arg);
+ this.latch = latch;
+ }
+
/** {@inheritDoc} */
@Override public String execute() {
if (log.isDebugEnabled())
log.debug("Executing job [job=" + this + ", arg=" + argument(0) + ']');
+ if (latch != null) {
+ try {
+ latch.await();
+ } catch (InterruptedException e) {
+ // Nothing to do
+ }
+ }
return argument(0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
index dbe34c6..8dc0569 100644
--- a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java
@@ -20,6 +20,8 @@ package org.apache.ignite;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeTaskSplitAdapter;
@@ -33,6 +35,20 @@ public class GridTestTask extends ComputeTaskSplitAdapter<Object, Object> {
@LoggerResource
private IgniteLogger log;
+ /**
+ * Optional latch to wait for
+ */
+ CountDownLatch latch;
+
+ public GridTestTask (CountDownLatch latch) {
+ super();
+ this.latch = latch;
+ }
+
+ public GridTestTask() {
+ super();
+ }
+
/** {@inheritDoc} */
@Override public Collection<? extends ComputeJob> split(int gridSize, Object arg) {
if (log.isDebugEnabled())
@@ -41,7 +57,7 @@ public class GridTestTask extends ComputeTaskSplitAdapter<Object, Object> {
Collection<ComputeJob> refs = new ArrayList<>(gridSize);
for (int i = 0; i < gridSize; i++)
- refs.add(new GridTestJob(arg.toString() + i + 1));
+ refs.add(new GridTestJob(arg.toString() + i + 1, latch));
return refs;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index dafc41f..d204a39 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -87,7 +87,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(spi);
cfg.setCacheConfiguration();
- cfg.setMetricsUpdateFrequency(0);
+ cfg.setMetricsUpdateFrequency(500);
CacheConfiguration<Integer, Object> ccfg = defaultCacheConfiguration();
ccfg.setName(CACHE_NAME);
@@ -173,16 +173,18 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
public void testSingleTaskMetrics() throws Exception {
Ignite ignite = grid();
- ignite.compute().execute(new GridTestTask(), "testArg");
+ final CountDownLatch taskLatch = new CountDownLatch(2);
+ ignite.compute().executeAsync(new GridTestTask(taskLatch), "testArg");
// Let metrics update twice.
- final CountDownLatch latch = new CountDownLatch(2);
+ final CountDownLatch latch = new CountDownLatch(3);
ignite.events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
assert evt.type() == EVT_NODE_METRICS_UPDATED;
latch.countDown();
+ taskLatch.countDown();
return true;
}
@@ -203,7 +205,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest {
assert metrics.getAverageWaitingJobs() == 0;
assert metrics.getCurrentActiveJobs() == 0;
assert metrics.getCurrentCancelledJobs() == 0;
- assert metrics.getCurrentJobExecuteTime() == 0;
+ assert metrics.getCurrentJobExecuteTime() > 0;
assert metrics.getCurrentJobWaitTime() == 0;
assert metrics.getCurrentWaitingJobs() == 0;
assert metrics.getMaximumActiveJobs() == 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
index f6f641b..7535228 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
@@ -54,10 +54,13 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+
disco.setIpFinder(ipFinder);
+
cfg.setDiscoverySpi(disco);
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
+
if (igniteInstanceName.endsWith("1"))
cfg.setCacheConfiguration(); // Empty cache configuration.
else {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
index 4e4586f..216c50e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
@@ -85,11 +85,12 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
disco.setIpFinder(ipFinder);
c.setDiscoverySpi(disco);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
+
c.setDeploymentMode(depMode);
if (igniteInstanceName.endsWith("1"))
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
index d2df1be..92933f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java
@@ -49,11 +49,12 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
disco.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(disco);
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
+
if (igniteInstanceName.endsWith("1"))
cfg.setClientMode(true);
else {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
index 39677c5..a5d60cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java
@@ -72,7 +72,7 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest {
assert discoSpi instanceof TcpDiscoverySpi;
- ((TcpDiscoverySpi)discoSpi).setHeartbeatFrequency(500);
+ cfg.setMetricsUpdateFrequency(500);
return cfg;
}
@@ -221,4 +221,4 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest {
tmp.onExternalCollision();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
index 4d503bd..79dc81a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
@@ -49,7 +49,6 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
TcpDiscoverySpi disco = new TcpDiscoverySpi();
disco.setIpFinder(IP_FINDER);
- disco.setHeartbeatFrequency(10_000);
// Set parameters for fast ping failure.
disco.setSocketTimeout(100);
@@ -57,6 +56,7 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
disco.setReconnectCount(2);
cfg.setDiscoverySpi(disco);
+ cfg.setMetricsUpdateFrequency(10_000);
return cfg;
}
@@ -129,4 +129,4 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract
U.invoke(comm.getClass(), comm, "simulateNodeFailure");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
index c213464..80b5599 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobCollisionCancelSelfTest.java
@@ -102,7 +102,7 @@ public class GridJobCollisionCancelSelfTest extends GridCommonAbstractTest {
// Should be exactly the same as Jobs number.
assert cancelCnt <= SPLIT_COUNT : "Invalid cancel count: " + cancelCnt;
- // One per start and one per stop and some that come with heartbeats.
+ // One per start and one per stop and some that come with metrics update.
assert colResolutionCnt > SPLIT_COUNT + 1:
"Invalid collision resolution count: " + colResolutionCnt;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index f0c50eb..1847303 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -101,15 +101,15 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
if (clientMode && ((igniteInstanceName.charAt(igniteInstanceName.length() - 1) - '0') & 1) != 0)
cfg.setClientMode(true);
else
- disc.setMaxMissedClientHeartbeats(50);
+ cfg.setClientFailureDetectionTimeout(50000);
- disc.setHeartbeatFrequency(500);
disc.setIpFinder(IP_FINDER);
disc.setAckTimeout(1000);
disc.setSocketTimeout(1000);
cfg.setCacheConfiguration(cCfg);
cfg.setDiscoverySpi(disc);
+ cfg.setMetricsUpdateFrequency(500);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index ccb879e..57a2420 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -78,13 +78,13 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setNetworkTimeout(60_000);
+ cfg.setMetricsUpdateFrequency(30_000);
TcpDiscoverySpi discoSpi = (TcpDiscoverySpi)cfg.getDiscoverySpi();
discoSpi.setSocketTimeout(30_000);
discoSpi.setAckTimeout(30_000);
discoSpi.setNetworkTimeout(60_000);
- discoSpi.setHeartbeatFrequency(30_000);
discoSpi.setReconnectCount(2);
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
@@ -386,4 +386,4 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
private IgniteCache<String,Integer> cache(Ignite g) {
return g.cache(null);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 95f8bb8..c40d44d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -201,9 +201,9 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
disco.setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
index 47b9473..957828c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java
@@ -51,10 +51,11 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
disco.setIpFinder(ipFinder);
cfg.setDiscoverySpi(disco);
+
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
cfg.setCacheConfiguration(cacheConfiguration());
return cfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 688e1cc..5133f61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -93,17 +93,17 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
TcpDiscoverySpi disco = new TcpDiscoverySpi().setForceServerMode(true);
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
-
disco.setIpFinder(ipFinder);
if (isDebug())
disco.setAckTimeout(Integer.MAX_VALUE);
- MemoryEventStorageSpi eventSpi = new MemoryEventStorageSpi();
- eventSpi.setExpireCount(100);
+ MemoryEventStorageSpi evtSpi = new MemoryEventStorageSpi();
+ evtSpi.setExpireCount(100);
+
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
- cfg.setEventStorageSpi(eventSpi);
+ cfg.setEventStorageSpi(evtSpi);
cfg.setDiscoverySpi(disco);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
index b76279d..e0fc205 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java
@@ -147,9 +147,9 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest {
}
};
- discoSpi.setHeartbeatFrequency(1000);
-
cfg.setDiscoverySpi(discoSpi);
+
+ cfg.setMetricsUpdateFrequency(1000);
}
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index c68c8d0..9c24073 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -158,11 +158,12 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
discoSpi.setForceServerMode(forceSrvMode);
discoSpi.setIpFinder(ipFinder);
- discoSpi.setMaxMissedClientHeartbeats(100);
discoSpi.setNetworkTimeout(60_000);
cfg.setDiscoverySpi(discoSpi);
+ cfg.setClientFailureDetectionTimeout(100000);
+
CacheConfiguration[] ccfg;
if (cacheC != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index e11e198..cd475fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -87,10 +87,9 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
-
disco.setIpFinder(ipFinder);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
c.setDiscoverySpi(disco);
c.setDeploymentMode(DeploymentMode.SHARED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
index aaacd2d..6d7ec90 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
@@ -67,8 +67,8 @@ public class IgniteCache150ClientsTest extends GridCommonAbstractTest {
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setJoinTimeout(0);
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setMaxMissedClientHeartbeats(200);
+ cfg.setClientFailureDetectionTimeout(200000);
cfg.setClientMode(!igniteInstanceName.equals(getTestIgniteInstanceName(0)));
CacheConfiguration[] ccfgs = new CacheConfiguration[CACHES];
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
index bbbcfd7..907922c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
@@ -71,8 +71,8 @@ public class IgniteCacheNearRestartRollbackSelfTest extends GridCommonAbstractTe
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
- discoSpi.setMaxMissedClientHeartbeats(50);
+ cfg.setClientFailureDetectionTimeout(50000);
cfg.setDiscoverySpi(discoSpi);
cfg.setCacheConfiguration(cacheConfiguration(igniteInstanceName));
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
index ba9f9e4..644fabd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java
@@ -64,8 +64,8 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh
TcpDiscoverySpi spi = new TcpDiscoverySpi();
spi.setIpFinder(ipFinder);
- spi.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
c.setDiscoverySpi(spi);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index b9afd65..3bdce46 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -93,8 +93,8 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
disco.setIpFinder(ipFinder);
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
c.setDiscoverySpi(disco);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index f223c9b..af7aff4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -66,8 +66,8 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest
TcpDiscoverySpi disco = new TcpDiscoverySpi();
disco.setIpFinder(ipFinder);
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
c.setDiscoverySpi(disco);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
index 591858a..6fdb354 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
@@ -82,7 +82,7 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest {
cfg.setConsistentId(gridName);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setMaxMissedClientHeartbeats(1000);
+ cfg.setClientFailureDetectionTimeout(Integer.MAX_VALUE);
TestRecordingCommunicationSpi commSpi = new TestRecordingCommunicationSpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index d041ae2..61cc580 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -82,8 +82,8 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
TcpDiscoverySpi spi = new TcpDiscoverySpi();
spi.setIpFinder(ipFinder);
- spi.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
c.setDiscoverySpi(spi);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index e4ed64b..a6b8d79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -106,8 +106,8 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
TcpDiscoverySpi spi = new TcpDiscoverySpi();
spi.setIpFinder(ipFinder);
- spi.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
cfg.setDiscoverySpi(spi);
CacheConfiguration cacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
index 62e11a7..ef472a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
@@ -63,8 +63,8 @@ public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingle
TcpDiscoverySpi spi = new TcpDiscoverySpi();
spi.setIpFinder(ipFinder);
- spi.setMaxMissedHeartbeats(Integer.MAX_VALUE);
+ c.setFailureDetectionTimeout(Integer.MAX_VALUE);
c.setDiscoverySpi(spi);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
index 62adb77..7349a4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java
@@ -74,12 +74,12 @@ public class IndexingSpiQuerySelfTest extends TestCase {
TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
- disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
-
disco.setIpFinder(ipFinder);
cfg.setDiscoverySpi(disco);
+ cfg.setFailureDetectionTimeout(Integer.MAX_VALUE);
+
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java
index 08f2709..1d6cbae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceClientNodeTest.java
@@ -42,10 +42,11 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder);
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setMaxMissedClientHeartbeats(30);
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(1000);
+
+ cfg.setClientFailureDetectionTimeout(30000);
cfg.setClientMode(client);
+ cfg.setMetricsUpdateFrequency(1000);
return cfg;
}
@@ -150,4 +151,4 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest {
assertTrue(latch.await(5000, TimeUnit.MILLISECONDS));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
index 6fb7cdf..fedb4ac 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
@@ -41,11 +41,6 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo
*/
protected abstract DiscoverySpi getDiscoverySpi(IgniteConfiguration cfg);
- /**
- * @return Discovery spi heartbeat frequency.
- */
- protected abstract int getHeartbeatFrequency();
-
/** {@inheritDoc} */
@SuppressWarnings("ConstantConditions")
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
@@ -120,11 +115,11 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo
startGrid(idx);
- Thread.sleep(getHeartbeatFrequency() * 3);
+ Thread.sleep(grid(idx).configuration().getMetricsUpdateFrequency() * 3);
stopGrid(idx);
- Thread.sleep(getHeartbeatFrequency() * 3);
+ Thread.sleep(grid(idx).configuration().getMetricsUpdateFrequency() * 3);
}
}
catch (Throwable e) {
@@ -175,4 +170,4 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo
G.stop(getTestIgniteInstanceName(), false);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java
index 6d2c7aa..77142dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java
@@ -33,13 +33,6 @@ public class GridSingleSplitsNewNodesMulticastLoadTest extends GridSingleSplitsN
assert discoSpi instanceof TcpDiscoverySpi : "Wrong default SPI implementation.";
- ((TcpDiscoverySpi)discoSpi).setHeartbeatFrequency(getHeartbeatFrequency());
-
return discoSpi;
}
-
- /** {@inheritDoc} */
- @Override protected int getHeartbeatFrequency() {
- return 3000;
- }
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
index a126b4b..d2878e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PSameClassLoaderSelfTest.java
@@ -71,8 +71,8 @@ public class GridP2PSameClassLoaderSelfTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setDeploymentMode(depMode);
+ cfg.setMetricsUpdateFrequency(500);
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(FINDER);
cfg.setCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
index daa3ec0..fa1a2ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
@@ -219,11 +219,11 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi> extends Gri
}
/**
- * Tests whether local node heartbeats cause METRICS_UPDATE event.
+ * Tests whether local node metrics update cause METRICS_UPDATE event.
*
* @throws Exception If test failed.
*/
- public void testLocalHeartbeat() throws Exception {
+ public void testLocalMetricsUpdate() throws Exception {
AtomicInteger[] locUpdCnts = new AtomicInteger[getSpiCount()];
int i = 0;
@@ -231,7 +231,7 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi> extends Gri
for (final DiscoverySpi spi : spis) {
final AtomicInteger spiCnt = new AtomicInteger(0);
- DiscoverySpiListener locHeartbeatLsnr = new DiscoverySpiListener() {
+ DiscoverySpiListener locMetricsUpdateLsnr = new DiscoverySpiListener() {
/** {@inheritDoc} */
@Override public void onLocalNodeInitialized(ClusterNode locNode) {
// No-op.
@@ -249,17 +249,16 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi> extends Gri
locUpdCnts[i] = spiCnt;
- spi.setListener(locHeartbeatLsnr);
+ spi.setListener(locMetricsUpdateLsnr);
i++;
}
- // Sleep fro 3 Heartbeats.
+ // Sleep for 3 metrics update.
Thread.sleep(getMaxDiscoveryTime() * 3);
- for (AtomicInteger cnt : locUpdCnts) {
- assert cnt.get() > 1 : "One of the SPIs did not get at least 2 METRICS_UPDATE events from local node";
- }
+ for (AtomicInteger cnt : locUpdCnts)
+ assertTrue("One of the SPIs did not get at least 2 METRICS_UPDATE events from local node", cnt.get() > 1);
}
/**
@@ -491,9 +490,9 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi> extends Gri
}
for (IgniteTestResources rscrs : spiRsrcs) {
- MBeanServer mBeanServer = rscrs.getMBeanServer();
+ MBeanServer mBeanSrv = rscrs.getMBeanServer();
- mBeanServer.unregisterMBean(new ObjectName(HTTP_ADAPTOR_MBEAN_NAME));
+ mBeanSrv.unregisterMBean(new ObjectName(HTTP_ADAPTOR_MBEAN_NAME));
rscrs.stopThreads();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
index a0545f5..689ac72 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.discovery.tcp;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.util.ArrayList;
@@ -28,15 +29,18 @@ import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest;
import org.jetbrains.annotations.Nullable;
@@ -53,8 +57,14 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
private final static long FAILURE_THRESHOLD = 10_000;
/** */
+ private final static long CLIENT_FAILURE_THRESHOLD = 30_000;
+
+ /** Failure detection timeout for nodes configuration. */
private static long failureThreshold = FAILURE_THRESHOLD;
+ /** Client failure detection timeout for nodes configuration. */
+ private static long clientFailureThreshold = CLIENT_FAILURE_THRESHOLD;
+
/** */
private static boolean useTestSpi;
@@ -64,6 +74,11 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
}
/** {@inheritDoc} */
+ @Override protected long clientFailureDetectionTimeout() {
+ return clientFailureThreshold;
+ }
+
+ /** {@inheritDoc} */
@Override protected long failureDetectionTimeout() {
return failureThreshold;
}
@@ -74,6 +89,11 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
}
/** {@inheritDoc} */
+ @Override protected long awaitClientTime() {
+ return clientFailureDetectionTimeout() + FAILURE_AWAIT_TIME;
+ }
+
+ /** {@inheritDoc} */
@Override protected TcpDiscoverySpi getDiscoverySpi() {
return useTestSpi ? new TestTcpDiscoverySpi2() : super.getDiscoverySpi();
}
@@ -88,12 +108,12 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
checkNodes(1, 1);
assertTrue(((TcpDiscoverySpi)(G.ignite("server-0").configuration().getDiscoverySpi())).
- failureDetectionTimeoutEnabled());
+ failureDetectionTimeoutEnabled());
assertEquals(failureDetectionTimeout(),
((TcpDiscoverySpi)(G.ignite("server-0").configuration().getDiscoverySpi())).failureDetectionTimeout());
assertTrue(((TcpDiscoverySpi)(G.ignite("client-0").configuration().getDiscoverySpi())).
- failureDetectionTimeoutEnabled());
+ failureDetectionTimeoutEnabled());
assertEquals(failureDetectionTimeout(),
((TcpDiscoverySpi)(G.ignite("client-0").configuration().getDiscoverySpi())).failureDetectionTimeout());
}
@@ -127,6 +147,123 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
}
/**
+ * Test failure detection time between server and client if client fail with failure detection.
+ *
+ * @throws Exception in case of error.
+ */
+ public void testFailureTimeoutServerClient() throws Exception {
+ failureThreshold = 3000;
+ clientFailureThreshold = 2000;
+
+ try {
+ startServerNodes(1);
+
+ startClientNodes(1);
+
+ checkNodes(1, 1);
+
+ Ignite srvNode = G.ignite("server-0");
+ final TcpDiscoverySpi srvSpi = (TcpDiscoverySpi) srvNode.configuration().getDiscoverySpi();
+
+ Ignite clientNode = G.ignite("client-0");
+ final TcpDiscoverySpi clientSpi = (TcpDiscoverySpi)clientNode.configuration().getDiscoverySpi();
+
+ long failureTime = U.currentTimeMillis();
+
+ final long[] failureDetectTime = new long[1];
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ clientSpi.simulateNodeFailure();
+
+ srvNode.events().localListen(new IgnitePredicate<Event>() {
+ @Override public boolean apply(Event evt) {
+ failureDetectTime[0] = U.currentTimeMillis();
+
+ latch.countDown();
+
+ return true;
+ }
+ }, EVT_NODE_FAILED);
+
+ assertTrue("Can't get node failure event", latch.await(15000, TimeUnit.MILLISECONDS));
+
+ long detectTime = failureDetectTime[0] - failureTime;
+
+ assertTrue("Client node failure detected too fast: " + detectTime + "ms",
+ detectTime > clientFailureThreshold - 200);
+ assertTrue("Client node failure detected too slow: " + detectTime + "ms",
+ detectTime < clientFailureThreshold + 5000);
+ }
+ finally {
+ failureThreshold = FAILURE_THRESHOLD;
+ clientFailureThreshold = CLIENT_FAILURE_THRESHOLD;
+ }
+ }
+
+ /**
+ * Test failure detection time between servers with failure detection.
+ *
+ * @throws Exception in case of error.
+ */
+ public void testFailureTimeout3Server() throws Exception {
+ failureThreshold = 1000;
+ clientFailureThreshold = 10000;
+ useTestSpi = true;
+
+ try {
+ startServerNodes(3);
+
+ checkNodes(3, 0);
+
+ Ignite srv0 = G.ignite("server-0");
+ final TestTcpDiscoverySpi2 spi0 = (TestTcpDiscoverySpi2)srv0.configuration().getDiscoverySpi();
+
+ final Ignite srv1 = G.ignite("server-1");
+ final TestTcpDiscoverySpi2 spi1 = (TestTcpDiscoverySpi2)srv1.configuration().getDiscoverySpi();
+
+ Ignite srv2 = G.ignite("server-2");
+ final TestTcpDiscoverySpi2 spi2 = (TestTcpDiscoverySpi2)srv2.configuration().getDiscoverySpi();
+
+ long failureTime = U.currentTimeMillis();
+
+ final AtomicLong failureDetectTime = new AtomicLong();
+ final CountDownLatch latch = new CountDownLatch(2);
+
+ spi1.writeToSocketDelay = 2000;
+
+ for (Ignite srv : new Ignite[]{srv0, srv2}) {
+ srv.events().localListen(new IgnitePredicate<Event>() {
+ @Override public boolean apply(Event evt) {
+ DiscoveryEvent evt0 = (DiscoveryEvent)evt;
+
+ assertEquals(srv1.cluster().localNode().id(), evt0.eventNode().id());
+
+ failureDetectTime.compareAndSet(0, U.currentTimeMillis());
+
+ latch.countDown();
+
+ return true;
+ }
+ }, EVT_NODE_FAILED);
+ }
+
+ assertTrue("Can't get node failure event", latch.await(15000, TimeUnit.MILLISECONDS));
+
+ long detectTime = failureDetectTime.get() - failureTime;
+
+ assertTrue("Server node failure detected too fast: " + detectTime + "ms",
+ detectTime > failureThreshold - 100);
+ assertTrue("Server node failure detected too slow: " + detectTime + "ms",
+ detectTime < clientFailureThreshold);
+ }
+ finally {
+ failureThreshold = FAILURE_THRESHOLD;
+ clientFailureThreshold = CLIENT_FAILURE_THRESHOLD;
+ useTestSpi = false;
+ }
+ }
+
+ /**
* @throws Exception in case of error.
*/
private void checkFailureThresholdWorkability() throws Exception {
@@ -288,15 +425,114 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
*/
private static class TestTcpDiscoverySpi2 extends TcpDiscoverySpi {
/** */
- private long readDelay;
+ private volatile long readDelay;
+
+ private volatile long writeToSocketDelay;
/** */
private Exception err;
+ /** */
+ @Override protected void writeToSocket(
+ Socket sock,
+ TcpDiscoveryAbstractMessage msg,
+ byte[] data,
+ long timeout
+ ) throws IOException {
+ if (writeToSocketDelay > 0) {
+ try {
+ U.dumpStack(log, "Before sleep [msg=" + msg +
+ ", arrLen=" + (data != null ? data.length : "n/a") + ']');
+
+ Thread.sleep(writeToSocketDelay);
+ }
+ catch (InterruptedException e) {
+ // Nothing to do.
+ }
+ }
+
+ if (sock.getSoTimeout() >= writeToSocketDelay)
+ super.writeToSocket(sock, msg, data, timeout);
+ else
+ throw new SocketTimeoutException("Write to socket delay timeout exception.");
+ }
+
+ /** */
+ @Override protected void writeToSocket(Socket sock,
+ OutputStream out,
+ TcpDiscoveryAbstractMessage msg,
+ long timeout) throws IOException, IgniteCheckedException {
+ if (writeToSocketDelay > 0) {
+ try {
+ U.dumpStack(log, "Before sleep [msg=" + msg + ']');
+
+ Thread.sleep(writeToSocketDelay);
+ }
+ catch (InterruptedException e) {
+ // Nothing to do.
+ }
+ }
+
+ if (sock.getSoTimeout() >= writeToSocketDelay)
+ super.writeToSocket(sock, out, msg, timeout);
+ else
+ throw new SocketTimeoutException("Write to socket delay timeout exception.");
+ }
+
+ /** */
+ @Override protected void writeToSocket(
+ Socket sock,
+ TcpDiscoveryAbstractMessage msg,
+ long timeout
+ ) throws IOException, IgniteCheckedException {
+ if (writeToSocketDelay > 0) {
+ try {
+ U.dumpStack(log, "Before sleep [msg=" + msg + ']');
+
+ Thread.sleep(writeToSocketDelay);
+ }
+ catch (InterruptedException e) {
+ // Nothing to do.
+ }
+ }
+
+ if (sock.getSoTimeout() >= writeToSocketDelay)
+ super.writeToSocket(sock, msg, timeout);
+ else
+ throw new SocketTimeoutException("Write to socket delay timeout exception.");
+ }
+
+ /** */
+ @Override protected void writeToSocket(
+ TcpDiscoveryAbstractMessage msg,
+ Socket sock,
+ int res,
+ long timeout
+ ) throws IOException {
+ if (writeToSocketDelay > 0) {
+ try {
+ U.dumpStack(log, "Before sleep [msg=" + msg + ']');
+
+ Thread.sleep(writeToSocketDelay);
+ }
+ catch (InterruptedException e) {
+ // Nothing to do.
+ }
+ }
+
+ if (sock.getSoTimeout() >= writeToSocketDelay)
+ super.writeToSocket(msg, sock, res, timeout);
+ else
+ throw new SocketTimeoutException("Write to socket delay timeout exception.");
+ }
+
/** {@inheritDoc} */
@Override protected <T> T readMessage(Socket sock, @Nullable InputStream in, long timeout)
throws IOException, IgniteCheckedException {
- if (readDelay < failureDetectionTimeout()) {
+ long currTimeout = getLocalNode().isClient() ?
+ clientFailureDetectionTimeout() : failureDetectionTimeout();
+
+ if (readDelay < currTimeout) {
try {
return super.readMessage(sock, in, timeout);
}
@@ -329,6 +565,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov
*/
private void reset() {
readDelay = 0;
+ writeToSocketDelay = 0;
err = null;
}
}
[3/3] ignite git commit: ignite-4799 TcpDiscoverySpi: removed
missedHeartbeats properties,
heartbeatFrequency (instead use IgiteConfiguration.metricsUpdateFrequency).
Added IgiteConfiguration.clientFailureDetectionTimeout.
Posted by sb...@apache.org.
ignite-4799 TcpDiscoverySpi: removed missedHeartbeats properties, heartbeatFrequency (instead use IgiteConfiguration.metricsUpdateFrequency). Added IgiteConfiguration.clientFailureDetectionTimeout.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6998785a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6998785a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6998785a
Branch: refs/heads/ignite-2.0
Commit: 6998785a8861387b7ad83527a381dc5b772cf76f
Parents: c829aac
Author: Alexander Belyak <al...@xored.com>
Authored: Wed Apr 26 15:43:42 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 26 15:43:42 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/gridify/AbstractAopTest.java | 4 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 6 +-
.../clients/src/test/resources/spring-cache.xml | 1 -
.../apache/ignite/cluster/ClusterMetrics.java | 4 +-
.../org/apache/ignite/cluster/ClusterNode.java | 11 +-
.../configuration/IgniteConfiguration.java | 52 ++-
.../org/apache/ignite/events/EventType.java | 2 +-
.../processors/job/GridJobProcessor.java | 18 +-
.../utils/PlatformConfigurationUtils.java | 32 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 32 ++
.../spi/IgniteSpiOperationTimeoutHelper.java | 8 +-
.../jobstealing/JobStealingCollisionSpi.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 31 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 142 ++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 143 ++------
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 26 +-
.../tcp/internal/TcpDiscoveryNode.java | 33 +-
.../TcpDiscoveryClientHeartbeatMessage.java | 72 ----
.../TcpDiscoveryClientMetricsUpdateMessage.java | 72 ++++
.../messages/TcpDiscoveryHeartbeatMessage.java | 338 -------------------
.../TcpDiscoveryMetricsUpdateMessage.java | 338 +++++++++++++++++++
.../adaptive/AdaptiveLoadBalancingSpi.java | 12 +-
.../resources/META-INF/classnames.properties | 8 +-
.../core/src/test/config/load/dsi-load-base.xml | 3 +-
.../src/test/config/load/merge-sort-base.xml | 7 +-
.../config/streamer/spring-streamer-base.xml | 5 +-
.../java/org/apache/ignite/GridTestJob.java | 19 ++
.../java/org/apache/ignite/GridTestTask.java | 18 +-
.../internal/ClusterNodeMetricsSelfTest.java | 10 +-
.../ignite/internal/GridAffinityMappedTest.java | 5 +-
.../internal/GridAffinityP2PSelfTest.java | 3 +-
.../ignite/internal/GridAffinitySelfTest.java | 3 +-
.../GridCancelledJobsMetricsSelfTest.java | 4 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 4 +-
.../GridJobCollisionCancelSelfTest.java | 2 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 4 +-
.../cache/GridCacheAbstractSelfTest.java | 4 +-
.../cache/GridCacheMvccManagerSelfTest.java | 3 +-
.../cache/IgniteCacheAbstractTest.java | 10 +-
.../binary/BinaryMetadataUpdatesFlowTest.java | 4 +-
.../CacheLateAffinityAssignmentTest.java | 3 +-
.../GridCacheNodeFailureAbstractTest.java | 3 +-
.../distributed/IgniteCache150ClientsTest.java | 2 +-
.../IgniteCacheNearRestartRollbackSelfTest.java | 2 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +-
.../GridCacheDhtPreloadMessageCountTest.java | 2 +-
.../atomic/IgniteCacheAtomicProtocolTest.java | 2 +-
.../near/GridCacheNearMultiGetSelfTest.java | 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 2 +-
...achePartitionedTxSingleThreadedSelfTest.java | 2 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 4 +-
.../service/GridServiceClientNodeTest.java | 7 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 11 +-
...idSingleSplitsNewNodesMulticastLoadTest.java | 9 +-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 2 +-
.../discovery/AbstractDiscoverySelfTest.java | 19 +-
...lientDiscoverySpiFailureTimeoutSelfTest.java | 245 +++++++++++++-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 79 ++++-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 18 +-
.../tcp/TcpDiscoverySpiConfigSelfTest.java | 4 +-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 51 +--
.../testframework/junits/GridAbstractTest.java | 10 +-
.../webapp/META-INF/ignite-webapp-config.xml | 1 -
.../Cache/CacheMetricsTest.cs | 3 +-
.../IgniteConfigurationSerializerTest.cs | 1 -
.../IgniteConfigurationTest.cs | 1 -
.../Discovery/Tcp/TcpDiscoverySpi.cs | 15 -
.../IgniteConfigurationSection.xsd | 5 -
.../Datagrid/MultiTieredCacheExample.cs | 2 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 4 +-
.../webapp2/META-INF/ignite-webapp-config.xml | 1 -
74 files changed, 1135 insertions(+), 886 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
index 2008eff..33f2cdd 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -54,9 +54,9 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
cfg.setDeploymentSpi(new LocalDeploymentSpi());
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+ cfg.setMetricsUpdateFrequency(500);
cfg.setDeploymentMode(depMode);
return cfg;
@@ -738,4 +738,4 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
return true;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
index b53501b..44fa48d 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
@@ -524,9 +524,7 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration();
cfg.setDeploymentSpi(new LocalDeploymentSpi());
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500);
-
- cfg.setDeploymentMode(depMode);
+ cfg.setMetricsUpdateFrequency(500);
cfg.setDeploymentMode(depMode);
@@ -539,4 +537,4 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {
@Override public String getTestIgniteInstanceName() {
return "ExternalAopTarget";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index 4dbae6e..8cbc688 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -148,7 +148,6 @@
<property name="bucketName" value="YOUR_BUCKET_NAME_IP_FINDER"/>
</bean>
</property>
- <property name="heartbeatFrequency" value="2000"/>
</bean>
</property>
-->
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
index 50c09be..7dd4707 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterMetrics.java
@@ -29,8 +29,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
* <p>
* Node metrics for any node can be accessed via {@link ClusterNode#metrics()}
* method. Keep in mind that there will be a certain network delay (usually
- * equal to heartbeat delay) for the accuracy of node metrics. However, when accessing
- * metrics on local node {@link IgniteCluster#localNode() Grid.localNode().getMetrics()}
+ * equal to metrics update delay) for the accuracy of node metrics. However, when accessing
+ * metrics on local node {@link IgniteCluster#localNode() IgniteCluster.localNode().getMetrics()}
* the metrics are always accurate and up to date.
* <p>
* Local node metrics are registered as {@code MBean} and can be accessed from
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index bfc395d..e122ff6 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -87,9 +87,8 @@ import org.jetbrains.annotations.Nullable;
* <h1 class="header">Cluster Node Metrics</h1>
* Cluster node metrics (see {@link #metrics()}) are updated frequently for all nodes
* and can be used to get dynamic information about a node. The frequency of update
- * is often directly related to the heartbeat exchange between nodes. So if, for example,
- * default {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi} is used,
- * the metrics data will be updated every {@code 2} seconds by default.
+ * is controlled by {@link org.apache.ignite.configuration.IgniteConfiguration#getMetricsUpdateFrequency()} parameter.
+ * The metrics data will be updated every {@code 2} seconds by default.
* <p>
* Grid node metrics provide information that can frequently change,
* such as Heap and Non-Heap memory utilization, CPU load, number of active and waiting
@@ -145,9 +144,9 @@ public interface ClusterNode {
* method and use it during {@link org.apache.ignite.compute.ComputeTask#map(List, Object)} or during collision
* resolution.
* <p>
- * Node metrics are updated with some delay which is directly related to heartbeat
- * frequency. For example, when used with default
- * {@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi} the update will happen every {@code 2} seconds.
+ * Node metrics are updated with some delay which is controlled by
+ * {@link org.apache.ignite.configuration.IgniteConfiguration#getMetricsUpdateFrequency()} parameter.
+ * By default the update will happen every {@code 2} seconds.
*
* @return Runtime metrics snapshot for this node.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 17927b9..9f68399 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -200,6 +200,10 @@ public class IgniteConfiguration {
@SuppressWarnings("UnnecessaryBoxing")
public static final Long DFLT_FAILURE_DETECTION_TIMEOUT = new Long(10_000);
+ /** Default failure detection timeout for client nodes in millis. */
+ @SuppressWarnings("UnnecessaryBoxing")
+ public static final Long DFLT_CLIENT_FAILURE_DETECTION_TIMEOUT = new Long(30_000);
+
/** Optional local Ignite instance name. */
private String igniteInstanceName;
@@ -386,6 +390,9 @@ public class IgniteConfiguration {
/** Failure detection timeout. */
private Long failureDetectionTimeout = DFLT_FAILURE_DETECTION_TIMEOUT;
+ /** Failure detection timeout for client nodes. */
+ private Long clientFailureDetectionTimeout = DFLT_CLIENT_FAILURE_DETECTION_TIMEOUT;
+
/** Property names to include into node attributes. */
private String[] includeProps;
@@ -491,6 +498,7 @@ public class IgniteConfiguration {
cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled();
callbackPoolSize = cfg.getAsyncCallbackPoolSize();
classLdr = cfg.getClassLoader();
+ clientFailureDetectionTimeout = cfg.getClientFailureDetectionTimeout();
clientMode = cfg.isClientMode();
connectorCfg = cfg.getConnectorConfiguration();
consistentId = cfg.getConsistentId();
@@ -1288,20 +1296,13 @@ public class IgniteConfiguration {
}
/**
- * Gets job metrics update frequency in milliseconds.
+ * Gets Ignite metrics update frequency in milliseconds.
* <p>
* Updating metrics too frequently may have negative performance impact.
* <p>
- * The following values are accepted:
- * <ul>
- * <li>{@code -1} job metrics are never updated.</li>
- * <li>{@code 0} job metrics are updated on each job start and finish.</li>
- * <li>Positive value defines the actual update frequency. If not provided, then default value
- * {@link #DFLT_METRICS_UPDATE_FREQ} is used.</li>
- * </ul>
* If not provided, then default value {@link #DFLT_METRICS_UPDATE_FREQ} is used.
*
- * @return Job metrics update frequency in milliseconds.
+ * @return Metrics update frequency in milliseconds.
* @see #DFLT_METRICS_UPDATE_FREQ
*/
public long getMetricsUpdateFrequency() {
@@ -1309,15 +1310,13 @@ public class IgniteConfiguration {
}
/**
- * Sets job metrics update frequency in milliseconds.
+ * Sets Ignite metrics update frequency in milliseconds.
* <p>
- * If set to {@code -1} job metrics are never updated.
- * If set to {@code 0} job metrics are updated on each job start and finish.
* Positive value defines the actual update frequency.
* If not provided, then default value
* {@link #DFLT_METRICS_UPDATE_FREQ} is used.
*
- * @param metricsUpdateFreq Job metrics update frequency in milliseconds.
+ * @param metricsUpdateFreq Metrics update frequency in milliseconds.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setMetricsUpdateFrequency(long metricsUpdateFreq) {
@@ -1835,6 +1834,33 @@ public class IgniteConfiguration {
}
/**
+ * Returns failure detection timeout for client nodes used by {@link TcpDiscoverySpi} and {@link TcpCommunicationSpi}.
+ * <p>
+ * Default is {@link #DFLT_CLIENT_FAILURE_DETECTION_TIMEOUT}.
+ *
+ * @see #setClientFailureDetectionTimeout(long)
+ * @return Failure detection timeout for client nodes in milliseconds.
+ */
+ public Long getClientFailureDetectionTimeout() {
+ return clientFailureDetectionTimeout;
+ }
+
+ /**
+ * Sets failure detection timeout to use in {@link TcpDiscoverySpi} and {@link TcpCommunicationSpi}.
+ * <p>
+ * Failure detection timeout is used to determine how long the communication or discovery SPIs should wait before
+ * considering a remote connection failed.
+ *
+ * @param clientFailureDetectionTimeout Failure detection timeout in milliseconds.
+ * @return {@code this} for chaining.
+ */
+ public IgniteConfiguration setClientFailureDetectionTimeout(long clientFailureDetectionTimeout) {
+ this.clientFailureDetectionTimeout = clientFailureDetectionTimeout;
+
+ return this;
+ }
+
+ /**
* Returns failure detection timeout used by {@link TcpDiscoverySpi} and {@link TcpCommunicationSpi}.
* <p>
* Default is {@link #DFLT_FAILURE_DETECTION_TIMEOUT}.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index e506371..1960692 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -136,7 +136,7 @@ public interface EventType {
* Built-in event type: node metrics updated.
* <br>
* Generated when node's metrics are updated. In most cases this callback
- * is invoked with every heartbeat received from a node (including local node).
+ * is invoked with every metrics update received from a node (including local node).
* <p>
* NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
* internal Ignite events and should not be used by user-defined events.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 369ca22..e0bc4d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -855,8 +855,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
}
});
- if (metricsUpdateFreq > -1L)
- updateJobMetrics();
+ updateJobMetrics();
}
finally {
handlingCollision.set(Boolean.FALSE);
@@ -867,24 +866,21 @@ public class GridJobProcessor extends GridProcessorAdapter {
*
*/
private void updateJobMetrics() {
- assert metricsUpdateFreq > -1L;
+ assert metricsUpdateFreq > 0L;
- if (metricsUpdateFreq == 0L)
+ long now = U.currentTimeMillis();
+ long lastUpdate = metricsLastUpdateTstamp.get();
+
+ if (now - lastUpdate > metricsUpdateFreq && metricsLastUpdateTstamp.compareAndSet(lastUpdate, now))
updateJobMetrics0();
- else {
- long now = U.currentTimeMillis();
- long lastUpdate = metricsLastUpdateTstamp.get();
- if (now - lastUpdate > metricsUpdateFreq && metricsLastUpdateTstamp.compareAndSet(lastUpdate, now))
- updateJobMetrics0();
- }
}
/**
*
*/
private void updateJobMetrics0() {
- assert metricsUpdateFreq > -1L;
+ assert metricsUpdateFreq > 0L;
GridJobMetricsSnapshot m = new GridJobMetricsSnapshot();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index 4186eb9..eb3e716 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -531,7 +531,8 @@ public class PlatformConfigurationUtils {
if (in.readBoolean())
cfg.setClientMode(in.readBoolean());
int[] eventTypes = in.readIntArray();
- if (eventTypes != null) cfg.setIncludeEventTypes(eventTypes);
+ if (eventTypes != null)
+ cfg.setIncludeEventTypes(eventTypes);
if (in.readBoolean())
cfg.setMetricsExpireTime(in.readLong());
if (in.readBoolean())
@@ -556,8 +557,10 @@ public class PlatformConfigurationUtils {
cfg.setDaemon(in.readBoolean());
if (in.readBoolean())
cfg.setLateAffinityAssignment(in.readBoolean());
- if (in.readBoolean())
+ if (in.readBoolean()) {
+ cfg.setClientFailureDetectionTimeout(in.readLong());
cfg.setFailureDetectionTimeout(in.readLong());
+ }
readCacheConfigurations(in, cfg);
readDiscoveryConfiguration(in, cfg);
@@ -752,12 +755,9 @@ public class PlatformConfigurationUtils {
disco.setReconnectCount(in.readInt());
disco.setLocalPort(in.readInt());
disco.setLocalPortRange(in.readInt());
- disco.setMaxMissedHeartbeats(in.readInt());
- disco.setMaxMissedClientHeartbeats(in.readInt());
disco.setStatisticsPrintFrequency(in.readLong());
disco.setIpFinderCleanFrequency(in.readLong());
disco.setThreadPriority(in.readInt());
- disco.setHeartbeatFrequency(in.readLong());
disco.setTopHistorySize(in.readInt());
cfg.setDiscoverySpi(disco);
@@ -960,7 +960,8 @@ public class PlatformConfigurationUtils {
w.writeLong(cfg.getMetricsUpdateFrequency());
w.writeBoolean(true);
w.writeInt(cfg.getNetworkSendRetryCount());
- w.writeBoolean(true);w.writeLong(cfg.getNetworkSendRetryDelay());
+ w.writeBoolean(true);
+ w.writeLong(cfg.getNetworkSendRetryDelay());
w.writeBoolean(true);
w.writeLong(cfg.getNetworkTimeout());
w.writeString(cfg.getWorkDirectory());
@@ -970,6 +971,7 @@ public class PlatformConfigurationUtils {
w.writeBoolean(true);
w.writeBoolean(cfg.isLateAffinityAssignment());
w.writeBoolean(true);
+ w.writeLong(cfg.getClientFailureDetectionTimeout());
w.writeLong(cfg.getFailureDetectionTimeout());
CacheConfiguration[] cacheCfg = cfg.getCacheConfiguration();
@@ -1063,17 +1065,17 @@ public class PlatformConfigurationUtils {
else
w.writeBoolean(false);
- EventStorageSpi eventStorageSpi = cfg.getEventStorageSpi();
+ EventStorageSpi evtStorageSpi = cfg.getEventStorageSpi();
- if (eventStorageSpi == null) {
+ if (evtStorageSpi == null)
w.writeByte((byte) 0);
- } else if (eventStorageSpi instanceof NoopEventStorageSpi) {
+ else if (evtStorageSpi instanceof NoopEventStorageSpi)
w.writeByte((byte) 1);
- } else if (eventStorageSpi instanceof MemoryEventStorageSpi) {
+ else if (evtStorageSpi instanceof MemoryEventStorageSpi) {
w.writeByte((byte) 2);
- w.writeLong(((MemoryEventStorageSpi)eventStorageSpi).getExpireCount());
- w.writeLong(((MemoryEventStorageSpi)eventStorageSpi).getExpireAgeMs());
+ w.writeLong(((MemoryEventStorageSpi)evtStorageSpi).getExpireCount());
+ w.writeLong(((MemoryEventStorageSpi)evtStorageSpi).getExpireAgeMs());
}
writeMemoryConfiguration(w, cfg.getMemoryConfiguration());
@@ -1135,9 +1137,8 @@ public class PlatformConfigurationUtils {
w.writeInt(ttl);
}
}
- else {
+ else
w.writeBoolean(false);
- }
w.writeLong(tcp.getSocketTimeout());
w.writeLong(tcp.getAckTimeout());
@@ -1151,12 +1152,9 @@ public class PlatformConfigurationUtils {
w.writeInt(tcp.getReconnectCount());
w.writeInt(tcp.getLocalPort());
w.writeInt(tcp.getLocalPortRange());
- w.writeInt(tcp.getMaxMissedHeartbeats());
- w.writeInt(tcp.getMaxMissedClientHeartbeats());
w.writeLong(tcp.getStatisticsPrintFrequency());
w.writeLong(tcp.getIpFinderCleanFrequency());
w.writeInt(tcp.getThreadPriority());
- w.writeLong(tcp.getHeartbeatFrequency());
w.writeInt((int)tcp.getTopHistorySize());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index ec56f4f..81f5c28 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -95,6 +95,12 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
private boolean failureDetectionTimeoutEnabled = true;
/**
+ * Failure detection timeout for client nodes. Initialized with the value of
+ * {@link IgniteConfiguration#getClientFailureDetectionTimeout()}.
+ */
+ private long clientFailureDetectionTimeout;
+
+ /**
* Failure detection timeout. Initialized with the value of
* {@link IgniteConfiguration#getFailureDetectionTimeout()}.
*/
@@ -648,12 +654,29 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
// Because U.currentTimeInMillis() is updated once in 10 milliseconds.
log.warning("Failure detection timeout is too low, it may lead to unpredictable behaviour " +
"[failureDetectionTimeout=" + failureDetectionTimeout + ']');
+ else if (failureDetectionTimeout <= ignite.configuration().getMetricsUpdateFrequency())
+ log.warning("'IgniteConfiguration.failureDetectionTimeout' should be greater then " +
+ "'IgniteConfiguration.metricsUpdateFrequency' to prevent unnecessary status checking.");
}
// Intentionally compare references using '!=' below
else if (ignite.configuration().getFailureDetectionTimeout() !=
IgniteConfiguration.DFLT_FAILURE_DETECTION_TIMEOUT)
log.warning("Failure detection timeout will be ignored (one of SPI parameters has been set explicitly)");
+ clientFailureDetectionTimeout = ignite.configuration().getClientFailureDetectionTimeout();
+
+ if (clientFailureDetectionTimeout <= 0)
+ throw new IgniteSpiException("Invalid client failure detection timeout value: " +
+ clientFailureDetectionTimeout);
+ else if (clientFailureDetectionTimeout <= 10)
+ // Because U.currentTimeInMillis() is updated once in 10 milliseconds.
+ log.warning("Client failure detection timeout is too low, it may lead to unpredictable behaviour " +
+ "[clientFailureDetectionTimeout=" + clientFailureDetectionTimeout + ']');
+
+ if (clientFailureDetectionTimeout < ignite.configuration().getMetricsUpdateFrequency())
+ throw new IgniteSpiException("Inconsistent configuration " +
+ "('IgniteConfiguration.clientFailureDetectionTimeout' must be greater or equal to " +
+ "'IgniteConfiguration.metricsUpdateFrequency').");
}
/**
@@ -675,6 +698,15 @@ public abstract class IgniteSpiAdapter implements IgniteSpi {
}
/**
+ * Returns client failure detection timeout set to use for network related operations.
+ *
+ * @return client failure detection timeout in milliseconds or {@code 0} if the timeout is disabled.
+ */
+ public long clientFailureDetectionTimeout() {
+ return clientFailureDetectionTimeout;
+ }
+
+ /**
* Returns failure detection timeout set to use for network related operations.
*
* @return failure detection timeout in milliseconds or {@code 0} if the timeout is disabled.
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
index e17b0dd..c685ea9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiOperationTimeoutHelper.java
@@ -45,10 +45,12 @@ public class IgniteSpiOperationTimeoutHelper {
* Constructor.
*
* @param adapter SPI adapter.
+ * @param srvOp {@code True} if communicates with server node.
*/
- public IgniteSpiOperationTimeoutHelper(IgniteSpiAdapter adapter) {
+ public IgniteSpiOperationTimeoutHelper(IgniteSpiAdapter adapter, boolean srvOp) {
failureDetectionTimeoutEnabled = adapter.failureDetectionTimeoutEnabled();
- failureDetectionTimeout = adapter.failureDetectionTimeout();
+ failureDetectionTimeout = srvOp ? adapter.failureDetectionTimeout() :
+ adapter.clientFailureDetectionTimeout();
}
/**
@@ -99,4 +101,4 @@ public class IgniteSpiOperationTimeoutHelper {
return e instanceof IgniteSpiOperationTimeoutException || e instanceof SocketTimeoutException ||
X.hasCause(e, IgniteSpiOperationTimeoutException.class, SocketException.class);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index 8a02225..6f2c099 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -88,7 +88,7 @@ import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
* {@link org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi JobStealingFailoverSpi}.
* Also note that job metrics update should be enabled in order for this SPI
* to work properly (i.e. {@link org.apache.ignite.configuration.IgniteConfiguration#getMetricsUpdateFrequency() IgniteConfiguration#getMetricsUpdateFrequency()}
- * should be set to {@code 0} or greater value).
+ * should be set to positive value).
* The responsibility of Job Stealing Failover SPI is to properly route <b>stolen</b>
* jobs to the nodes that initially requested (<b>stole</b>) these jobs. The
* SPI maintains a counter of how many times a jobs was stolen and
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 1fedf83..be897d6 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2727,7 +2727,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
long connTimeout0 = connTimeout;
- IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(this);
+ IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(this,
+ !node.isClient());
while (true) {
GridCommunicationClient client;
@@ -2918,7 +2919,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements Communicati
int attempt = 1;
- IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(this);
+ IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(this,
+ !node.isClient());
while (!conn) { // Reconnection on handshake timeout.
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 34ee414..b5b4c77 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -81,7 +81,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponse;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientMetricsUpdateMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage;
@@ -89,7 +89,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessa
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage;
@@ -272,9 +272,9 @@ class ClientImpl extends TcpDiscoveryImpl {
}
timer.schedule(
- new HeartbeatSender(),
- spi.hbFreq,
- spi.hbFreq);
+ new MetricsSender(),
+ spi.metricsUpdateFreq,
+ spi.metricsUpdateFreq);
spi.printStartInfo();
}
@@ -597,7 +597,7 @@ class ClientImpl extends TcpDiscoveryImpl {
UUID locNodeId = getLocalNodeId();
- IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi);
+ IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi, true);
while (true) {
boolean openSock = false;
@@ -861,13 +861,14 @@ class ClientImpl extends TcpDiscoveryImpl {
}
/**
- * Heartbeat sender.
+ * Metrics sender.
*/
- private class HeartbeatSender extends TimerTask {
+ private class MetricsSender extends TimerTask {
/** {@inheritDoc} */
@Override public void run() {
if (!spi.getSpiContext().isStopping() && sockWriter.isOnline()) {
- TcpDiscoveryClientHeartbeatMessage msg = new TcpDiscoveryClientHeartbeatMessage(getLocalNodeId(),
+ TcpDiscoveryClientMetricsUpdateMessage msg = new TcpDiscoveryClientMetricsUpdateMessage(
+ getLocalNodeId(),
spi.metricsProvider.metrics());
msg.client(true);
@@ -1829,8 +1830,8 @@ class ClientImpl extends TcpDiscoveryImpl {
processNodeLeftMessage((TcpDiscoveryNodeLeftMessage)msg);
else if (msg instanceof TcpDiscoveryNodeFailedMessage)
processNodeFailedMessage((TcpDiscoveryNodeFailedMessage)msg);
- else if (msg instanceof TcpDiscoveryHeartbeatMessage)
- processHeartbeatMessage((TcpDiscoveryHeartbeatMessage)msg);
+ else if (msg instanceof TcpDiscoveryMetricsUpdateMessage)
+ processMetricsUpdateMessage((TcpDiscoveryMetricsUpdateMessage)msg);
else if (msg instanceof TcpDiscoveryClientReconnectMessage)
processClientReconnectMessage((TcpDiscoveryClientReconnectMessage)msg);
else if (msg instanceof TcpDiscoveryCustomEventMessage)
@@ -2152,7 +2153,7 @@ class ClientImpl extends TcpDiscoveryImpl {
/**
* @param msg Message.
*/
- private void processHeartbeatMessage(TcpDiscoveryHeartbeatMessage msg) {
+ private void processMetricsUpdateMessage(TcpDiscoveryMetricsUpdateMessage msg) {
if (spi.getSpiContext().isStopping())
return;
@@ -2160,16 +2161,16 @@ class ClientImpl extends TcpDiscoveryImpl {
assert msg.senderNodeId() != null;
if (log.isDebugEnabled())
- log.debug("Received heartbeat response: " + msg);
+ log.debug("Received metrics response: " + msg);
}
else {
long tstamp = U.currentTimeMillis();
if (msg.hasMetrics()) {
- for (Map.Entry<UUID, TcpDiscoveryHeartbeatMessage.MetricsSet> e : msg.metrics().entrySet()) {
+ for (Map.Entry<UUID, TcpDiscoveryMetricsUpdateMessage.MetricsSet> e : msg.metrics().entrySet()) {
UUID nodeId = e.getKey();
- TcpDiscoveryHeartbeatMessage.MetricsSet metricsSet = e.getValue();
+ TcpDiscoveryMetricsUpdateMessage.MetricsSet metricsSet = e.getValue();
Map<Integer, CacheMetrics> cacheMetrics = msg.hasCacheMetrics(nodeId) ?
msg.cacheMetrics().get(nodeId) : Collections.<Integer, CacheMetrics>emptyMap();
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/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 47c13e1..6a10ec2 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
@@ -106,7 +106,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponse;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientMetricsUpdateMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientReconnectMessage;
@@ -116,7 +116,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHeartbeatMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryJoinRequestMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage;
import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage;
@@ -612,7 +612,8 @@ class ServerImpl extends TcpDiscoveryImpl {
UUID locNodeId = getLocalNodeId();
- IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi);
+ IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi,
+ clientNodeId == null);
if (F.contains(spi.locNodeAddrs, addr)) {
if (clientNodeId == null)
@@ -991,7 +992,9 @@ class ServerImpl extends TcpDiscoveryImpl {
for (InetSocketAddress addr : addrs) {
try {
- Integer res = sendMessageDirectly(joinReq, addr);
+ IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi, true);
+
+ Integer res = sendMessageDirectly(joinReq, addr, timeoutHelper);
assert res != null;
@@ -1104,10 +1107,12 @@ class ServerImpl extends TcpDiscoveryImpl {
*
* @param msg Message to send.
* @param addr Address to send message to.
+ * @param timeoutHelper Operation timeout helper.
* @return Response read from the recipient or {@code null} if no response is supposed.
* @throws IgniteSpiException If an error occurs.
*/
- @Nullable private Integer sendMessageDirectly(TcpDiscoveryAbstractMessage msg, InetSocketAddress addr)
+ @Nullable private Integer sendMessageDirectly(TcpDiscoveryAbstractMessage msg, InetSocketAddress addr,
+ IgniteSpiOperationTimeoutHelper timeoutHelper)
throws IgniteSpiException {
assert msg != null;
assert addr != null;
@@ -1124,8 +1129,6 @@ class ServerImpl extends TcpDiscoveryImpl {
UUID locNodeId = getLocalNodeId();
- IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi);
-
int reconCnt = 0;
while (true){
@@ -1731,7 +1734,7 @@ class ServerImpl extends TcpDiscoveryImpl {
* @return {@code True} if recordable in debug mode.
*/
private boolean recordable(TcpDiscoveryAbstractMessage msg) {
- return !(msg instanceof TcpDiscoveryHeartbeatMessage) &&
+ return !(msg instanceof TcpDiscoveryMetricsUpdateMessage) &&
!(msg instanceof TcpDiscoveryStatusCheckMessage) &&
!(msg instanceof TcpDiscoveryDiscardMessage) &&
!(msg instanceof TcpDiscoveryConnectionCheckMessage);
@@ -1759,7 +1762,7 @@ class ServerImpl extends TcpDiscoveryImpl {
* @param msg Message.
* @param nodeId Node ID.
*/
- private static void removeMetrics(TcpDiscoveryHeartbeatMessage msg, UUID nodeId) {
+ private static void removeMetrics(TcpDiscoveryMetricsUpdateMessage msg, UUID nodeId) {
msg.removeMetrics(nodeId);
msg.removeCacheMetrics(nodeId);
}
@@ -2384,11 +2387,11 @@ class ServerImpl extends TcpDiscoveryImpl {
/** Last time status message has been sent. */
private long lastTimeStatusMsgSent;
- /** Incoming heartbeats check frequency. */
- private long hbCheckFreq = (long)spi.maxMissedHbs * spi.hbFreq + 50;
+ /** Incoming metrics check frequency. */
+ private long metricsCheckFreq = 3 * spi.metricsUpdateFreq + 50;
- /** Last time heartbeat message has been sent. */
- private long lastTimeHbMsgSent;
+ /** Last time metrics update message has been sent. */
+ private long lastTimeMetricsUpdateMsgSent;
/** Time when the last status message has been sent. */
private long lastTimeConnCheckMsgSent;
@@ -2483,7 +2486,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (spi.failureDetectionTimeoutEnabled())
connCheckThreshold = spi.failureDetectionTimeout();
else
- connCheckThreshold = Math.min(spi.getSocketTimeout(), spi.getHeartbeatFrequency());
+ connCheckThreshold = Math.min(spi.getSocketTimeout(), spi.metricsUpdateFreq);
for (int i = 3; i > 0; i--) {
connCheckFreq = connCheckThreshold / i;
@@ -2502,7 +2505,7 @@ class ServerImpl extends TcpDiscoveryImpl {
* @param msg Message to process.
*/
@Override protected void processMessage(TcpDiscoveryAbstractMessage msg) {
- sendHeartbeatMessage();
+ sendMetricsUpdateMessage();
DebugLogger log = messageLogger(msg);
@@ -2555,8 +2558,8 @@ class ServerImpl extends TcpDiscoveryImpl {
else if (msg instanceof TcpDiscoveryNodeFailedMessage)
processNodeFailedMessage((TcpDiscoveryNodeFailedMessage)msg);
- else if (msg instanceof TcpDiscoveryHeartbeatMessage)
- processHeartbeatMessage((TcpDiscoveryHeartbeatMessage)msg);
+ else if (msg instanceof TcpDiscoveryMetricsUpdateMessage)
+ processMetricsUpdateMessage((TcpDiscoveryMetricsUpdateMessage)msg);
else if (msg instanceof TcpDiscoveryStatusCheckMessage)
processStatusCheckMessage((TcpDiscoveryStatusCheckMessage)msg);
@@ -2594,9 +2597,9 @@ class ServerImpl extends TcpDiscoveryImpl {
checkConnection();
- sendHeartbeatMessage();
+ sendMetricsUpdateMessage();
- checkHeartbeatsReceiving();
+ checkMetricsReceiving();
checkPendingCustomMessages();
@@ -2750,7 +2753,7 @@ class ServerImpl extends TcpDiscoveryImpl {
while (true) {
if (sock == null) {
if (timeoutHelper == null)
- timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi);
+ timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi, true);
nextNodeExists = false;
@@ -2918,7 +2921,7 @@ class ServerImpl extends TcpDiscoveryImpl {
pendingMsgs.discardId, pendingMsgs.customDiscardId);
if (timeoutHelper == null)
- timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi);
+ timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi, true);
try {
spi.writeToSocket(sock, out, pendingMsg, timeoutHelper.nextTimeoutChunk(
@@ -2958,7 +2961,7 @@ class ServerImpl extends TcpDiscoveryImpl {
long tstamp = U.currentTimeMillis();
if (timeoutHelper == null)
- timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi);
+ timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi, true);
if (!failedNodes.isEmpty()) {
for (TcpDiscoveryNode failedNode : failedNodes) {
@@ -3817,7 +3820,9 @@ class ServerImpl extends TcpDiscoveryImpl {
for (InetSocketAddress addr : spi.getNodeAddresses(node, U.sameMacs(locNode, node))) {
try {
- sendMessageDirectly(msg, addr);
+ IgniteSpiOperationTimeoutHelper timeoutHelper = new IgniteSpiOperationTimeoutHelper(spi, true);
+
+ sendMessageDirectly(msg, addr, timeoutHelper);
node.lastSuccessfulAddress(addr);
@@ -3853,7 +3858,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (node != null) {
node.clientRouterNodeId(msg.routerNodeId());
- node.aliveCheck(spi.maxMissedClientHbs);
+ node.clientAliveTime(spi.clientFailureDetectionTimeout());
}
if (isLocalNodeCoordinator()) {
@@ -4083,7 +4088,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
if (msg.client())
- node.aliveCheck(spi.maxMissedClientHbs);
+ node.clientAliveTime(spi.clientFailureDetectionTimeout());
boolean topChanged = ring.add(node);
@@ -4830,7 +4835,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
if (locNodeId.equals(msg.creatorNodeId()) && msg.senderNodeId() == null &&
- U.currentTimeMillis() - locNode.lastUpdateTime() < spi.hbFreq) {
+ U.currentTimeMillis() - locNode.lastUpdateTime() < spi.metricsUpdateFreq) {
if (log.isDebugEnabled())
log.debug("Status check message discarded (local node receives updates).");
@@ -4873,11 +4878,11 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
- * Processes regular heartbeat message.
+ * Processes regular metrics update message.
*
- * @param msg Heartbeat message.
+ * @param msg Metrics update message.
*/
- private void processHeartbeatMessage(TcpDiscoveryHeartbeatMessage msg) {
+ private void processMetricsUpdateMessage(TcpDiscoveryMetricsUpdateMessage msg) {
assert msg != null;
assert !msg.client();
@@ -4886,7 +4891,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (ring.node(msg.creatorNodeId()) == null) {
if (log.isDebugEnabled())
- log.debug("Discarding heartbeat message issued by unknown node [msg=" + msg +
+ log.debug("Discarding metrics update message issued by unknown node [msg=" + msg +
", ring=" + ring + ']');
return;
@@ -4894,14 +4899,14 @@ class ServerImpl extends TcpDiscoveryImpl {
if (isLocalNodeCoordinator() && !locNodeId.equals(msg.creatorNodeId())) {
if (log.isDebugEnabled())
- log.debug("Discarding heartbeat message issued by non-coordinator node: " + msg);
+ log.debug("Discarding metrics update message issued by non-coordinator node: " + msg);
return;
}
if (!isLocalNodeCoordinator() && locNodeId.equals(msg.creatorNodeId())) {
if (log.isDebugEnabled())
- log.debug("Discarding heartbeat message issued by local node (node is no more coordinator): " +
+ log.debug("Discarding metrics update message issued by local node (node is no more coordinator): " +
msg);
return;
@@ -4909,7 +4914,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (locNodeId.equals(msg.creatorNodeId()) && !hasMetrics(msg, locNodeId) && msg.senderNodeId() != null) {
if (log.isTraceEnabled())
- log.trace("Discarding heartbeat message that has made two passes: " + msg);
+ log.trace("Discarding metrics update message that has made two passes: " + msg);
return;
}
@@ -4918,10 +4923,10 @@ class ServerImpl extends TcpDiscoveryImpl {
if (spiStateCopy() == CONNECTED) {
if (msg.hasMetrics()) {
- for (Map.Entry<UUID, TcpDiscoveryHeartbeatMessage.MetricsSet> e : msg.metrics().entrySet()) {
+ for (Map.Entry<UUID, TcpDiscoveryMetricsUpdateMessage.MetricsSet> e : msg.metrics().entrySet()) {
UUID nodeId = e.getKey();
- TcpDiscoveryHeartbeatMessage.MetricsSet metricsSet = e.getValue();
+ TcpDiscoveryMetricsUpdateMessage.MetricsSet metricsSet = e.getValue();
Map<Integer, CacheMetrics> cacheMetrics = msg.hasCacheMetrics(nodeId) ?
msg.cacheMetrics().get(nodeId) : Collections.<Integer, CacheMetrics>emptyMap();
@@ -4960,11 +4965,11 @@ class ServerImpl extends TcpDiscoveryImpl {
for (TcpDiscoveryNode clientNode : ring.clientNodes()) {
if (clientNode.visible()) {
if (clientNodeIds.contains(clientNode.id()))
- clientNode.aliveCheck(spi.maxMissedClientHbs);
+ clientNode.clientAliveTime(spi.clientFailureDetectionTimeout());
else {
- int aliveCheck = clientNode.decrementAliveCheck();
+ boolean aliveCheck = clientNode.isClientAlive();
- if (aliveCheck <= 0 && isLocalNodeCoordinator()) {
+ if (!aliveCheck && isLocalNodeCoordinator()) {
boolean failedNode;
synchronized (mux) {
@@ -4972,6 +4977,12 @@ class ServerImpl extends TcpDiscoveryImpl {
}
if (!failedNode) {
+ U.warn(log, "Failing client node due to not receiving metrics updates " +
+ "from client node within " +
+ "'IgniteConfiguration.clientFailureDetectionTimeout' " +
+ "(consider increasing configuration property) " +
+ "[timeout=" + spi.clientFailureDetectionTimeout() + ", node=" + clientNode + ']');
+
TcpDiscoveryNodeFailedMessage nodeFailedMsg = new TcpDiscoveryNodeFailedMessage(
locNodeId, clientNode.id(), clientNode.internalOrder());
@@ -5027,7 +5038,7 @@ class ServerImpl extends TcpDiscoveryImpl {
/**
* @param msg Message.
*/
- private boolean hasMetrics(TcpDiscoveryHeartbeatMessage msg, UUID nodeId) {
+ private boolean hasMetrics(TcpDiscoveryMetricsUpdateMessage msg, UUID nodeId) {
return msg.hasMetrics(nodeId) || msg.hasCacheMetrics(nodeId);
}
@@ -5338,34 +5349,34 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
- * Sends heartbeat message if needed.
+ * Sends metrics update message if needed.
*/
- private void sendHeartbeatMessage() {
- long elapsed = (lastTimeHbMsgSent + spi.hbFreq) - U.currentTimeMillis();
+ private void sendMetricsUpdateMessage() {
+ long elapsed = (lastTimeMetricsUpdateMsgSent + spi.metricsUpdateFreq) - U.currentTimeMillis();
if (elapsed > 0 || !isLocalNodeCoordinator())
return;
- TcpDiscoveryHeartbeatMessage msg = new TcpDiscoveryHeartbeatMessage(getConfiguredNodeId());
+ TcpDiscoveryMetricsUpdateMessage msg = new TcpDiscoveryMetricsUpdateMessage(getConfiguredNodeId());
msg.verify(getLocalNodeId());
msgWorker.addMessage(msg);
- lastTimeHbMsgSent = U.currentTimeMillis();
+ lastTimeMetricsUpdateMsgSent = U.currentTimeMillis();
}
/**
- * Check the last time a heartbeat message received. If the time is bigger than {@code hbCheckTimeout} than
- * {@link TcpDiscoveryStatusCheckMessage} is sent across the ring.
+ * Checks the last time a metrics update message received. If the time is bigger than {@code metricsCheckFreq}
+ * than {@link TcpDiscoveryStatusCheckMessage} is sent across the ring.
*/
- private void checkHeartbeatsReceiving() {
+ private void checkMetricsReceiving() {
if (lastTimeStatusMsgSent < locNode.lastUpdateTime())
lastTimeStatusMsgSent = locNode.lastUpdateTime();
long updateTime = Math.max(lastTimeStatusMsgSent, lastRingMsgTime);
- long elapsed = (updateTime + hbCheckFreq) - U.currentTimeMillis();
+ long elapsed = (updateTime + metricsCheckFreq) - U.currentTimeMillis();
if (elapsed > 0)
return;
@@ -5548,6 +5559,8 @@ class ServerImpl extends TcpDiscoveryImpl {
ClientMessageWorker clientMsgWrk = null;
+ boolean srvSock;
+
try {
InputStream in;
@@ -5618,7 +5631,7 @@ class ServerImpl extends TcpDiscoveryImpl {
TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
IgniteSpiOperationTimeoutHelper timeoutHelper =
- new IgniteSpiOperationTimeoutHelper(spi);
+ new IgniteSpiOperationTimeoutHelper(spi, true);
if (req.clientNodeId() != null) {
ClientMessageWorker clientWorker = clientMsgWorkers.get(req.clientNodeId());
@@ -5638,6 +5651,8 @@ class ServerImpl extends TcpDiscoveryImpl {
// Handshake.
TcpDiscoveryHandshakeRequest req = (TcpDiscoveryHandshakeRequest)msg;
+ srvSock = !req.client();
+
UUID nodeId = req.creatorNodeId();
this.nodeId = nodeId;
@@ -5648,8 +5663,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (req.client())
res.clientAck(true);
- spi.writeToSocket(sock, res, spi.failureDetectionTimeoutEnabled() ?
- spi.failureDetectionTimeout() : spi.getSocketTimeout());
+ spi.writeToSocket(sock, res, spi.getEffectiveSocketTimeout(srvSock));
// It can happen if a remote node is stopped and it has a loopback address in the list of addresses,
// the local node sends a handshake request message on the loopback address, so we get here.
@@ -5764,8 +5778,7 @@ class ServerImpl extends TcpDiscoveryImpl {
return;
}
- long sockTimeout = spi.failureDetectionTimeoutEnabled() ? spi.failureDetectionTimeout() :
- spi.getSocketTimeout();
+ long sockTimeout = spi.getEffectiveSocketTimeout(srvSock);
while (!isInterrupted()) {
try {
@@ -5950,10 +5963,10 @@ class ServerImpl extends TcpDiscoveryImpl {
continue;
}
- TcpDiscoveryClientHeartbeatMessage heartbeatMsg = null;
+ TcpDiscoveryClientMetricsUpdateMessage metricsUpdateMsg = null;
- if (msg instanceof TcpDiscoveryClientHeartbeatMessage)
- heartbeatMsg = (TcpDiscoveryClientHeartbeatMessage)msg;
+ if (msg instanceof TcpDiscoveryClientMetricsUpdateMessage)
+ metricsUpdateMsg = (TcpDiscoveryClientMetricsUpdateMessage)msg;
else
msgWorker.addMessage(msg);
@@ -5968,8 +5981,8 @@ class ServerImpl extends TcpDiscoveryImpl {
else
spi.writeToSocket(msg, sock, RES_OK, sockTimeout);
- if (heartbeatMsg != null)
- processClientHeartbeatMessage(heartbeatMsg);
+ if (metricsUpdateMsg != null)
+ processClientMetricsUpdateMessage(metricsUpdateMsg);
}
catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
@@ -6037,11 +6050,11 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
- * Processes client heartbeat message.
+ * Processes client metrics update message.
*
- * @param msg Heartbeat message.
+ * @param msg Client metrics update message.
*/
- private void processClientHeartbeatMessage(TcpDiscoveryClientHeartbeatMessage msg) {
+ private void processClientMetricsUpdateMessage(TcpDiscoveryClientMetricsUpdateMessage msg) {
assert msg.client();
ClientMessageWorker wrk = clientMsgWorkers.get(msg.creatorNodeId());
@@ -6049,7 +6062,7 @@ class ServerImpl extends TcpDiscoveryImpl {
if (wrk != null)
wrk.metrics(msg.metrics());
else if (log.isDebugEnabled())
- log.debug("Received heartbeat message from unknown client node: " + msg);
+ log.debug("Received client metrics update message from unknown client node: " + msg);
}
/**
@@ -6286,7 +6299,7 @@ class ServerImpl extends TcpDiscoveryImpl {
+ getLocalNodeId() + ", rmtNodeId=" + clientNodeId + ", msg=" + msg + ']');
spi.writeToSocket(sock, msg, msgBytes, spi.failureDetectionTimeoutEnabled() ?
- spi.failureDetectionTimeout() : spi.getSocketTimeout());
+ spi.clientFailureDetectionTimeout() : spi.getSocketTimeout());
}
}
else {
@@ -6296,8 +6309,7 @@ class ServerImpl extends TcpDiscoveryImpl {
assert topologyInitialized(msg) : msg;
- spi.writeToSocket(sock, msg, msgBytes, spi.failureDetectionTimeoutEnabled() ?
- spi.failureDetectionTimeout() : spi.getSocketTimeout());
+ spi.writeToSocket(sock, msg, msgBytes, spi.getEffectiveSocketTimeout(false));
}
boolean clientFailed = msg instanceof TcpDiscoveryNodeFailedMessage &&
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/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 25804c7..46d6f06 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
@@ -138,7 +138,6 @@ import static org.apache.ignite.IgniteSystemProperties.getBoolean;
* configuration parameters may be used. As an example, for stable low-latency networks the following more aggressive
* settings are recommended (which allows failure detection time ~200ms):
* <ul>
- * <li>Heartbeat frequency (see {@link #setHeartbeatFrequency(long)}) - 100ms</li>
* <li>Socket timeout (see {@link #setSocketTimeout(long)}) - 200ms</li>
* <li>Message acknowledgement timeout (see {@link #setAckTimeout(long)}) - 50ms</li>
* </ul>
@@ -166,8 +165,6 @@ import static org.apache.ignite.IgniteSystemProperties.getBoolean;
* <li>Local port to bind to (see {@link #setLocalPort(int)})</li>
* <li>Local port range to try binding to if previous ports are in use
* (see {@link #setLocalPortRange(int)})</li>
- * <li>Heartbeat frequency (see {@link #setHeartbeatFrequency(long)})</li>
- * <li>Max missed heartbeats (see {@link #setMaxMissedHeartbeats(int)})</li>
* <li>Number of times node tries to (re)establish connection to another node
* (see {@link #setReconnectCount(int)})</li>
* <li>Network timeout (see {@link #setNetworkTimeout(long)})</li>
@@ -241,8 +238,11 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
/** 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>2000ms</tt>). */
- public static final long DFLT_HEARTBEAT_FREQ = 2000;
+ /**
+ * Default metrics update messages issuing frequency
+ * (value is {@link IgniteConfiguration#DFLT_METRICS_UPDATE_FREQ}).
+ */
+ public static final long DFLT_METRICS_UPDATE_FREQ = IgniteConfiguration.DFLT_METRICS_UPDATE_FREQ;
/** Default size of topology snapshots history. */
public static final int DFLT_TOP_HISTORY_SIZE = 1000;
@@ -262,12 +262,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
/** Default reconnect attempts count (value is <tt>10</tt>). */
public static final int DFLT_RECONNECT_CNT = 10;
- /** Default max heartbeats count node can miss without initiating status check (value is <tt>1</tt>). */
- public static final int DFLT_MAX_MISSED_HEARTBEATS = 1;
-
- /** Default max heartbeats count node can miss without failing client node (value is <tt>5</tt>). */
- public static final int DFLT_MAX_MISSED_CLIENT_HEARTBEATS = 5;
-
/** Default IP finder clean frequency in milliseconds (value is <tt>60,000ms</tt>). */
public static final long DFLT_IP_FINDER_CLEAN_FREQ = 60 * 1000;
@@ -302,8 +296,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
/** Thread priority for all threads started by SPI. */
protected int threadPri = DFLT_THREAD_PRI;
- /** Heartbeat messages issuing frequency. */
- protected long hbFreq = DFLT_HEARTBEAT_FREQ;
+ /** Metrics update messages issuing frequency. */
+ protected long metricsUpdateFreq = DFLT_METRICS_UPDATE_FREQ;
/** Size of topology snapshots history. */
protected int topHistSize = DFLT_TOP_HISTORY_SIZE;
@@ -361,12 +355,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
/** Maximum message acknowledgement timeout. */
private long maxAckTimeout = DFLT_MAX_ACK_TIMEOUT;
- /** Max heartbeats count node can miss without initiating status check. */
- protected int maxMissedHbs = DFLT_MAX_MISSED_HEARTBEATS;
-
- /** Max heartbeats count node can miss without failing client node. */
- protected int maxMissedClientHbs = DFLT_MAX_MISSED_CLIENT_HEARTBEATS;
-
/** IP finder clean frequency. */
@SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"})
protected long ipFinderCleanFreq = DFLT_IP_FINDER_CLEAN_FREQ;
@@ -731,56 +719,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
}
/**
- * Gets max heartbeats count node can miss without initiating status check.
- *
- * @return Max missed heartbeats.
- */
- public int getMaxMissedHeartbeats() {
- return maxMissedHbs;
- }
-
- /**
- * Sets max heartbeats count node can miss without initiating status check.
- * <p>
- * If not provided, default value is {@link #DFLT_MAX_MISSED_HEARTBEATS}.
- * <p>
- * Affected server nodes only.
- *
- * @param maxMissedHbs Max missed heartbeats.
- * @return {@code this} for chaining.
- */
- @IgniteSpiConfiguration(optional = true)
- public TcpDiscoverySpi setMaxMissedHeartbeats(int maxMissedHbs) {
- this.maxMissedHbs = maxMissedHbs;
-
- return this;
- }
-
- /**
- * Gets max heartbeats count node can miss without failing client node.
- *
- * @return Max missed client heartbeats.
- */
- public int getMaxMissedClientHeartbeats() {
- return maxMissedClientHbs;
- }
-
- /**
- * Sets max heartbeats count node can miss without failing client node.
- * <p>
- * If not provided, default value is {@link #DFLT_MAX_MISSED_CLIENT_HEARTBEATS}.
- *
- * @param maxMissedClientHbs Max missed client heartbeats.
- * @return {@code this} for chaining.
- */
- @IgniteSpiConfiguration(optional = true)
- public TcpDiscoverySpi setMaxMissedClientHeartbeats(int maxMissedClientHbs) {
- this.maxMissedClientHbs = maxMissedClientHbs;
-
- return this;
- }
-
- /**
* Gets statistics print frequency.
*
* @return Statistics print frequency in milliseconds.
@@ -966,22 +904,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
}
/**
- * Sets delay between issuing of heartbeat messages. SPI sends heartbeat messages
- * in configurable time interval to other nodes to notify them about its state.
- * <p>
- * If not provided, default value is {@link #DFLT_HEARTBEAT_FREQ}.
- *
- * @param hbFreq Heartbeat frequency in milliseconds.
- * @return {@code this} for chaining.
- */
- @IgniteSpiConfiguration(optional = true)
- public TcpDiscoverySpi setHeartbeatFrequency(long hbFreq) {
- this.hbFreq = hbFreq;
-
- return this;
- }
-
- /**
* @return Size of topology snapshots history.
*/
public long getTopHistorySize() {
@@ -1180,6 +1102,20 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
}
/**
+ * Gets effective or resulting socket timeout with considering failure detection timeout
+ *
+ * @param srvrOperation {@code True} if socket connect to server node,
+ * {@code False} if socket connect to client node.
+ * @return Resulting socket timeout.
+ */
+ public long getEffectiveSocketTimeout(boolean srvrOperation) {
+ if (failureDetectionTimeoutEnabled())
+ return srvrOperation ? failureDetectionTimeout() : clientFailureDetectionTimeout();
+ else
+ return sockTimeout;
+ }
+
+ /**
* Gets message acknowledgement timeout.
*
* @return Message acknowledgement timeout.
@@ -1207,19 +1143,11 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
}
/**
- * Gets delay between heartbeat messages sent by coordinator.
- *
- * @return Time period in milliseconds.
- */
- public long getHeartbeatFrequency() {
- return hbFreq;
- }
-
- /**
* Gets {@link org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} (string representation).
*
* @return IPFinder (string representation).
- */public String getIpFinderFormatted() {
+ */
+ public String getIpFinderFormatted() {
return ipFinder.toString();
}
@@ -1939,6 +1867,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
impl = new ServerImpl(this);
}
+ metricsUpdateFreq = ignite.configuration().getMetricsUpdateFrequency();
+
if (!failureDetectionTimeoutEnabled()) {
assertParameter(sockTimeout > 0, "sockTimeout > 0");
assertParameter(ackTimeout > 0, "ackTimeout > 0");
@@ -1948,14 +1878,13 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
assertParameter(netTimeout > 0, "networkTimeout > 0");
assertParameter(ipFinder != null, "ipFinder != null");
- assertParameter(hbFreq > 0, "heartbeatFreq > 0");
+ assertParameter(metricsUpdateFreq > 0, "metricsUpdateFreq > 0" +
+ " (inited from igniteConfiguration.metricsUpdateFrequency)");
assertParameter(ipFinderCleanFreq > 0, "ipFinderCleanFreq > 0");
assertParameter(locPort > 1023, "localPort > 1023");
assertParameter(locPortRange >= 0, "localPortRange >= 0");
assertParameter(locPort + locPortRange <= 0xffff, "locPort + locPortRange <= 0xffff");
- assertParameter(maxMissedHbs > 0, "maxMissedHeartbeats > 0");
- assertParameter(maxMissedClientHbs > 0, "maxMissedClientHeartbeats > 0");
assertParameter(threadPri > 0, "threadPri > 0");
assertParameter(statsPrintFreq >= 0, "statsPrintFreq >= 0");
@@ -2000,8 +1929,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
log.debug(configInfo("ipFinder", ipFinder));
log.debug(configInfo("ipFinderCleanFreq", ipFinderCleanFreq));
- log.debug(configInfo("heartbeatFreq", hbFreq));
- log.debug(configInfo("maxMissedHeartbeats", maxMissedHbs));
+ log.debug(configInfo("metricsUpdateFreq", metricsUpdateFreq));
log.debug(configInfo("statsPrintFreq", statsPrintFreq));
}
@@ -2336,21 +2264,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi {
}
/** {@inheritDoc} */
- @Override public long getHeartbeatFrequency() {
- return TcpDiscoverySpi.this.getHeartbeatFrequency();
- }
-
- /** {@inheritDoc} */
- @Override public int getMaxMissedHeartbeats() {
- return TcpDiscoverySpi.this.getMaxMissedHeartbeats();
- }
-
- /** {@inheritDoc} */
- @Override public int getMaxMissedClientHeartbeats() {
- return TcpDiscoverySpi.this.getMaxMissedClientHeartbeats();
- }
-
- /** {@inheritDoc} */
@Override public long getStatisticsPrintFrequency() {
return TcpDiscoverySpi.this.getStatisticsPrintFrequency();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
index 1427929..a05ecde 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBean.java
@@ -28,14 +28,6 @@ import org.jetbrains.annotations.Nullable;
*/
public interface TcpDiscoverySpiMBean extends IgniteSpiManagementMBean {
/**
- * Gets delay between heartbeat messages sent by coordinator.
- *
- * @return Time period in milliseconds.
- */
- @MXBeanDescription("Heartbeat frequency.")
- public long getHeartbeatFrequency();
-
- /**
* Gets current SPI state.
*
* @return Current SPI state.
@@ -84,22 +76,6 @@ public interface TcpDiscoverySpiMBean extends IgniteSpiManagementMBean {
public int getLocalPortRange();
/**
- * Gets max heartbeats count node can miss without initiating status check.
- *
- * @return Max missed heartbeats.
- */
- @MXBeanDescription("Max missed heartbeats.")
- public int getMaxMissedHeartbeats();
-
- /**
- * Gets max heartbeats count node can miss without failing client node.
- *
- * @return Max missed client heartbeats.
- */
- @MXBeanDescription("Max missed client heartbeats.")
- public int getMaxMissedClientHeartbeats();
-
- /**
* Gets thread priority. All threads within SPI will be started with it.
*
* @return Thread priority.
@@ -281,4 +257,4 @@ public interface TcpDiscoverySpiMBean extends IgniteSpiManagementMBean {
*/
@MXBeanDescription("Client mode.")
public boolean isClientMode() throws IllegalStateException;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index d778854..6882821 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -102,7 +102,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
/** Node order in the topology (internal). */
private volatile long intOrder;
- /** The most recent time when heartbeat message was received from the node. */
+ /** The most recent time when metrics update message was received from the node. */
@GridToStringExclude
private volatile long lastUpdateTime = U.currentTimeMillis();
@@ -123,9 +123,9 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
/** Version. */
private IgniteProductVersion ver;
- /** Alive check (used by clients). */
+ /** Alive check time (used by clients). */
@GridToStringExclude
- private transient int aliveCheck;
+ private transient long aliveCheckTime;
/** Client router node ID. */
@GridToStringExclude
@@ -291,9 +291,8 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
* Gets collections of cache metrics for this node. Note that node cache metrics are constantly updated
* and provide up to date information about caches.
* <p>
- * Cache metrics are updated with some delay which is directly related to heartbeat
- * frequency. For example, when used with default
- * {@link TcpDiscoverySpi} the update will happen every {@code 2} seconds.
+ * Cache metrics are updated with some delay which is directly related to metrics update
+ * frequency. For example, by default the update will happen every {@code 2} seconds.
*
* @return Runtime metrics snapshots for this node.
*/
@@ -414,7 +413,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
/**
* Gets node last update time.
*
- * @return Time of the last heartbeat.
+ * @return Time of the last metrics update.
*/
public long lastUpdateTime() {
return lastUpdateTime;
@@ -473,23 +472,25 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
}
/**
- * Decrements alive check value and returns new one.
+ * Test alive check time value.
*
- * @return Alive check value.
+ * @return {@code True} if client alive, {@code False} otherwise.
*/
- public int decrementAliveCheck() {
- assert isClient();
+ public boolean isClientAlive() {
+ assert isClient() : this;
- return --aliveCheck;
+ return (aliveCheckTime - U.currentTimeMillis()) >= 0;
}
/**
- * @param aliveCheck Alive check value.
+ * Set client alive time.
+ *
+ * @param aliveTime Alive time interval.
*/
- public void aliveCheck(int aliveCheck) {
- assert isClient();
+ public void clientAliveTime(long aliveTime) {
+ assert isClient() : this;
- this.aliveCheck = aliveCheck;
+ this.aliveCheckTime = U.currentTimeMillis() + aliveTime;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
deleted file mode 100644
index ade5468..0000000
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientHeartbeatMessage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.tcp.messages;
-
-import java.util.UUID;
-import org.apache.ignite.cluster.ClusterMetrics;
-import org.apache.ignite.internal.ClusterMetricsSnapshot;
-import org.apache.ignite.internal.util.typedef.internal.S;
-
-/**
- * Heartbeat message.
- * <p>
- * Client sends his heartbeats in this message.
- */
-public class TcpDiscoveryClientHeartbeatMessage extends TcpDiscoveryAbstractMessage {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private final byte[] metrics;
-
- /**
- * Constructor.
- *
- * @param creatorNodeId Creator node.
- * @param metrics Metrics.
- */
- public TcpDiscoveryClientHeartbeatMessage(UUID creatorNodeId, ClusterMetrics metrics) {
- super(creatorNodeId);
-
- this.metrics = ClusterMetricsSnapshot.serialize(metrics);
- }
-
- /**
- * Gets metrics map.
- *
- * @return Metrics map.
- */
- public ClusterMetrics metrics() {
- return ClusterMetricsSnapshot.deserialize(metrics, 0);
- }
-
- /** {@inheritDoc} */
- @Override public boolean highPriority() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean traceLogLevel() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(TcpDiscoveryClientHeartbeatMessage.class, this, "super", super.toString());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/6998785a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
new file mode 100644
index 0000000..b56cd01
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.discovery.tcp.messages;
+
+import java.util.UUID;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.internal.ClusterMetricsSnapshot;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
+/**
+ * Metrics update message.
+ * <p>
+ * Client sends his metrics in this message.
+ */
+public class TcpDiscoveryClientMetricsUpdateMessage extends TcpDiscoveryAbstractMessage {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ private final byte[] metrics;
+
+ /**
+ * Constructor.
+ *
+ * @param creatorNodeId Creator node.
+ * @param metrics Metrics.
+ */
+ public TcpDiscoveryClientMetricsUpdateMessage(UUID creatorNodeId, ClusterMetrics metrics) {
+ super(creatorNodeId);
+
+ this.metrics = ClusterMetricsSnapshot.serialize(metrics);
+ }
+
+ /**
+ * Gets metrics map.
+ *
+ * @return Metrics map.
+ */
+ public ClusterMetrics metrics() {
+ return ClusterMetricsSnapshot.deserialize(metrics, 0);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean highPriority() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean traceLogLevel() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(TcpDiscoveryClientMetricsUpdateMessage.class, this, "super", super.toString());
+ }
+}
\ No newline at end of file