Repository: ignite Updated Branches: refs/heads/ignite-1093-2 f6d35e4dd -> 8cc813e8c
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8cc813e8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8cc813e8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8cc813e8 Branch: refs/heads/ignite-1093-2 Commit: 8cc813e8c3838e3498ef9052f54a1e37f39d56fb Parents: f6d35e4 Author: Anton Vinogradov <[email protected]> Authored: Sun Oct 11 18:38:37 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Sun Oct 11 18:38:37 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPreloader.java | 2 +- .../rebalancing/GridCacheRebalancingSyncSelfTest.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8cc813e8/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 b563c15..21bb352 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 @@ -314,7 +314,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { log.debug("Owning partition as there are no other owners: " + part); } else { - ClusterNode n = F.rand(picked); + ClusterNode n = F.first(picked); GridDhtPartitionDemandMessage msg = assigns.get(n); http://git-wip-us.apache.org/repos/asf/ignite/blob/8cc813e8/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 0b2c143..78f8320 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 @@ -67,6 +67,8 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { /** */ private volatile boolean concurrentStartFinished3; + private static long testTimeout = 5 * 60_000; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration iCfg = super.getConfiguration(gridName); @@ -312,6 +314,8 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { } public void _test() throws Exception { + testTimeout = Integer.MAX_VALUE; + while (true) { testComplexRebalancing(); @@ -323,7 +327,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { } @Override protected long getTestTimeout() { - return Long.MAX_VALUE; + return testTimeout; } /**
