Repository: ignite Updated Branches: refs/heads/master 581af1629 -> 4a8c38c8b
IGNITE-10108: Refactored a test to avoid passing anonymous classes on compute. Put the method back to GridCommonAbstractTest. - Fixes #5329. Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a8c38c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a8c38c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a8c38c8 Branch: refs/heads/master Commit: 4a8c38c8bb81e46665faae5fe6dd4d5d615fae95 Parents: 581af16 Author: shroman <[email protected]> Authored: Thu Nov 29 19:18:34 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Thu Nov 29 19:18:34 2018 +0300 ---------------------------------------------------------------------- .../junits/common/GridCommonAbstractTest.java | 74 ++++++++++++-------- 1 file changed, 43 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8c38c8/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index c931a0d..0910292 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -78,12 +78,12 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter; -import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition; -import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState; -import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture; import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition; +import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState; +import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter; import org.apache.ignite.internal.processors.cache.local.GridLocalCache; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; @@ -946,7 +946,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { } /** - * Use method for manual rebalaincing cache on all nodes. Note that using + * Use method for manual rebalancing cache on all nodes. Note that using * <pre name="code" class="java"> * for (int i = 0; i < G.allGrids(); i++) * grid(i).cache(CACHE_NAME).rebalance().get(); @@ -964,40 +964,52 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { return; IgniteFuture<Void> fut = - ignite.compute().withTimeout(5_000).broadcastAsync(new IgniteRunnable() { - /** */ - @LoggerResource - IgniteLogger log; + ignite.compute().withTimeout(5_000).broadcastAsync(new ManualRebalancer(cacheName)); - /** */ - @IgniteInstanceResource - private Ignite ignite; + assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return fut.isDone(); + } + }, 5_000)); + } - /** {@inheritDoc} */ - @Override public void run() { - IgniteCache<?, ?> cache = ignite.cache(cacheName); + /** + * + */ + private static class ManualRebalancer implements IgniteRunnable { + /** */ + @LoggerResource + IgniteLogger log; - assertNotNull(cache); + /** */ + @IgniteInstanceResource + private Ignite ignite; - while (!(Boolean)cache.rebalance().get()) { - try { - U.sleep(100); - } - catch (IgniteInterruptedCheckedException e) { - throw new IgniteException(e); - } - } + /** */ + private final String cacheName; - if (log.isInfoEnabled()) - log.info("Manual rebalance finished [node=" + ignite.name() + ", cache=" + cacheName + "]"); - } - }); + public ManualRebalancer(String cacheName) { + this.cacheName = cacheName; + } - assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() { - @Override public boolean apply() { - return fut.isDone(); + /** {@inheritDoc} */ + @Override public void run() { + IgniteCache<?, ?> cache = ignite.cache(cacheName); + + assertNotNull(cache); + + while (!cache.rebalance().get()) { + try { + U.sleep(100); + } + catch (IgniteInterruptedCheckedException e) { + throw new IgniteException(e); + } } - }, 5_000)); + + if (log.isInfoEnabled()) + log.info("Manual rebalance finished [node=" + ignite.name() + ", cache=" + cacheName + "]"); + } } /**
