Repository: ignite Updated Branches: refs/heads/ignite-zk 7a1cdefc5 -> 8962daa8a
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8962daa8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8962daa8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8962daa8 Branch: refs/heads/ignite-zk Commit: 8962daa8a0fa3d1778a40d1611d93b5c315716aa Parents: 7a1cdef Author: sboikov <[email protected]> Authored: Fri Jan 12 13:15:10 2018 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 12 13:41:04 2018 +0300 ---------------------------------------------------------------------- .../ignite/configuration/IgniteConfiguration.java | 7 +++---- .../internal/processors/cluster/ClusterProcessor.java | 13 ++++--------- .../DiscoverySpiMutableCustomMessageSupport.java | 3 ++- .../processors/cache/GridCacheAbstractSelfTest.java | 10 +--------- .../GridCacheClientModesAbstractSelfTest.java | 3 +-- ...ePartitionedClientOnlyNoPrimaryFullApiSelfTest.java | 5 ++--- .../ignite/internal/util/GridTestClockTimer.java | 3 +-- .../ignite/testframework/junits/GridAbstractTest.java | 3 --- .../testsuites/IgniteCacheFailoverTestSuite.java | 3 +-- .../discovery/zk/ZookeeperDiscoverySpiTestSuite2.java | 2 ++ 10 files changed, 17 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/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 3ee8ada..3a213d6 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 @@ -596,16 +596,15 @@ public class IgniteConfiguration { } /** - * TODO ZK - * @return + * @return Communication failure resovler. */ public CommunicationFailureResolver getCommunicationFailureResolver() { return commFailureRslvr; } /** - * TODO ZK - * @param commFailureRslvr + * @param commFailureRslvr Communication failure resovler. + * @return {@code this} instance. */ public IgniteConfiguration setCommunicationFailureResolver(CommunicationFailureResolver commFailureRslvr) { this.commFailureRslvr = commFailureRslvr; http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java index b1393a8..8796302 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java @@ -432,7 +432,7 @@ public class ClusterProcessor extends GridProcessorAdapter { return; try { - ClusterNodeMetrics metrics = U.unmarshal(ctx.config().getMarshaller(), metricsBytes, null); + ClusterNodeMetrics metrics = U.unmarshalZip(ctx.config().getMarshaller(), metricsBytes, null); assert node instanceof IgniteClusterNode : node; @@ -469,7 +469,7 @@ public class ClusterProcessor extends GridProcessorAdapter { ClusterNodeMetrics metrics = new ClusterNodeMetrics(locNode.metrics(), locNode.cacheMetrics()); try { - byte[] metricsBytes = U.marshal(ctx.config().getMarshaller(), metrics); + byte[] metricsBytes = U.zip(U.marshal(ctx.config().getMarshaller(), metrics)); allNodesMetrics.put(ctx.localNodeId(), metricsBytes); } @@ -503,7 +503,7 @@ public class ClusterProcessor extends GridProcessorAdapter { ClusterNodeMetrics metrics = new ClusterNodeMetrics(metricsProvider.metrics(), metricsProvider.cacheMetrics()); try { - byte[] metricsBytes = U.marshal(ctx.config().getMarshaller(), metrics); + byte[] metricsBytes = U.zip(U.marshal(ctx.config().getMarshaller(), metrics)); ClusterMetricsUpdateMessage msg = new ClusterMetricsUpdateMessage(metricsBytes); @@ -783,12 +783,7 @@ public class ClusterProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void onTimeout() { - try { - ctx.pools().poolForPolicy(GridIoPolicy.SYSTEM_POOL).execute(this); - } - catch (IgniteCheckedException e) { - U.error(log, "Failed to submit metrics update task: " + e, e); - } + ctx.getSystemExecutorService().execute(this); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java index ca2fecd..37aa323 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiMutableCustomMessageSupport.java @@ -25,7 +25,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * TODO ZK + * This annotation is for all implementations of {@link DiscoverySpi} that support + * topology mutable {@link DiscoverySpiCustomMessage}s. */ @Documented @Inherited http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/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 80ffdef..81aadb9 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 @@ -95,15 +95,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { initStoreStrategy(); - IgniteConfiguration cfg = getConfiguration(getTestIgniteInstanceName(0)); - - if (cfg.isClientMode() != null && cfg.isClientMode()) { - startGridsMultiThreaded(1, cnt); - - startGrid(getTestIgniteInstanceName(0), cfg, null); - } - else - startGrids(cnt); + startGrids(cnt); awaitPartitionMapExchange(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index e47ad54..33766f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -103,8 +103,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst * @return boolean {@code True} if client's grid must be started last, {@code false} if it must be started first. */ protected boolean isClientStartedLast() { - // TODO ZK - return true; + return false; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java index dac2b55..eef5aeb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest.java @@ -40,9 +40,8 @@ public class GridCachePartitionedClientOnlyNoPrimaryFullApiSelfTest extends Grid @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - // TODO ZK - // ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true); - // cfg.setClientMode(true); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true); + cfg.setClientMode(true); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java index 7a28ad1..5da9042 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java @@ -26,8 +26,7 @@ public class GridTestClockTimer implements Runnable { */ public GridTestClockTimer() { synchronized (IgniteUtils.mux) { - // TODO ZK - // assert IgniteUtils.gridCnt == 0 : IgniteUtils.gridCnt; + assert IgniteUtils.gridCnt == 0 : IgniteUtils.gridCnt; IgniteUtils.gridCnt++; // To prevent one more timer thread start from IgniteUtils.onGridStart. } http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/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 fdabd6c..93204d2 100755 --- 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 @@ -157,9 +157,6 @@ public abstract class GridAbstractTest extends TestCase { private static final int DFLT_TOP_WAIT_TIMEOUT = 2000; /** */ - private static final String ZK_DISCOVERY = "org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi"; - - /** */ private static final transient Map<Class<?>, TestCounters> tests = new ConcurrentHashMap<>(); /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index b8470d1..7357d7e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -61,8 +61,7 @@ public class IgniteCacheFailoverTestSuite extends TestSuite { suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class); suite.addTestSuite(GridCacheAtomicClientInvalidPartitionHandlingSelfTest.class); - // TODO ZK - //suite.addTestSuite(GridCacheRebalancingPartitionDistributionTest.class); + suite.addTestSuite(GridCacheRebalancingPartitionDistributionTest.class); GridTestUtils.addTestIfNeeded(suite, GridCacheIncrementTransformTest.class, ignoredTests); http://git-wip-us.apache.org/repos/asf/ignite/blob/8962daa8/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java index f5f395b..36ec7c2 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java @@ -25,6 +25,7 @@ import org.apache.curator.test.InstanceSpec; import org.apache.curator.test.TestingCluster; import org.apache.ignite.IgniteException; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest; import org.apache.ignite.internal.IgniteClientReconnectCacheTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; @@ -64,6 +65,7 @@ public class ZookeeperDiscoverySpiTestSuite2 extends TestSuite { suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class); suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class); + suite.addTestSuite(ClusterNodeMetricsUpdateTest.class); return suite; }
