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/05 18:00:37 UTC
[50/50] ignite git commit: 1093
1093
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5a0293e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5a0293e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5a0293e
Branch: refs/heads/ignite-1093-2
Commit: c5a0293efe72d02834cd1a50f779d0c3fd9e63e5
Parents: 4f08361
Author: Anton Vinogradov <av...@apache.org>
Authored: Mon Oct 5 18:59:17 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Oct 5 18:59:17 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCachePartitionExchangeManager.java | 6 ------
.../dht/preloader/GridDhtPartitionSupplyMessageV2.java | 5 -----
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 5 -----
.../rebalancing/GridCacheRebalancingSyncSelfTest.java | 5 ++---
4 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5a0293e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index e52dd3a..b9b690a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -432,12 +432,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
for (AffinityReadyFuture f : readyFuts.values())
f.onDone(stopErr);
- for (GridDhtPartitionsExchangeFuture f : pendingExchangeFuts)
- f.onDone(stopErr);
-
- if (locExchFut != null)
- locExchFut.onDone(stopErr);
-
for (int cnt = 0; cnt < cctx.gridConfig().getRebalanceThreadPoolSize(); cnt++) {
cctx.io().removeOrderedHandler(rebalanceTopic(cnt));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5a0293e/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 17ebb26..bb89a42 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
@@ -95,11 +95,6 @@ public class GridDhtPartitionSupplyMessageV2 extends GridCacheMessage implements
}
/** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public boolean ignoreClassErrors() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5a0293e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 8521fe0..bdaaefd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -250,11 +250,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
}
/** {@inheritDoc} */
- @Override public void onReconnected() {
- startFut = new GridFutureAdapter<>();
- }
-
- /** {@inheritDoc} */
@Override public void updateLastExchangeFuture(GridDhtPartitionsExchangeFuture lastFut) {
demander.updateLastExchangeFuture(lastFut);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5a0293e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index bb40f31..84c3ff3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -84,8 +84,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
cachePCfg.setRebalanceMode(CacheRebalanceMode.SYNC);
cachePCfg.setBackups(1);
cachePCfg.setRebalanceBatchSize(1);
- //cachePCfg.setRebalanceBatchesCount(1);
- cachePCfg.setRebalanceBatchesCount(Integer.MAX_VALUE);
+ cachePCfg.setRebalanceBatchesCount(1);
CacheConfiguration<Integer, Integer> cachePCfg2 = new CacheConfiguration<>();
@@ -250,7 +249,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
}
}
- private void test() throws Exception {
+ public void test() throws Exception {
while (true) {
testComplexRebalancing();