ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/50] incubator-ignite git commit: # ignite-136 review
Date Mon, 02 Mar 2015 15:12:34 GMT
# ignite-136 review


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88991280
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88991280
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88991280

Branch: refs/heads/ignite-334
Commit: 8899128028dd3f84b93394f3ef425c24d73e8d67
Parents: f33c074
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Feb 25 14:43:16 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Feb 25 14:43:16 2015 +0300

----------------------------------------------------------------------
 .../GridCacheAbstractLocalStoreSelfTest.java    | 72 +++++++++++++-------
 ...chePartitionedOffHeapLocalStoreSelfTest.java |  2 +-
 2 files changed, 48 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88991280/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index 9bf9bc4..bf11c5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -24,10 +24,12 @@ import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.processors.cache.store.*;
+import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
@@ -103,8 +105,12 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
     }
 
     /**
-     * 
+     * @param gridName Grid name.
+     * @param cacheName Cache name.
+     * @param backups Number of backups.
+     * @return Configuration.
      */
+    @SuppressWarnings("unchecked")
     private CacheConfiguration cache(String gridName, String cacheName, int backups) {
         CacheConfiguration cacheCfg = new CacheConfiguration();
 
@@ -128,7 +134,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
         cacheCfg.setOffHeapMaxMemory(0);
         cacheCfg.setSwapEnabled(true);
 
-        if (isOffHeapTiredMode())
+        if (isOffHeapTieredMode())
             cacheCfg.setMemoryMode(OFFHEAP_TIERED);
 
         return cacheCfg;
@@ -150,9 +156,9 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
     protected abstract CacheMode getCacheMode();
 
     /**
-     * @return Cache memory mode.
+     * @return {@code True} if {@link CacheMemoryMode#OFFHEAP_TIERED} memory mode should
be used.
      */
-    protected boolean isOffHeapTiredMode() {
+    protected boolean isOffHeapTieredMode() {
         return false;
     }
 
@@ -177,25 +183,30 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
 
         final CountDownLatch partExchanged = new CountDownLatch(1);
 
-        final int[] leftPartition = new int[1];
+        final AtomicInteger evtCnt = new AtomicInteger(0);
 
         if (getCacheMode() != REPLICATED) {
             ignite1.events().localListen(new IgnitePredicate<Event>() {
-                private AtomicInteger eventCnt = new AtomicInteger(0);
-                
-                @Override public boolean apply(Event event) {
-                    if (leftPartition[0] - eventCnt.incrementAndGet() == 0)
-                        partExchanged.countDown();
-                                            
+                @Override public boolean apply(Event evt) {
+                    evtCnt.incrementAndGet();
+
                     return true;
                 }
             }, EventType.EVT_CACHE_PRELOAD_PART_UNLOADED);
         }
 
-        Ignite ignite2 = startGrid(2);
+        final Ignite ignite2 = startGrid(2);
+
+        boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override public boolean apply() {
+                // Partition count which must be transferred to 2'nd node.
+                int parts = ignite2.affinity(null).allPartitions(ignite2.cluster().localNode()).length;
 
-        // Partition count which must be transferred to 2'nd node.
-        leftPartition[0] = ignite2.affinity(null).allPartitions(ignite2.cluster().localNode()).length;
+                return evtCnt.get() >= parts;
+            }
+        }, 5000);
+
+        assertTrue(wait);
 
         assertEquals(Ignition.allGrids().size(), 2);
 
@@ -270,25 +281,30 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
 
         final CountDownLatch partExchanged = new CountDownLatch(1);
 
-        final int[] leftPartition = new int[1];
+        final AtomicInteger evtCnt = new AtomicInteger(0);
 
         if (getCacheMode() != REPLICATED) {
             ignite1.events().localListen(new IgnitePredicate<Event>() {
-                private AtomicInteger eventCnt = new AtomicInteger(0);
-
-                @Override public boolean apply(Event event) {
-                    if (leftPartition[0] - eventCnt.incrementAndGet() == 0)
-                        partExchanged.countDown();
+                @Override public boolean apply(Event evt) {
+                    evtCnt.incrementAndGet();
 
                     return true;
                 }
             }, EventType.EVT_CACHE_PRELOAD_PART_UNLOADED);
         }
 
-        Ignite ignite2 = startGrid(2);
+        final Ignite ignite2 = startGrid(2);
+
+        boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+            @Override public boolean apply() {
+                // Partition count which must be transferred to 2'nd node.
+                int parts = ignite2.affinity(null).allPartitions(ignite2.cluster().localNode()).length;
+
+                return evtCnt.get() >= parts;
+            }
+        }, 5000);
 
-        // Partition count which must be transferred to 2'nd node.
-        leftPartition[0] = ignite2.affinity(null).allPartitions(ignite2.cluster().localNode()).length;
+        assertTrue(wait);
 
         assertEquals(Ignition.allGrids().size(), 2);
 
@@ -301,7 +317,10 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
     }
 
     /**
-     * Check that local stores contains only primary entry.
+     * Checks that local stores contains only primary entry.
+     *
+     * @param ignite Ignite.
+     * @param store Store.
      */
     private void checkLocalStore(Ignite ignite, CacheStore<Integer, IgniteBiTuple<Integer,
?>> store) {
         for (int i = 0; i < KEYS; i++) {
@@ -313,7 +332,10 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
     }
 
     /**
-     * Check that local stores contains only primary entry.
+     * Checks that local stores contains only primary entry.
+     *
+     * @param ignite Ignite.
+     * @param store Store.
      */
     private void checkLocalStoreForBackup(Ignite ignite, CacheStore<Integer, IgniteBiTuple<Integer,
?>> store) {
         for (int i = 0; i < KEYS; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88991280/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedOffHeapLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedOffHeapLocalStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedOffHeapLocalStoreSelfTest.java
index 6dfc977..e61b4f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedOffHeapLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedOffHeapLocalStoreSelfTest.java
@@ -50,7 +50,7 @@ public class GridCachePartitionedOffHeapLocalStoreSelfTest extends GridCacheAbst
     }
 
     /** {@inheritDoc} */
-    @Override protected boolean isOffHeapTiredMode() {
+    @Override protected boolean isOffHeapTieredMode() {
         return true;
     }
 }


Mime
View raw message