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 4B56D17208 for ; Fri, 10 Apr 2015 12:12:49 +0000 (UTC) Received: (qmail 63574 invoked by uid 500); 10 Apr 2015 12:12:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63545 invoked by uid 500); 10 Apr 2015 12:12:49 -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 63536 invoked by uid 99); 10 Apr 2015 12:12:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 12:12:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Apr 2015 12:12:21 +0000 Received: (qmail 61240 invoked by uid 99); 10 Apr 2015 12:12:12 -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; Fri, 10 Apr 2015 12:12:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 741C8DFF12; Fri, 10 Apr 2015 12:12:12 +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: Fri, 10 Apr 2015 12:12:44 -0000 Message-Id: <9c4231a27639416c9d3ccb7b484230da@git.apache.org> In-Reply-To: <44541c5675e2412e91ce1f2b8168dcbd@git.apache.org> References: <44541c5675e2412e91ce1f2b8168dcbd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/51] incubator-ignite git commit: ignite-sprint-3 - fix for IGNITE-626 X-Virus-Checked: Checked by ClamAV on apache.org ignite-sprint-3 - fix for IGNITE-626 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bad01611 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bad01611 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bad01611 Branch: refs/heads/ignite-709 Commit: bad0161136f5a1e99832439e8a294040dfc8bcef Parents: 22252f1 Author: S.Vladykin Authored: Fri Apr 10 01:01:56 2015 +0300 Committer: S.Vladykin Committed: Fri Apr 10 01:01:56 2015 +0300 ---------------------------------------------------------------------- .../junits/common/GridCommonAbstractTest.java | 13 ++++++++++++- .../IgniteCacheOffheapTieredMultithreadedSelfTest.java | 4 ++-- .../testsuites/IgniteCacheQuerySelfTestSuite.java | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bad01611/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 9f4ae0b..98822f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -330,9 +330,20 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** {@inheritDoc} */ @Override protected final Ignite startGridsMultiThreaded(int cnt) throws Exception { + return startGridsMultiThreaded(cnt, true); + } + + /** + * @param cnt Count. + * @param awaitPartitionMapExchange If we need to await partition map exchange. + * @return Ignite. + * @throws Exception If failed. + */ + protected final Ignite startGridsMultiThreaded(int cnt, boolean awaitPartitionMapExchange) throws Exception { Ignite g = super.startGridsMultiThreaded(cnt); - awaitPartitionMapExchange(); + if (awaitPartitionMapExchange) + awaitPartitionMapExchange(); return g; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bad01611/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java index dd48f95..8f5b663 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapTieredMultithreadedSelfTest.java @@ -78,7 +78,7 @@ public class IgniteCacheOffheapTieredMultithreadedSelfTest extends GridCommonAbs /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - startGridsMultiThreaded(3); + startGridsMultiThreaded(3, false); cache = grid(0).cache(null); } @@ -125,7 +125,7 @@ public class IgniteCacheOffheapTieredMultithreadedSelfTest extends GridCommonAbs } }, 64); - Thread.sleep(3 * 60 * 1000); + Thread.sleep(30 * 1000); end.set(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bad01611/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index 552205a..57ac209 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -61,6 +61,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.class); suite.addTestSuite(IgniteCacheSqlQueryMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); // suite.addTestSuite(IgniteCacheQueryNodeRestartSelfTest.class); TODO IGNITE-484 suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class);