Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE224175CA for ; Mon, 29 Jun 2015 19:46:59 +0000 (UTC) Received: (qmail 21822 invoked by uid 500); 29 Jun 2015 19:46:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 21760 invoked by uid 500); 29 Jun 2015 19:46:59 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 21690 invoked by uid 99); 29 Jun 2015 19:46:59 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 19:46:59 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 488D618275B for ; Mon, 29 Jun 2015 19:46:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id BWdeyzoHWvq4 for ; Mon, 29 Jun 2015 19:46:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 92BA02122D for ; Mon, 29 Jun 2015 19:46:46 +0000 (UTC) Received: (qmail 20247 invoked by uid 99); 29 Jun 2015 19:46:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 19:46:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 69BF1E35D8; Mon, 29 Jun 2015 19:46:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 29 Jun 2015 19:46:48 -0000 Message-Id: In-Reply-To: <283ea914128f4f1bacc3f813877bff50@git.apache.org> References: <283ea914128f4f1bacc3f813877bff50@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/50] incubator-ignite git commit: # ignite-1022 # 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-788-dev-review Commit: de7dcfe4e4a10e5b557bf7f6c1776026ed6a845e Parents: 78a9e69 Author: sboikov Authored: Wed Jun 24 09:29:56 2015 +0300 Committer: sboikov 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 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() { + fut = GridTestUtils.runMultiThreadedAsync(new Callable() { @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 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)