You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/29 14:46:12 UTC
[05/50] incubator-ignite git commit: # ignite-23
# ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ec45f9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ec45f9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ec45f9b
Branch: refs/heads/ignite-929
Commit: 7ec45f9b32b80ee5ff7bd00b8ae463caaac6e897
Parents: de60f7f
Author: sboikov <se...@inria.fr>
Authored: Sat May 23 15:20:21 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Sat May 23 15:20:21 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheSharedContext.java | 1 +
.../distributed/dht/preloader/GridDhtPartitionSupplyPool.java | 5 -----
.../atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java | 5 ++++-
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec45f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 4c08beb..3d70db7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -415,6 +415,7 @@ public class GridCacheSharedContext<K, V> {
GridCompoundFuture f = new GridCompoundFuture();
f.add(mvcc().finishExplicitLocks(topVer));
+ f.add(mvcc().finishLocks(topVer));
f.add(tm().finishTxs(topVer));
f.add(mvcc().finishAtomicUpdates(topVer));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec45f9b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index 311d96d..13cfef3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -250,11 +250,6 @@ class GridDhtPartitionSupplyPool {
boolean ack = false;
try {
- // Partition map exchange is finished which means that all near transactions with given
- // topology version are committed. We can wait for local locks here as it will not take
- // much time.
- cctx.mvcc().finishLocks(d.topologyVersion()).get();
-
for (int part : d.partitions()) {
GridDhtLocalPartition loc = top.localPartition(part, d.topologyVersion(), false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ec45f9b/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 2067af8..55125a2 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
@@ -333,7 +333,10 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
assertEquals("Failed to check value for key [key=" + k + ", node=" +
locNode.id() + ", primary=" + primary + ", recNodeId=" + nodeId + ']',
val, CU.value(entry.rawGetOrUnmarshal(false), entry.context(), false));
- assertEquals(ver, entry.version());
+
+ assertEquals("Failed to check version for key [key=" + k + ", node=" +
+ locNode.id() + ", primary=" + primary + ", recNodeId=" + nodeId + ']',
+ ver, entry.version());
}
}
else