1093
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5da2ca9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5da2ca9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5da2ca9 Branch: refs/heads/ignite-1093-2 Commit: e5da2ca91e5ded08c6aa7d17787702a5900d19be Parents: 5998af5 Author: Anton Vinogradov <[email protected]> Authored: Tue Sep 22 13:46:29 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Sep 22 13:46:29 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 1 + .../GridDhtPartitionDemandMessage.java | 2 +- .../dht/preloader/GridDhtPartitionDemander.java | 21 ++++++++------------ .../dht/preloader/GridDhtPartitionSupplier.java | 6 ++---- .../ignite/internal/util/lang/GridTuple4.java | 2 +- 5 files changed, 13 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5da2ca9/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 92d9ab1..7f1fb86 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -401,6 +401,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { rebalanceDelay = cc.getRebalanceDelay(); rebalanceOrder = cc.getRebalanceOrder(); rebalancePoolSize = cc.getRebalanceThreadPoolSize(); + rebalanceBatchesCount = cc.getRebalanceBatchesCount(); rebalanceTimeout = cc.getRebalanceTimeout(); rebalanceThrottle = cc.getRebalanceThrottle(); readFromBackup = cc.isReadFromBackup(); http://git-wip-us.apache.org/repos/asf/ignite/blob/e5da2ca9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index b588372..06ac54b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -327,7 +327,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { /** {@inheritDoc} */ @Override public String toString() { - return S.toString(GridDhtPartitionDemandMessage.class, this, "partCnt", parts.size(), "super", + return S.toString(GridDhtPartitionDemandMessage.class, this, "partCnt", parts != null ? parts.size() : 0, "super", super.toString()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/e5da2ca9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index a2f8c01..7f2dc48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -610,21 +610,16 @@ public class GridDhtPartitionDemander { d.timeout(cctx.config().getRebalanceTimeout()); - if (d != null) { - // Create copy. - GridDhtPartitionDemandMessage nextD = - new GridDhtPartitionDemandMessage(d, Collections.<Integer>emptySet()); + d.topic(GridCachePartitionExchangeManager.rebalanceTopic(idx)); - nextD.topic(GridCachePartitionExchangeManager.rebalanceTopic(idx)); - - if (!topologyChanged(fut)) { - // Send demand message. - cctx.io().sendOrderedMessage(node, GridCachePartitionExchangeManager.rebalanceTopic(idx), - nextD, cctx.ioPolicy(), cctx.config().getRebalanceTimeout()); - } - else - fut.cancel(); + if (!topologyChanged(fut)) { + // Send demand message. + cctx.io().sendOrderedMessage(node, GridCachePartitionExchangeManager.rebalanceTopic(idx), + d, cctx.ioPolicy(), cctx.config().getRebalanceTimeout()); } + else + fut.cancel(); + } catch (ClusterTopologyCheckedException e) { if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/e5da2ca9/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 1d8572a..d33dc5a 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 @@ -200,12 +200,10 @@ class GridDhtPartitionSupplier { try { SupplyContext sctx = scMap.get(scId); - if (sctx == null && d.partitions().isEmpty()) + if (sctx == null && d.partitions() == null) return; - if (sctx != null && !d.partitions().isEmpty()) { - assert false; - } + assert !(sctx != null && d.partitions() != null); long bCnt = 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/e5da2ca9/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java index 835cdcb..c95a859 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java @@ -239,7 +239,7 @@ public class GridTuple4<V1, V2, V3, V4> implements Iterable<Object>, Externaliza GridTuple4<?, ?, ?, ?> t = (GridTuple4<?, ?, ?, ?>)o; - return F.eq(val1, t.val2) && F.eq(val2, t.val2) && F.eq(val3, t.val3) && F.eq(val4, t.val4); + return F.eq(val1, t.val1) && F.eq(val2, t.val2) && F.eq(val3, t.val3) && F.eq(val4, t.val4); } /** {@inheritDoc} */
