| commit | 79eae51a1fcaec5cda32b100252bf87c61362b2b | [log] [tgz] |
|---|---|---|
| author | Maxim Muzafarov <maxmuzaf@gmail.com> | Fri Apr 27 16:08:27 2018 +0300 |
| committer | Anton Vinogradov <av@apache.org> | Fri Apr 27 16:08:27 2018 +0300 |
| tree | 020b081c79797bb7991f4088a43daa977e74d52b | |
| parent | 47dcc2c9b6986f8ff189765125edba610072043e [diff] |
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 <av@apache.org>
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 @@ * 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.
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 @@ } /** {@inheritDoc} */ - @Override public IgniteFuture<?> rebalance() { + @Override public IgniteFuture<Boolean> rebalance() { return delegate.rebalance(); }
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 @@ } /** {@inheritDoc} */ - @Override public IgniteFuture<?> rebalance() { + @Override public IgniteFuture<Boolean> rebalance() { return new IgniteFutureImpl<>(ctx.preloader().forceRebalance()); }
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 @@ } /** {@inheritDoc} */ - @Override public IgniteFuture<?> rebalance() { + @Override public IgniteFuture<Boolean> rebalance() { throw new UnsupportedOperationException("Method should be supported."); }