Repository: incubator-ignite Updated Branches: refs/heads/ignite-104 c8b67de10 -> 3d995af8a
IGNITE-104 - Ordered ATOMIC updates Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d995af8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d995af8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d995af8 Branch: refs/heads/ignite-104 Commit: 3d995af8af09568f900ff0ffed1ccca37543ceab Parents: c8b67de Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Aug 5 16:19:07 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Aug 5 16:19:07 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheContext.java | 4 ++-- .../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d995af8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index db62f20..5f17746 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -537,8 +537,8 @@ public class GridCacheContext<K, V> implements Externalizable { * @return {@code True} if entries should not be deleted from cache immediately. */ public boolean deferredDelete(GridCacheAdapter<?, ?> cache) { - // Only TRANSACTIONAL caches. - return cache.isDht() || cache.isColocated(); + return cache.isDht() || cache.isDhtAtomic() || cache.isColocated() || + (cache.isNear() && cache.configuration().getAtomicityMode() == ATOMIC); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d995af8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 2b6a6b0..b71f848 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -322,11 +322,13 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra boolean primary = affinity(cache).isPrimary(ignite.cluster().localNode(), expVal.getKey()); boolean backup = affinity(cache).isBackup(ignite.cluster().localNode(), expVal.getKey()); - log.error("Unexpected cache data [exp=" + expVal + + log.error("Unexpected cache data [" + + "key=" + expVal.getKey() + + ", exp=" + expVal.getValue().get() + ", actual=" + val + ", nodePrimary=" + primary + ", nodeBackup=" + backup + - ", nodeIdx" + i + + ", nodeIdx=" + i + ", nodeId=" + ignite.cluster().localNode().id() + ']'); } }
