GG-19515: GG: destroying of the cache and re-creating with the same n…

…ame make DR paused in case of persistence. (cherry picked from commit e093716)
gridgain · Jul 5, 2019 · 3616b6a · 3616b6a
1 parent ad9070d
commit 3616b6a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.../internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/.../internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -2173,7 +2173,7 @@ private String exchangeTimingsLogMessage(String header, List<String> timings) {
 
                     if (drCacheCtx.isDrEnabled()) {
                         try {
-                            drCacheCtx.dr().onExchange(res, exchId.isLeft(), activateCluster());
+                            drCacheCtx.dr().onExchange(res, exchId.isLeft());
                         }
                         catch (IgniteCheckedException e) {
                             U.error(log, "Failed to notify DR: " + e, e);

diff --git a/...core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java b/...core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
@@ -60,10 +60,9 @@ public void replicate(KeyCacheObject key,
      *
      * @param topVer Topology version.
      * @param left {@code True} if exchange has been caused by node leave.
-     * @param activate {@code True} if exchange has been caused by cluster activation.
      * @throws IgniteCheckedException If failed.
      */
-    public void onExchange(AffinityTopologyVersion topVer, boolean left, boolean activate) throws IgniteCheckedException;
+    public void onExchange(AffinityTopologyVersion topVer, boolean left) throws IgniteCheckedException;
 
     /**
      * @return {@code True} is DR is enabled.

diff --git a/...re/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java b/...re/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
@@ -78,7 +78,7 @@ public class GridOsCacheDrManager implements GridCacheDrManager {
     }
 
     /** {@inheritDoc} */
-    @Override public void onExchange(AffinityTopologyVersion topVer, boolean left, boolean activate) throws IgniteCheckedException {
+    @Override public void onExchange(AffinityTopologyVersion topVer, boolean left) throws IgniteCheckedException {
         // No-op.
     }