ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-4929
Date Fri, 14 Apr 2017 09:28:18 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4929 5609b76ac -> 110d6cd46


ignite-4929


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

Branch: refs/heads/ignite-4929
Commit: 110d6cd4665bba229d585a62220ac0eef7590447
Parents: 5609b76
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Apr 14 12:27:58 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Apr 14 12:27:58 2017 +0300

----------------------------------------------------------------------
 .../ignite/configuration/IgniteConfiguration.java     |  2 +-
 .../cache/distributed/dht/GridDhtTxPrepareFuture.java |  2 --
 .../cache/IgniteOnePhaseCommitInvokeTest.java         | 14 +++++++++-----
 .../ignite/testframework/junits/GridAbstractTest.java |  4 +++-
 4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/110d6cd4/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 142b73c..e3fd342 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -220,7 +220,7 @@ public class IgniteConfiguration {
     public static final boolean DFLT_CACHE_SANITY_CHECK_ENABLED = true;
 
     /** Default value for late affinity assignment flag. */
-    public static final boolean DFLT_LATE_AFF_ASSIGNMENT = false;
+    public static final boolean DFLT_LATE_AFF_ASSIGNMENT = true;
 
     /** Default value for active on start flag. */
     public static final boolean DFLT_ACTIVE_ON_START = true;

http://git-wip-us.apache.org/repos/asf/ignite/blob/110d6cd4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 1c78907..88c0267 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -372,8 +372,6 @@ public final class GridDhtTxPrepareFuture extends GridCacheCompoundFuture<Ignite
                     tx.nearOnOriginatingNode() || tx.hasInterceptor();
 
                 if (readOld) {
-                    cached.unswap(retVal);
-
                     boolean readThrough = !txEntry.skipStore() &&
                         (txEntry.op() == TRANSFORM || ((retVal || hasFilters) &&
cacheCtx.config().isLoadPreviousValue()));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/110d6cd4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java
index 29077d2..aab1d3d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java
@@ -53,6 +53,9 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
     /** */
     private boolean client;
 
+    /** */
+    private static final String CACHE_NAME = "testCache";
+
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
         IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -67,6 +70,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
 
         CacheConfiguration ccfg = new CacheConfiguration();
 
+        ccfg.setName(CACHE_NAME);
         ccfg.setAtomicityMode(TRANSACTIONAL);
         ccfg.setBackups(1);
         ccfg.setRebalanceMode(ASYNC);
@@ -117,7 +121,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
         Ignite srv0 = startGrid(0);
 
         if (withOldVal)
-            srv0.cache(null).put(1, 1);
+            srv0.cache(CACHE_NAME).put(1, 1);
 
         client = true;
 
@@ -128,7 +132,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
                 Message msg = msg0.message();
 
                 return msg instanceof GridDhtPartitionSupplyMessage &&
-                    ((GridDhtPartitionSupplyMessage) msg).cacheId() == CU.cacheId(null);
+                    ((GridDhtPartitionSupplyMessage)msg).cacheId() == CU.cacheId(CACHE_NAME);
             }
         });
 
@@ -140,7 +144,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
 
         IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>()
{
             @Override public Void call() throws Exception {
-                Object res = clientNode.cache(null).invoke(1, new TestEntryProcessor(setVal,
retPrev));
+                Object res = clientNode.cache(CACHE_NAME).invoke(1, new TestEntryProcessor(setVal,
retPrev));
 
                 Object expRes;
 
@@ -162,7 +166,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
         fut.get();
 
         if (!setVal)
-            checkCacheData(F.asMap(1, null), null);
+            checkCacheData(F.asMap(1, null), CACHE_NAME);
         else {
             Object expVal;
 
@@ -171,7 +175,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest
{
             else
                 expVal = withOldVal ? 1 : null;
 
-            checkCacheData(F.asMap(1, expVal), null);
+            checkCacheData(F.asMap(1, expVal), CACHE_NAME);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/110d6cd4/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 0ffad0e..4f87d6b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -2040,7 +2040,9 @@ public abstract class GridAbstractTest extends TestCase {
             AffinityTopologyVersion exchVer = ctx.cache().context().exchange().readyAffinityVersion();
 
             if (! topVer.equals(exchVer)) {
-                info("topology version mismatch: node "  + g.name() + " " + exchVer + ",
" + topVer);
+                info("Topology version mismatch [node="  + g.name() +
+                    ", exchVer=" + exchVer +
+                    ", topVer=" + topVer + ']');
 
                 GridTestUtils.waitForCondition(new GridAbsPredicate() {
                     @Override public boolean apply() {


Mime
View raw message