# ignite-1022
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de7dcfe4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de7dcfe4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de7dcfe4 Branch: refs/heads/ignite-973-2 Commit: de7dcfe4e4a10e5b557bf7f6c1776026ed6a845e Parents: 78a9e69 Author: sboikov <sboi...@gridgain.com> Authored: Wed Jun 24 09:29:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jun 24 09:29:56 2015 +0300 ---------------------------------------------------------------------- .../datastructures/GridCacheSetAbstractSelfTest.java | 14 ++++++++------ .../cache/distributed/IgniteCacheManyClientsTest.java | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de7dcfe4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index 74114d9..0494bcc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.testframework.*; import java.util.*; @@ -556,6 +555,9 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr * @throws Exception If failed. */ public void testNodeJoinsAndLeaves() throws Exception { + if (collectionCacheMode() == LOCAL) + return; + fail("https://issues.apache.org/jira/browse/IGNITE-584";); testNodeJoinsAndLeaves(false); @@ -565,6 +567,9 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr * @throws Exception If failed. */ public void testNodeJoinsAndLeavesCollocated() throws Exception { + if (collectionCacheMode() == LOCAL) + return; + fail("https://issues.apache.org/jira/browse/IGNITE-584";); testNodeJoinsAndLeaves(true); @@ -575,9 +580,6 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr * @throws Exception If failed. */ private void testNodeJoinsAndLeaves(boolean collocated) throws Exception { - if (collectionCacheMode() == LOCAL) - return; - CollectionConfiguration colCfg = config(collocated); Set<Integer> set0 = grid(0).set(SET_NAME, colCfg); @@ -751,7 +753,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr IgniteInternalFuture<?> fut; try { - fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { while (!stop.get()) { @@ -781,7 +783,7 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr for (int i = 0; i < gridCount(); i++) { Iterator<GridCacheEntryEx> entries = - ((IgniteKernal)grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); + (grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); while (entries.hasNext()) { GridCacheEntryEx entry = entries.next(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de7dcfe4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java index 48884de..1991f01 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java @@ -66,6 +66,7 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest { ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinderCleanFrequency(10 * 60_000); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setJoinTimeout(2 * 60_000); if (!clientDiscovery)
