You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/10/28 11:18:18 UTC
[13/33] ignite git commit: Merge branch 'master' into ignite-1093-3
Merge branch 'master' into ignite-1093-3
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df6edf1f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df6edf1f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df6edf1f
Branch: refs/heads/ignite-1093-3
Commit: df6edf1fca57774514b802eb2726cd8f3c392b1d
Parents: 51f4327
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Oct 27 13:15:00 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Oct 27 13:15:00 2015 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionSupplier.java | 17 +++++++++--------
.../preloader/GridDhtPartitionSupplyMessageV2.java | 10 ++++++++--
2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/df6edf1f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index 694088b..e0e9ce1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -208,7 +208,7 @@ class GridDhtPartitionSupplier {
", from=" + id + ", idx=" + idx + "]");
GridDhtPartitionSupplyMessageV2 s = new GridDhtPartitionSupplyMessageV2(
- d.updateSequence(), cctx.cacheId(), d.topologyVersion());
+ d.updateSequence(), cctx.cacheId(), d.topologyVersion(), cctx.deploymentEnabled());
ClusterNode node = cctx.discovery().node(id);
@@ -336,7 +336,7 @@ class GridDhtPartitionSupplier {
return;
s = new GridDhtPartitionSupplyMessageV2(d.updateSequence(),
- cctx.cacheId(), d.topologyVersion());
+ cctx.cacheId(), d.topologyVersion(), cctx.deploymentEnabled());
}
}
@@ -423,7 +423,7 @@ class GridDhtPartitionSupplier {
return;
s = new GridDhtPartitionSupplyMessageV2(d.updateSequence(),
- cctx.cacheId(), d.topologyVersion());
+ cctx.cacheId(), d.topologyVersion(), cctx.deploymentEnabled());
}
}
@@ -545,7 +545,7 @@ class GridDhtPartitionSupplier {
return;
s = new GridDhtPartitionSupplyMessageV2(d.updateSequence(),
- cctx.cacheId(), d.topologyVersion());
+ cctx.cacheId(), d.topologyVersion(), cctx.deploymentEnabled());
}
}
@@ -737,7 +737,7 @@ class GridDhtPartitionSupplier {
@Deprecated//Backward compatibility. To be removed in future.
private void processOldDemandMessage(GridDhtPartitionDemandMessage d, UUID id) {
GridDhtPartitionSupplyMessage s = new GridDhtPartitionSupplyMessage(d.workerId(),
- d.updateSequence(), cctx.cacheId());
+ d.updateSequence(), cctx.cacheId(), cctx.deploymentEnabled());
ClusterNode node = cctx.node(id);
@@ -798,7 +798,7 @@ class GridDhtPartitionSupplier {
U.sleep(preloadThrottle);
s = new GridDhtPartitionSupplyMessage(d.workerId(), d.updateSequence(),
- cctx.cacheId());
+ cctx.cacheId(), cctx.deploymentEnabled());
}
GridCacheEntryInfo info = e.info();
@@ -850,7 +850,7 @@ class GridDhtPartitionSupplier {
U.sleep(preloadThrottle);
s = new GridDhtPartitionSupplyMessage(d.workerId(),
- d.updateSequence(), cctx.cacheId());
+ d.updateSequence(), cctx.cacheId(), cctx.deploymentEnabled());
}
GridCacheSwapEntry swapEntry = e.getValue();
@@ -934,7 +934,8 @@ class GridDhtPartitionSupplier {
s = new GridDhtPartitionSupplyMessage(d.workerId(),
d.updateSequence(),
- cctx.cacheId());
+ cctx.cacheId(),
+ cctx.deploymentEnabled());
}
if (preloadPred == null || preloadPred.apply(info))
http://git-wip-us.apache.org/repos/asf/ignite/blob/df6edf1f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
index bb89a42..d68e417 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
@@ -78,14 +78,15 @@ public class GridDhtPartitionSupplyMessageV2 extends GridCacheMessage implements
/**
* @param updateSeq Update sequence for this node.
* @param cacheId Cache ID.
+ * @param addDepInfo Deployment info flag.
*/
- GridDhtPartitionSupplyMessageV2(long updateSeq, int cacheId, AffinityTopologyVersion topVer) {
+ GridDhtPartitionSupplyMessageV2(long updateSeq, int cacheId, AffinityTopologyVersion topVer, boolean addDepInfo) {
assert updateSeq > 0;
this.cacheId = cacheId;
this.updateSeq = updateSeq;
this.topVer = topVer;
- }
+ this.addDepInfo = addDepInfo; }
/**
* Empty constructor required for {@link Externalizable}.
@@ -257,6 +258,11 @@ public class GridDhtPartitionSupplyMessageV2 extends GridCacheMessage implements
}
}
+ /** {@inheritDoc} */
+ @Override public boolean addDeploymentInfo() {
+ return addDepInfo;
+ }
+
/**
* @return Number of entries in message.
*/