You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/04 15:24:29 UTC
[2/2] ignite git commit: Optimized evicts.
Optimized evicts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6cfe531e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6cfe531e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6cfe531e
Branch: refs/heads/ignite-atomic-good-lock-bench
Commit: 6cfe531e989cc54fc5c48840c35b5de8501cc50f
Parents: 532346f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Mar 4 17:24:16 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Mar 4 17:24:16 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 4 +++-
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 7 ++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6cfe531e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 0cd34be..6de8caf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.CacheGetFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest;
@@ -586,7 +587,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
cctx.mvcc().contextReset();
// Unwind eviction notifications.
- CU.unwindEvicts(cctx);
+ if (msg instanceof GridDistributedTxFinishRequest)
+ CU.unwindEvicts(cctx);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6cfe531e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index e908c05..dad00ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2759,7 +2759,12 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
req.nodeId(ctx.localNodeId());
- updateAllAsyncInternal(nodeId, req, updateReplyClos);
+ try {
+ updateAllAsyncInternal(nodeId, req, updateReplyClos);
+ }
+ finally {
+ CU.unwindEvicts(ctx);
+ }
}
/**