You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/10/22 13:11:07 UTC
ignite git commit: IGNITE-9945 Entry start version should not omit
datacenter ID.
Repository: ignite
Updated Branches:
refs/heads/master 4353618a7 -> e5a467272
IGNITE-9945 Entry start version should not omit datacenter ID.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5a46727
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5a46727
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5a46727
Branch: refs/heads/master
Commit: e5a467272f88e5561a4cc30b510a5608a3b5e739
Parents: 4353618
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Oct 22 16:10:47 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Oct 22 16:10:47 2018 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
.../ignite/internal/processors/cache/dr/GridCacheDrManager.java | 3 ++-
.../ignite/internal/processors/cache/dr/GridOsCacheDrManager.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5a46727/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 4b4b6df..d494857 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -2105,7 +2105,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (drCacheCtx.isDrEnabled()) {
try {
- drCacheCtx.dr().onExchange(res, exchId.isLeft());
+ drCacheCtx.dr().onExchange(res, exchId.isLeft(), activateCluster());
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to notify DR: " + e, e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5a46727/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
index f2a4b30..33a52a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
@@ -60,9 +60,10 @@ public interface GridCacheDrManager extends GridCacheManager {
*
* @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) throws IgniteCheckedException;
+ public void onExchange(AffinityTopologyVersion topVer, boolean left, boolean activate) throws IgniteCheckedException;
/**
* @return {@code True} is DR is enabled.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5a46727/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
index f3c1b23..425e79c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
+++ b/modules/core/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) throws IgniteCheckedException {
+ @Override public void onExchange(AffinityTopologyVersion topVer, boolean left, boolean activate) throws IgniteCheckedException {
// No-op.
}