[ignite] branch master updated: IGNITE-12325 Enable deferred delete for caches with enabled cache store. - Fixes #7005.

[jokser]

This is an automated email from the ASF dual-hosted git repository.

jokser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new d7be87e  IGNITE-12325 Enable deferred delete for caches with enabled 
cache store. - Fixes #7005.
d7be87e is described below

commit d7be87ea687f707c9489fe59db2e60ec8dda057d
Author: Pavel Kovalenko <jokse...@gmail.com>
AuthorDate: Thu Oct 24 16:46:59 2019 +0300

    IGNITE-12325 Enable deferred delete for caches with enabled cache store. - 
Fixes #7005.
    
    Signed-off-by: Pavel Kovalenko <jokse...@gmail.com>
---
 .../org/apache/ignite/internal/processors/cache/GridCacheContext.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 431118c..a97d3ee 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
@@ -625,7 +625,8 @@ public class GridCacheContext<K, V> implements 
Externalizable {
     public void cache(GridCacheAdapter<K, V> cache) {
         this.cache = cache;
 
-        if (grp.supportsTombstone() && 
cache.configuration().getAtomicityMode() == TRANSACTIONAL)
+        if (grp.supportsTombstone() && 
cache.configuration().getAtomicityMode() == TRANSACTIONAL
+                && !store().configured())
             deferredDel = false;
         else {
             deferredDel = (cache.isDht() || cache.isDhtAtomic() || 
cache.isColocated() ||