Repository: ignite Updated Branches: refs/heads/master 7577c8770 -> 46a84fddb
IGNITE-10343 Stop grid in IgniteCacheGetRestartTest.testGetRestartReplicated test - Fixes #5447. Signed-off-by: Aleksey Plekhanov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46a84fdd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46a84fdd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46a84fdd Branch: refs/heads/master Commit: 46a84fddb701f8e26741ddaa1ee3ab3ffa2234c2 Parents: 7577c87 Author: Fedotov <[email protected]> Authored: Tue Nov 27 13:24:50 2018 +0300 Committer: Aleksey Plekhanov <[email protected]> Committed: Tue Nov 27 13:24:50 2018 +0300 ---------------------------------------------------------------------- .../distributed/IgniteCacheGetRestartTest.java | 29 +++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/46a84fdd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java index e194e28..ba22048 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java @@ -209,25 +209,28 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest { log.info("Restart node [node=" + nodeIdx + ", client=" + clientMode + ']'); - Ignite ignite = startGrid(nodeIdx); + try { + Ignite ignite = startGrid(nodeIdx); - IgniteCache<Object, Object> cache; + IgniteCache<Object, Object> cache; - if (clientMode && ccfg.getNearConfiguration() != null) - cache = ignite.createNearCache(ccfg.getName(), new NearCacheConfiguration<>()); - else - cache = ignite.cache(ccfg.getName()); + if (clientMode && ccfg.getNearConfiguration() != null) + cache = ignite.createNearCache(ccfg.getName(), new NearCacheConfiguration<>()); + else + cache = ignite.cache(ccfg.getName()); - checkGet(cache); - - IgniteInternalFuture<?> syncFut = ((IgniteCacheProxy)cache).context().preloader().syncFuture(); - - while (!syncFut.isDone() && U.currentTimeMillis() < stopTime) checkGet(cache); - checkGet(cache); + IgniteInternalFuture<?> syncFut = ((IgniteCacheProxy)cache).context().preloader().syncFuture(); + + while (!syncFut.isDone() && U.currentTimeMillis() < stopTime) + checkGet(cache); - stopGrid(nodeIdx); + checkGet(cache); + } + finally { + stopGrid(nodeIdx); + } } return null;
