ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: # sprint-45 fixed test (wait for initial put)
Date Tue, 24 Mar 2015 06:39:35 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-45 c77c2fa1a -> 78800c324


# sprint-45 fixed test (wait for initial put)


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

Branch: refs/heads/ignite-45
Commit: 76c39d6a4cc6ae2fe70e5a5e08778a247083bf73
Parents: d5cfe33
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Mar 24 09:35:01 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Mar 24 09:35:01 2015 +0300

----------------------------------------------------------------------
 ...eAtomicInvalidPartitionHandlingSelfTest.java | 45 +++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76c39d6a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index d23e1d5..99a984d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.managers.communication.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.plugin.extensions.communication.*;
 import org.apache.ignite.spi.*;
@@ -32,6 +34,7 @@ import org.apache.ignite.spi.communication.tcp.*;
 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.jsr166.*;
 
@@ -152,7 +155,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
         this.writeOrder = writeOrder;
         this.writeSync = writeSync;
 
-        int gridCnt = 6;
+        final int gridCnt = 6;
 
         startGrids(gridCnt);
 
@@ -161,13 +164,53 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends
GridCommonA
 
             final int range = 100_000;
 
+            final Set<Integer> keys = new LinkedHashSet<>();
+
             for (int i = 0; i < range; i++) {
                 cache.put(i, 0);
 
+                keys.add(i);
+
                 if (i > 0 && i % 10_000 == 0)
                     System.err.println("Put: " + i);
             }
 
+            final CacheAffinity<Integer> aff = grid(0).affinity(null);
+
+            boolean putDone = GridTestUtils.waitForCondition(new GridAbsPredicate() {
+                @Override public boolean apply() {
+                    Iterator<Integer> it = keys.iterator();
+
+                    while (it.hasNext()) {
+                        Integer key = it.next();
+
+                        Collection<ClusterNode> affNodes = aff.mapKeyToPrimaryAndBackups(key);
+
+                        for (int i = 0; i < gridCnt; i++) {
+                            ClusterNode locNode = grid(i).localNode();
+
+                            GridCacheAdapter<Object, Object> c = ((IgniteKernal)grid(i)).internalCache();
+
+                            GridCacheEntryEx entry = c.peekEx(key);
+
+                            if (affNodes.contains(locNode)) {
+                                if (entry == null)
+                                    return false;
+                            }
+                            else
+                                assertNull(entry);
+                        }
+
+                        it.remove();
+                    }
+
+                    return true;
+                }
+            }, 30_000);
+
+            assertTrue(putDone);
+            assertTrue(keys.isEmpty());
+
             final AtomicBoolean done = new AtomicBoolean();
 
             delay = true;


Mime
View raw message