IGNITE-383 Renamed forceRebalancing to rebalance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5a9141a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5a9141a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5a9141a Branch: refs/heads/ignite-411 Commit: c5a9141a801616507ca7560ec5c549f698913aee Parents: d6320be Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Mar 10 12:48:05 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Mar 10 13:24:08 2015 +0300 ---------------------------------------------------------------------- modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 4 ++-- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +- .../cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java | 2 +- .../GridCacheQueueMultiNodeConsistencySelfTest.java | 3 +-- .../cache/distributed/IgniteTxPreloadAbstractTest.java | 2 +- .../distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java | 6 +++--- .../dht/GridCachePartitionedUnloadEventsSelfTest.java | 1 - 7 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index ab5c9f2..70ef9e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -458,7 +458,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS IgniteEntryProcessor<K, V, T> entryProcessor, Object... args); /** - * Forces this cache node to re-balance its partitions. This method is usually used when + * This cache node to re-balance its partitions. This method is usually used when * {@link CacheConfiguration#getRebalancePartitionedDelay()} configuration parameter has non-zero value. * When many nodes are started or stopped almost concurrently, it is more efficient to delay * rebalancing until the node topology is stable to make sure that no redundant re-partitioning @@ -477,7 +477,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * <p> * @return Future that will be completed when rebalancing is finished. */ - public IgniteFuture<?> forceRebalancing(); + public IgniteFuture<?> rebalance(); /** * Gets snapshot metrics (statistics) for this cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index d68cbfe..bb2a4e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -1443,7 +1443,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V } /** {@inheritDoc} */ - @Override public IgniteFuture<?> forceRebalancing() { + @Override public IgniteFuture<?> rebalance() { ctx.preloader().forcePreload(); return new IgniteFutureImpl<>(ctx.preloader().syncFuture()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index e0b71b1..fcbdcd7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -74,7 +74,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA try { for (int i = 0; i < GRID_CNT - 1; i++) - grid(i).jcache(null).forceRebalancing().get(); + grid(i).jcache(null).rebalance().get(); startGrid(GRID_CNT - 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java index 72f34c5..80eca72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.commons.collections.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; @@ -150,7 +149,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends IgniteCollection if (forceRepartition) for (int i = 0; i < GRID_CNT; i++) - jcache(i).forceRebalancing(); + jcache(i).rebalance(); Ignite newIgnite = startGrid(GRID_CNT + 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 6583410..52ed3ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -121,7 +121,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT for (int i = 0; i < GRID_CNT; i++) // Wait for preloader. - jcache(i).forceRebalancing().get(); + jcache(i).rebalance().get(); for (int i = 0; i < GRID_CNT; i++) { for (String key : keys) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 4857bd0..515694c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -149,7 +149,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { checkMaps(false, d0, d1, d2); // Force preload. - c1.forceRebalancing(); + c1.rebalance(); l1.await(); @@ -160,7 +160,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { info("Beginning to wait for cache2 repartition."); // Force preload. - c2.forceRebalancing(); + c2.rebalance(); l2.await(); @@ -352,7 +352,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { long start = System.currentTimeMillis(); - g.jcache(null).forceRebalancing().get(); + g.jcache(null).rebalance().get(); info(">>> Finished preloading of empty cache in " + (System.currentTimeMillis() - start) + "ms."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5a9141a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java index 771ba52..47f0199 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*;
