You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/10/04 11:19:14 UTC
ignite git commit: IGNITE-9792 Fixed assert in case if
IGNITE_MBEANS_DISABLED is true. Fixed tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-9792 [created] e66c9850c
IGNITE-9792 Fixed assert in case if IGNITE_MBEANS_DISABLED is true. Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e66c9850
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e66c9850
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e66c9850
Branch: refs/heads/ignite-9792
Commit: e66c9850ce1ba5e8c2c028f837aff646577beebe
Parents: e142b10
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Oct 4 18:19:02 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Oct 4 18:19:02 2018 +0700
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteKernal.java | 4 +++-
.../testframework/junits/IgniteTestResources.java | 14 +++++++++++---
.../junits/common/GridCommonAbstractTest.java | 4 ++--
.../util/mbeans/GridMBeanDisableSelfTest.java | 16 +++++++++-------
4 files changed, 25 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e66c9850/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 6b1c995..32e5dd8 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
@@ -1352,7 +1352,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
private void validateCommon(IgniteConfiguration cfg) {
A.notNull(cfg.getNodeId(), "cfg.getNodeId()");
- A.notNull(cfg.getMBeanServer(), "cfg.getMBeanServer()");
+ if (!U.IGNITE_MBEANS_DISABLED)
+ A.notNull(cfg.getMBeanServer(), "cfg.getMBeanServer()");
+
A.notNull(cfg.getGridLogger(), "cfg.getGridLogger()");
A.notNull(cfg.getMarshaller(), "cfg.getMarshaller()");
A.notNull(cfg.getUserAttributes(), "cfg.getUserAttributes()");
http://git-wip-us.apache.org/repos/asf/ignite/blob/e66c9850/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 5fef8bc..59e2994 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -79,6 +79,13 @@ public class IgniteTestResources {
private GridResourceProcessor rsrcProc;
/**
+ * @return Default MBean server or {@code null} if {@code IGNITE_MBEANS_DISABLED} is configured.
+ */
+ @Nullable private static MBeanServer prepareMBeanServer() {
+ return U.IGNITE_MBEANS_DISABLED ? null : ManagementFactory.getPlatformMBeanServer();
+ }
+
+ /**
* @throws IgniteCheckedException If failed.
*/
public IgniteTestResources() throws IgniteCheckedException {
@@ -87,7 +94,8 @@ public class IgniteTestResources {
else
log = rootLog.getLogger(getClass());
- this.jmx = ManagementFactory.getPlatformMBeanServer();
+ this.jmx = prepareMBeanServer();
+
this.rsrcProc = new GridResourceProcessor(new GridTestKernalContext(this.log));
}
@@ -97,7 +105,7 @@ public class IgniteTestResources {
public IgniteTestResources(IgniteConfiguration cfg) throws IgniteCheckedException {
this.cfg = cfg;
this.log = rootLog.getLogger(getClass());
- this.jmx = ManagementFactory.getPlatformMBeanServer();
+ this.jmx = prepareMBeanServer();
this.rsrcProc = new GridResourceProcessor(new GridTestKernalContext(this.log, this.cfg));
}
@@ -119,7 +127,7 @@ public class IgniteTestResources {
assert log != null;
this.log = log.getLogger(getClass());
- this.jmx = ManagementFactory.getPlatformMBeanServer();
+ this.jmx = prepareMBeanServer();
this.rsrcProc = new GridResourceProcessor(new GridTestKernalContext(this.log));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e66c9850/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 f3e2b27..7e98ec7 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
@@ -481,7 +481,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
}
/** {@inheritDoc} */
- @Override protected final void setUp() throws Exception {
+ @Override protected void setUp() throws Exception {
// Disable SSL hostname verifier.
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
@Override public boolean verify(String s, SSLSession sslSes) {
@@ -495,7 +495,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
}
/** {@inheritDoc} */
- @Override protected final void tearDown() throws Exception {
+ @Override protected void tearDown() throws Exception {
getTestCounters().incrementStopped();
super.tearDown();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e66c9850/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
index ac8f011..b98cd46 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
@@ -33,15 +33,17 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
*/
public class GridMBeanDisableSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
+ @Override protected void setUp() throws Exception {
IgniteUtils.IGNITE_MBEANS_DISABLED = true;
- super.beforeTestsStarted();
+ super.setUp();
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
+ @Override protected void tearDown() throws Exception {
IgniteUtils.IGNITE_MBEANS_DISABLED = false;
+
+ super.tearDown();
}
/**
@@ -52,12 +54,12 @@ public class GridMBeanDisableSelfTest extends GridCommonAbstractTest {
public void testCorrectMBeanInfo() throws Exception {
// Node should start and stopped with no errors.
try (final Ignite ignite = startGrid(0)) {
- final MBeanServer server = ignite.configuration().getMBeanServer();
+ final MBeanServer srv = ignite.configuration().getMBeanServer();
GridTestUtils.assertThrowsWithCause(
new Callable<Void>() {
@Override public Void call() throws Exception {
- U.registerMBean(server, ignite.name(), "dummy", "DummyMbean1", new DummyMBeanImpl(), DummyMBean.class);
+ U.registerMBean(srv, ignite.name(), "dummy", "DummyMbean1", new DummyMBeanImpl(), DummyMBean.class);
return null;
}
@@ -72,7 +74,7 @@ public class GridMBeanDisableSelfTest extends GridCommonAbstractTest {
"DummyMbean2"
);
- U.registerMBean(server, objName, new DummyMBeanImpl(), DummyMBean.class);
+ U.registerMBean(srv, objName, new DummyMBeanImpl(), DummyMBean.class);
return null;
@@ -109,4 +111,4 @@ public class GridMBeanDisableSelfTest extends GridCommonAbstractTest {
// No op.
}
}
-}
\ No newline at end of file
+}