Repository: ignite Updated Branches: refs/heads/ignite-2.5 88b574297 -> edd506ae9
IGNITE-6133: Added clearNodeLocalMap() method for IgniteMXBean. This closes #2582. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/edd506ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/edd506ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/edd506ae Branch: refs/heads/ignite-2.5 Commit: edd506ae913f778fe2c9a9abb0e95e3e9890acee Parents: 88b5742 Author: vk <[email protected]> Authored: Thu Apr 26 13:39:10 2018 +0300 Committer: devozerov <[email protected]> Committed: Thu Apr 26 13:40:02 2018 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 5 +++++ .../org/apache/ignite/mxbean/IgniteMXBean.java | 6 +++++ .../ignite/internal/GridNodeLocalSelfTest.java | 23 ++++++++++++++++++++ 3 files changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/edd506ae/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index dc1307c..8305d4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -4335,6 +4335,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** {@inheritDoc} */ + @Override public void clearNodeLocalMap() { + ctx.cluster().get().clearNodeMap(); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgniteKernal.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/edd506ae/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 308c148..77ea035 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -475,4 +475,10 @@ public interface IgniteMXBean { int payLoadSize, boolean procFromNioThread ); + + /** + * Clears node local map. + */ + @MXBeanDescription("Clears local node map.") + void clearNodeLocalMap(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/edd506ae/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java index dccd225..8d8b59f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.mxbean.IgniteMXBean; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; @@ -63,4 +64,26 @@ public class GridNodeLocalSelfTest extends GridCommonAbstractTest { assert "Hello world!".equals(nl.get(keyStr)); assert (Integer)nl.get(key) == 12; } + + /** + * Test that node local map is cleared via {@link IgniteMXBean#clearNodeLocalMap()}. + * + * @throws Exception if test failed. + */ + public void testClearNodeLocalMap() throws Exception { + final String key = "key"; + final String value = "value"; + + Ignite grid = G.ignite(getTestIgniteInstanceName()); + + ConcurrentMap<Object, Object> nodeLocalMap = grid.cluster().nodeLocalMap(); + nodeLocalMap.put(key, value); + + assert !nodeLocalMap.isEmpty() : "Empty node local map"; + assert nodeLocalMap.containsKey(key); + + IgniteMXBean igniteMXBean = (IgniteMXBean)grid; + igniteMXBean.clearNodeLocalMap(); + assert nodeLocalMap.isEmpty() : "Not empty node local map"; + } } \ No newline at end of file
