ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Fixed GridDistributedTxRemoteAdapter.commitIfLocked (tx was not committed if write map was empty).
Date Fri, 30 Dec 2016 11:56:04 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 53b579f94 -> f167a58ee


Fixed GridDistributedTxRemoteAdapter.commitIfLocked (tx was not committed if write map was
empty).


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

Branch: refs/heads/ignite-3477
Commit: f167a58eed911946df617c42d84878eb429175f0
Parents: 53b579f
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 30 14:55:55 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 30 14:55:55 2016 +0300

----------------------------------------------------------------------
 .../distributed/GridDistributedTxRemoteAdapter.java   | 14 +++++++-------
 .../distributed/dht/GridDhtPartitionTopologyImpl.java |  2 +-
 .../near/GridCacheNearReadersSelfTest.java            |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f167a58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 1216a06..3547728 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -761,17 +761,17 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
                         if (wrapper != null)
                             wrapper.initialize(ret);
                     }
+                }
 
-                    if (err != null) {
-                        state(UNKNOWN);
+                if (err != null) {
+                    state(UNKNOWN);
 
-                        throw err;
-                    }
+                    throw err;
+                }
 
-                    cctx.tm().commitTx(this);
+                cctx.tm().commitTx(this);
 
-                    state(COMMITTED);
-                }
+                state(COMMITTED);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f167a58e/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 0dd836d..820d3cd 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
@@ -507,7 +507,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
 
         synchronized (cctx.shared().exchange().interruptLock()) {
             if (Thread.currentThread().isInterrupted())
-                throw new IgniteCheckedException("Thread is interrupted: " + Thread.currentThread());
+                throw new IgniteInterruptedCheckedException("Thread is interrupted: " + Thread.currentThread());
 
             try {
                 U.writeLock(lock);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f167a58e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 7d09255..0915c0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -210,8 +210,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest
{
 
         assertNotNull(cache1.getAndPut(1, "z1"));
 
-        // Node 1 still has node2 in readers map.
-        assertFalse(e1.readers().contains(n2.id()));
+        assertTrue(e1.obsolete());
     }
 
     /** @throws Exception If failed. */


Mime
View raw message