Repository: ignite Updated Branches: refs/heads/master 47dcc2c9b -> 79eae51a1
IGNITE-7592 Dynamic cache with rebalanceDelay == -1 doesn't trigger late affinity assignment even after explicit rebalance is called on every node Signed-off-by: Anton Vinogradov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79eae51a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79eae51a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79eae51a Branch: refs/heads/master Commit: 79eae51a1fcaec5cda32b100252bf87c61362b2b Parents: 47dcc2c Author: Maxim Muzafarov <[email protected]> Authored: Fri Apr 27 16:08:27 2018 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Fri Apr 27 16:08:27 2018 +0300 ---------------------------------------------------------------------- modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 4 ++-- .../internal/processors/cache/GatewayProtectedCacheProxy.java | 2 +- .../ignite/internal/processors/cache/IgniteCacheProxyImpl.java | 2 +- .../testframework/junits/multijvm/IgniteCacheProcessProxy.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/79eae51a/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 cd8264b..b8d1aae 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -1453,10 +1453,10 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * See {@link CacheConfiguration#getRebalanceDelay()} for more information on how to configure * rebalance re-partition delay. * <p> - * @return Future that will be completed when rebalancing is finished. Future.get() returns true + * @return Future that will be completed when rebalancing is finished. Future.get() returns {@code true} * when rebalance was successfully finished. */ - public IgniteFuture<?> rebalance(); + public IgniteFuture<Boolean> rebalance(); /** * Returns future that will be completed when all indexes for this cache are ready to use. http://git-wip-us.apache.org/repos/asf/ignite/blob/79eae51a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java index 2e8120b..94c6012 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java @@ -1357,7 +1357,7 @@ public class GatewayProtectedCacheProxy<K, V> extends AsyncSupportAdapter<Ignite } /** {@inheritDoc} */ - @Override public IgniteFuture<?> rebalance() { + @Override public IgniteFuture<Boolean> rebalance() { return delegate.rebalance(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/79eae51a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java index ceb1271..2a82848 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java @@ -1804,7 +1804,7 @@ public class IgniteCacheProxyImpl<K, V> extends AsyncSupportAdapter<IgniteCache< } /** {@inheritDoc} */ - @Override public IgniteFuture<?> rebalance() { + @Override public IgniteFuture<Boolean> rebalance() { return new IgniteFutureImpl<>(ctx.preloader().forceRebalance()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/79eae51a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index ff1005c..68363c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -633,7 +633,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<?> rebalance() { + @Override public IgniteFuture<Boolean> rebalance() { throw new UnsupportedOperationException("Method should be supported."); }
