ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/18] incubator-ignite git commit: GG-9141 - Fixing failover tests.
Date Tue, 16 Dec 2014 15:12:19 GMT
GG-9141 - Fixing failover tests.


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

Branch: refs/heads/ignite-41
Commit: 03c17b8f3caaa45fd3554a5a306d6e431d74e0ca
Parents: cbd30af
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Dec 15 18:48:04 2014 -0800
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Dec 15 18:48:04 2014 -0800

----------------------------------------------------------------------
 .../processors/cache/GridCachePartitionExchangeManager.java   | 7 ++++++-
 .../grid/kernal/processors/cache/GridCacheTxLocalAdapter.java | 2 +-
 .../testsuites/bamboo/GridCacheFailoverTestSuite.java         | 4 ----
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03c17b8f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
index b0c319d..201b960 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
@@ -470,6 +470,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                 m.addFullPartitionsMap(cacheCtx.cacheId(), cacheCtx.topology().partitionMap(true));
         }
 
+        for (GridClientPartitionTopology<K, V> top : cctx.exchange().clientTopologies())
+            m.addFullPartitionsMap(top.cacheId(), top.partitionMap(true));
+
         if (log.isDebugEnabled())
             log.debug("Sending all partitions [nodeIds=" + U.nodeIds(nodes) + ", msg=" +
m + ']');
 
@@ -587,7 +590,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                     if (!cacheCtx.isLocal()) {
                         GridDhtPartitionTopology<K, V> top = cacheCtx.topology();
 
-                        updated |= top.update(null, msg.partitions().get(cacheCtx.cacheId()))
!= null;
+                        GridDhtPartitionFullMap partMap = msg.partitions().get(cacheCtx.cacheId());
+
+                        updated |= top.update(null, partMap) != null;
                     }
                 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03c17b8f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
index b7fa4b2..abb9fef 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
@@ -2093,7 +2093,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
                     if (log.isDebugEnabled())
                         log.debug("Got removed entry in putAllAsync method (will retry):
" + cached);
 
-                    txEntry.cached(entryEx(cacheCtx, txEntry.txKey()), txEntry.keyBytes());
+                    txEntry.cached(entryEx(cached.context(), txEntry.txKey()), txEntry.keyBytes());
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03c17b8f/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
index 65c6d07..7584e00 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
@@ -26,10 +26,6 @@ public class GridCacheFailoverTestSuite extends TestSuite {
     public static TestSuite suite() throws Exception {
         TestSuite suite = new TestSuite("Gridgain Cache Failover Test Suite");
 
-        // TODO GG-9141
-        if (true)
-            return suite;
-
         suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class);
 
         // Group lock failover.


Mime
View raw message