ignite-1189: trying to reproduce failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b237e11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b237e11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b237e11 Branch: refs/heads/ignite-1093 Commit: 6b237e119caad68474cc785c0373da8ce31011d8 Parents: ac6d75d Author: Denis Magda <dma...@gridgain.com> Authored: Mon Aug 3 14:45:40 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Aug 3 14:45:40 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 21 +++++--------------- .../IgniteCacheAtomicNodeRestartTest.java | 4 ++++ 2 files changed, 9 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b237e11/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index d355085..5cbe377 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -261,11 +261,8 @@ public class IgnitionEx { public static boolean stop(@Nullable String name, boolean cancel) { IgniteNamedInstance grid = name != null ? grids.get(name) : dfltGrid; - if (grid != null) { - IgniteState state = grid.state(); - - if (state == STARTED) - grid.stop(cancel); + if (grid != null && grid.state() == STARTED) { + grid.stop(cancel); boolean fireEvt; @@ -280,18 +277,10 @@ public class IgnitionEx { } } - if (state == STARTED) { - if (fireEvt) - notifyStateChange(grid.getName(), grid.state()); - - return true; - } - else { - U.warn(null, "Ignoring stopping grid instance (has not been in STARTED state): [grid=" + name + - ", state=" + state + ']'); + if (fireEvt) + notifyStateChange(grid.getName(), grid.state()); - return false; - } + return true; } // We don't have log at this point... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b237e11/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java index 1c4e616..fa8898f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java @@ -30,4 +30,8 @@ public class IgniteCacheAtomicNodeRestartTest extends GridCachePartitionedNodeRe @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } + + @Override public void testRestartWithPutTenNodesTwoBackups() throws Throwable { + + } }
