ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [15/27] incubator-ignite git commit: ignite-sprint-3 - fix for IGNITE-626
Date Fri, 10 Apr 2015 07:27:19 GMT
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-692
Commit: bad0161136f5a1e99832439e8a294040dfc8bcef
Parents: 22252f1
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Fri Apr 10 01:01:56 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
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);


Mime
View raw message