ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 5578
Date Wed, 02 Aug 2017 05:24:58 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578-debug b52359dc4 -> 7422b4e5c


5578


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

Branch: refs/heads/ignite-5578-debug
Commit: 7422b4e5c61a3b12bf41ebc64389bae37e76a6c5
Parents: b52359d
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Aug 2 08:24:44 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Aug 2 08:24:44 2017 +0300

----------------------------------------------------------------------
 .../dht/GridDhtPartitionTopologyImpl.java           |  6 +++++-
 .../processors/cache/IgniteCacheAbstractTest.java   |  7 ++++++-
 ...CachePrimaryNodeFailureRecoveryAbstractTest.java | 16 ++++++++--------
 3 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7422b4e5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 3baa88e..8982bee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -1283,6 +1283,8 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
                 for (Map.Entry<UUID, GridDhtPartitionMap> e : node2part.entrySet())
{
                     GridDhtPartitionMap parts = e.getValue();
 
+                    assert parts.nodeId().equals(e.getKey());
+
                     String msg = "update full " + parts.nodeId() + " " + exchangeResVer;
 
                     for (Integer p : parts.keySet())
@@ -1299,6 +1301,8 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
 
                         Set<UUID> diffIds = diffFromAffinity.get(p);
 
+                        TestDebugLog.addPartMessage(p, affAssignment.getIds(p), "check diff
updateFull " + e0.getValue() + " " + e.getKey());
+
                         if ((e0.getValue() == MOVING || e0.getValue() == OWNING || e0.getValue()
== RENTING) &&
                             !affAssignment.getIds(p).contains(e.getKey())) {
 
@@ -1318,7 +1322,7 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
 
                 diffFromAffinityVer = readyTopVer;
 
-                debugDiff("updateFull");
+                debugDiff("updateFull " + exchangeResVer + " " + readyTopVer);
             }
 
             boolean changed = false;

http://git-wip-us.apache.org/repos/asf/ignite/blob/7422b4e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 34a811b..5f8d29d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -73,7 +73,12 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest
{
 
         assert cnt >= 1 : "At least one grid must be started";
 
-        startGridsMultiThreaded(cnt);
+        //startGridsMultiThreaded(cnt);
+
+        startGrid(0);
+        startGrid(3);
+        startGrid(2);
+        startGrid(1);
 
         awaitPartitionMapExchange();
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/7422b4e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
index 7391978..09c687e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePrimaryNodeFailureRecoveryAbstractTest.java
@@ -140,28 +140,28 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest
extends
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryNodeFailureRecovery1() throws Exception {
+    public void _testPessimisticPrimaryNodeFailureRecovery1() throws Exception {
         primaryNodeFailure(false, false, false);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryNodeFailureRecovery2() throws Exception {
+    public void _testPessimisticPrimaryNodeFailureRecovery2() throws Exception {
         primaryNodeFailure(true, false, false);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryNodeFailureRollback1() throws Exception {
+    public void _testPessimisticPrimaryNodeFailureRollback1() throws Exception {
         primaryNodeFailure(false, true, false);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryNodeFailureRollback2() throws Exception {
+    public void _testPessimisticPrimaryNodeFailureRollback2() throws Exception {
         primaryNodeFailure(true, true, false);
     }
 
@@ -293,28 +293,28 @@ public abstract class IgniteCachePrimaryNodeFailureRecoveryAbstractTest
extends
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryAndOriginatingNodeFailureRecovery1() throws Exception
{
+    public void _testPessimisticPrimaryAndOriginatingNodeFailureRecovery1() throws Exception
{
         primaryAndOriginatingNodeFailure(false, false, false);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryAndOriginatingNodeFailureRecovery2() throws Exception
{
+    public void _testPessimisticPrimaryAndOriginatingNodeFailureRecovery2() throws Exception
{
         primaryAndOriginatingNodeFailure(true, false, false);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryAndOriginatingNodeFailureRollback1() throws Exception
{
+    public void _testPessimisticPrimaryAndOriginatingNodeFailureRollback1() throws Exception
{
         primaryAndOriginatingNodeFailure(false, true, false);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticPrimaryAndOriginatingNodeFailureRollback2() throws Exception
{
+    public void _testPessimisticPrimaryAndOriginatingNodeFailureRollback2() throws Exception
{
         primaryAndOriginatingNodeFailure(true, true, false);
     }
 


Mime
View raw message