ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [07/15] ignite git commit: Fixed assertion error - page eviction should be before locking entry
Date Mon, 22 May 2017 17:44:30 GMT
Fixed assertion error - page eviction should be before locking entry

(cherry picked from commit 711bbb7)


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

Branch: refs/heads/ignite-5267
Commit: cd17ee0fee9c3c5fba357f1190e5ffbe9a7e3681
Parents: 90717b4
Author: Ivan Rakov <ivan.glukos@gmail.com>
Authored: Mon May 22 14:33:29 2017 +0300
Committer: Ivan Rakov <ivan.glukos@gmail.com>
Committed: Mon May 22 14:36:27 2017 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cd17ee0f/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 b8cb56f..0dafa2b 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
@@ -1765,6 +1765,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
         ctx.shared().database().checkpointReadLock();
 
         try {
+            ctx.shared().database().ensureFreeSpace(ctx.memoryPolicy());
+
             // If batch store update is enabled, we need to lock all entries.
             // First, need to acquire locks on cache entries, then check filter.
             List<GridDhtCacheEntry> locked = lockEntries(req, req.topologyVersion());;
@@ -1788,8 +1790,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
                     // Do not check topology version if topology was locked on near node
by
                     // external transaction or explicit lock.
                     if (req.topologyLocked() || !needRemap(req.topologyVersion(), top.topologyVersion()))
{
-                        ctx.shared().database().ensureFreeSpace(ctx.memoryPolicy());
-
                         boolean hasNear = ctx.discovery().cacheNearNode(node, name());
 
                         // Assign next version for update inside entries lock.


Mime
View raw message