Merge pull request #298 from /issues/296/mbean-not-being-registered

Fixed issues with not-unregistering mbean
scalecube · Jan 23, 2020 · 42a988d · 42a988d
2 parents cfb058d + 7bb748e
commit 42a988d
Showing 1 changed file with 28 additions and 15 deletions.
diff --git a/cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java b/cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java
@@ -34,13 +34,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.management.MBeanServer;
-import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.StandardMBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.Disposable;
 import reactor.core.Disposables;
+import reactor.core.Exceptions;
 import reactor.core.publisher.DirectProcessor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
@@ -284,8 +284,9 @@ private Mono<Cluster> doStart0() {
                   .then(Mono.fromRunnable(() -> gossip.start()))
                   .then(Mono.fromRunnable(() -> metadataStore.start()))
                   .then(Mono.fromRunnable(this::startHandler))
-                  .then((membership.start()))
-                  .then(startJmxMonitor());
+                  .then(membership.start())
+                  .then(Mono.fromRunnable(this::startJmxMonitor))
+                  .then();
             })
         .thenReturn(this);
   }
@@ -334,19 +335,27 @@ private void startHandler() {
     actionsDisposables.add(listenGossip().subscribe(handler::onGossip, this::onError));
   }
 
-  private Mono<Void> startJmxMonitor() {
-    return Mono.fromCallable(this::startJmxMonitor0).then();
-  }
-
-  private ObjectInstance startJmxMonitor0() throws Exception {
+  private void startJmxMonitor() {
     ClusterMonitorModel monitorModel = monitorModelBuilder.config(config).cluster(this).build();
+    JmxClusterMonitorMBean monitorMBean = new JmxClusterMonitorMBean(monitorModel);
+    try {
+      StandardMBean standardMBean = new StandardMBean(monitorMBean, ClusterMonitorMBean.class);
+      MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+      ObjectName objectName = new ObjectName("io.scalecube.cluster:name=Cluster@" + member().id());
+      server.registerMBean(standardMBean, objectName);
+    } catch (Exception ex) {
+      throw Exceptions.propagate(ex);
+    }
+  }
 
-    JmxClusterMonitorMBean bean = new JmxClusterMonitorMBean(monitorModel);
-    StandardMBean standardMBean = new StandardMBean(bean, ClusterMonitorMBean.class);
-    MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-    ObjectName objectName = new ObjectName("io.scalecube.cluster:name=Cluster@" + member().id());
-
-    return server.registerMBean(standardMBean, objectName);
+  private void stopJmxMonitor() {
+    try {
+      MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+      ObjectName objectName = new ObjectName("io.scalecube.cluster:name=Cluster@" + member().id());
+      server.unregisterMBean(objectName);
+    } catch (Exception ex) {
+      throw Exceptions.propagate(ex);
+    }
   }
 
   private void onError(Throwable th) {
@@ -480,7 +489,11 @@ private Mono<Void> doShutdown() {
     return Mono.defer(
         () -> {
           LOGGER.info("[{}] Cluster member is shutting down", localMember);
-          return Flux.concatDelayError(leaveCluster(), dispose(), transport.stop())
+          return Flux.concatDelayError(
+                  leaveCluster(),
+                  dispose(),
+                  transport.stop(),
+                  Mono.fromRunnable(this::stopJmxMonitor))
               .then()
               .doFinally(s -> scheduler.dispose())
               .doOnSuccess(