Repository: ignite Updated Branches: refs/heads/ignite-4799 [created] 312980758
ignite-4799 - removed TCP Discovery heartbeat frequency property, fixed compilation and logic, fixed xml configs Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31298075 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31298075 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31298075 Branch: refs/heads/ignite-4799 Commit: 3129807585a1a968396d51bd63ff927c0d5c26b5 Parents: 4425b40 Author: Yakov Zhdanov <[email protected]> Authored: Mon Apr 10 14:08:24 2017 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Mon Apr 10 14:08:24 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/gridify/AbstractAopTest.java | 4 +- .../gridify/ExternalNonSpringAopSelfTest.java | 6 +-- .../clients/src/test/resources/spring-cache.xml | 1 - .../utils/PlatformConfigurationUtils.java | 2 - .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 43 ++++---------------- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 10 +---- .../core/src/test/config/load/dsi-load-base.xml | 3 +- .../src/test/config/load/merge-sort-base.xml | 3 +- .../GridCancelledJobsMetricsSelfTest.java | 4 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../binary/BinaryMetadataUpdatesFlowTest.java | 4 +- .../service/GridServiceClientNodeTest.java | 4 +- ...ridSingleSplitsNewNodesAbstractLoadTest.java | 11 ++--- ...idSingleSplitsNewNodesMulticastLoadTest.java | 9 +--- .../p2p/GridP2PSameClassLoaderSelfTest.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 7 ++-- .../tcp/TcpDiscoverySpiConfigSelfTest.java | 3 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../webapp/META-INF/ignite-webapp-config.xml | 1 - .../ignite/p2p/GridP2PDisabledSelfTest.java | 4 +- .../webapp2/META-INF/ignite-webapp-config.xml | 1 - 24 files changed, 41 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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/31298075/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/31298075/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/31298075/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 f1ef625..26c044d 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 @@ -798,7 +798,6 @@ public class PlatformConfigurationUtils { disco.setStatisticsPrintFrequency(in.readLong()); disco.setIpFinderCleanFrequency(in.readLong()); disco.setThreadPriority(in.readInt()); - disco.setHeartbeatFrequency(in.readLong()); disco.setTopHistorySize(in.readInt()); cfg.setDiscoverySpi(disco); @@ -1221,7 +1220,6 @@ public class PlatformConfigurationUtils { 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/31298075/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 91baca6..7daeae3 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 @@ -2471,7 +2471,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.hbFreq); for (int i = 3; i > 0; i--) { connCheckFreq = connCheckThreshold / i; http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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 19244dd..06ea98a 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 @@ -134,7 +134,6 @@ import org.jetbrains.annotations.Nullable; * 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> @@ -162,7 +161,6 @@ import org.jetbrains.annotations.Nullable; * <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> @@ -237,8 +235,8 @@ 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 heartbeat messages issuing frequency (value is {@link IgniteConfiguration#DFLT_METRICS_UPDATE_FREQ}). */ + public static final long DFLT_HEARTBEAT_FREQ = IgniteConfiguration.DFLT_METRICS_UPDATE_FREQ; /** Default size of topology snapshots history. */ public static final int DFLT_TOP_HISTORY_SIZE = 1000; @@ -956,22 +954,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() { @@ -1158,19 +1140,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(); } @@ -1876,6 +1850,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi { impl = new ServerImpl(this); } + hbFreq = ignite.configuration().getMetricsUpdateFrequency(); + if (!failureDetectionTimeoutEnabled()) { assertParameter(sockTimeout > 0, "sockTimeout > 0"); assertParameter(ackTimeout > 0, "ackTimeout > 0"); @@ -1885,7 +1861,7 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi { assertParameter(netTimeout > 0, "networkTimeout > 0"); assertParameter(ipFinder != null, "ipFinder != null"); - assertParameter(hbFreq > 0, "heartbeatFreq > 0"); + assertParameter(hbFreq > 0, "heartbeatFreq > 0 (inited from igniteConfiguration.MetricsUpdateFrequency)"); assertParameter(ipFinderCleanFreq > 0, "ipFinderCleanFreq > 0"); assertParameter(locPort > 1023, "localPort > 1023"); @@ -2284,11 +2260,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(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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..f620059 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. @@ -281,4 +273,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/31298075/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/31298075/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..4726bc4 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,8 @@ <property name="peerClassLoadingThreadPoolSize" value="100"/> + <property name="metricsUpdateFrequency" value="10000"/> + <!-- Discovery SPI configuration. --> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> @@ -75,7 +77,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"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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/31298075/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/31298075/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..faa451b 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 @@ -103,13 +103,13 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe else disc.setMaxMissedClientHeartbeats(50); - 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/31298075/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 850561f..b3601ff 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 @@ -77,13 +77,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); @@ -382,4 +382,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/31298075/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/31298075/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..e6c59a9 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 @@ -43,9 +43,9 @@ public class GridServiceClientNodeTest extends GridCommonAbstractTest { ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setMaxMissedClientHeartbeats(30); - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(1000); cfg.setClientMode(client); + cfg.setMetricsUpdateFrequency(1000); return cfg; } @@ -150,4 +150,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/31298075/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/31298075/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/31298075/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/31298075/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..863da99 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 @@ -154,8 +154,6 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { spi.setNetworkTimeout(2500); - spi.setHeartbeatFrequency(1000); - spi.setMaxMissedHeartbeats(3); spi.setIpFinderCleanFrequency(5000); @@ -173,12 +171,15 @@ 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.setConnectorConfiguration(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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..96eba32 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,7 +40,6 @@ 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 +64,4 @@ public class TcpDiscoverySpiConfigSelfTest extends GridSpiAbstractConfigTest<Tcp stopAllGrids(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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 bfdf635..ea81e8b 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 @@ -1472,7 +1472,7 @@ public abstract class GridAbstractTest extends TestCase { } // Set heartbeat interval to 1 second to speed up tests. - discoSpi.setHeartbeatFrequency(1000); + cfg.setMetricsUpdateFrequency(1000); String mcastAddr = GridTestUtils.getNextMulticastGroup(getClass()); http://git-wip-us.apache.org/repos/asf/ignite/blob/31298075/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 7fdd559..8920fe2 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/31298075/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/31298075/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 53848fe..14d7dec 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> -->
