Merge pull request #382 from scalecube/remove_jmx

Removed jmx support

Author: artem-v

cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java

@@ -12,17 +12,13 @@
 import io.scalecube.cluster.metadata.MetadataCodec;
 import io.scalecube.cluster.metadata.MetadataStore;
 import io.scalecube.cluster.metadata.MetadataStoreImpl;
-import io.scalecube.cluster.monitor.ClusterMonitorMBean;
-import io.scalecube.cluster.monitor.ClusterMonitorModel;
-import io.scalecube.cluster.monitor.JmxClusterMonitorMBean;
 import io.scalecube.cluster.transport.api.Message;
 import io.scalecube.cluster.transport.api.Transport;
 import io.scalecube.cluster.transport.api.TransportConfig;
 import io.scalecube.cluster.transport.api.TransportFactory;
 import io.scalecube.net.Address;
 import io.scalecube.utils.ServiceLoaderUtil;
 import java.io.Serializable;
-import java.lang.management.ManagementFactory;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,14 +32,10 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.management.MBeanServer;
-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.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
@@ -73,8 +65,6 @@ public final class ClusterImpl implements Cluster {
   private static final Set<String> SYSTEM_GOSSIPS =
       Collections.singleton(MembershipProtocolImpl.MEMBERSHIP_GOSSIP);
 
-  private volatile String jmxBeanName = null;
-
   private ClusterConfig config;
   private Function<Cluster, ? extends ClusterMessageHandler> handler =
       cluster -> new ClusterMessageHandler() {};
@@ -100,7 +90,6 @@ public final class ClusterImpl implements Cluster {
   private MembershipProtocolImpl membership;
   private MetadataStore metadataStore;
   private Scheduler scheduler;
-  private ClusterMonitorModel.Builder monitorModelBuilder;
 
   public ClusterImpl() {
     this(ClusterConfig.defaultConfig());
@@ -255,7 +244,6 @@ private Mono<Cluster> doStart0() {
               transport = new SenderAwareTransport(boundTransport, localMember.address());
 
               scheduler = Schedulers.newSingle("sc-cluster-" + localMember.address().port(), true);
-              monitorModelBuilder = new ClusterMonitorModel.Builder();
 
               failureDetector =
                   new FailureDetectorImpl(
@@ -285,8 +273,7 @@ private Mono<Cluster> doStart0() {
                       gossip,
                       metadataStore,
                       config,
-                      scheduler,
-                      monitorModelBuilder);
+                      scheduler);
 
               actionsDisposables.add(
                   // Retransmit inner membership events to public api layer
@@ -304,7 +291,6 @@ private Mono<Cluster> doStart0() {
                   .then(Mono.fromRunnable(() -> metadataStore.start()))
                   .then(Mono.fromRunnable(this::startHandler))
                   .then(membership.start())
-                  .then(Mono.fromRunnable(this::startJmxMonitor))
                   .then();
             })
         .doOnSubscribe(s -> LOGGER.info("[{}][doStart] Starting, config: {}", localMember, config))
@@ -360,33 +346,6 @@ private void startHandler() {
                 ex -> LOGGER.error("[{}][onGossip][error] cause:", localMember, ex)));
   }
 
-  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();
-      String beanName = "io.scalecube.cluster:name=" + member().id() + "@" + System.nanoTime();
-      jmxBeanName = beanName;
-      ObjectName objectName = new ObjectName(beanName);
-      server.registerMBean(standardMBean, objectName);
-    } catch (Exception ex) {
-      throw Exceptions.propagate(ex);
-    }
-  }
-
-  private void stopJmxMonitor() {
-    String beanName = jmxBeanName;
-    if (beanName != null) {
-      try {
-        MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-        server.unregisterMBean(new ObjectName(beanName));
-      } catch (Exception ex) {
-        throw Exceptions.propagate(ex);
-      }
-    }
-  }
-
   private Flux<Message> listenMessage() {
     // filter out system messages
     return transport.listen().filter(msg -> !SYSTEM_MESSAGES.contains(msg.qualifier()));
@@ -515,7 +474,6 @@ private Mono<Void> doShutdown() {
         () -> {
           LOGGER.info("[{}][doShutdown] Shutting down", localMember);
           return Flux.concatDelayError(leaveCluster(), dispose(), transport.stop())
-              .then(Mono.fromRunnable(this::stopJmxMonitor))
               .then()
               .doFinally(s -> scheduler.dispose())
               .doOnSuccess(avoid -> LOGGER.info("[{}][doShutdown] Shutdown", localMember));

cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java

@@ -13,7 +13,6 @@
 import io.scalecube.cluster.fdetector.FailureDetectorEvent;
 import io.scalecube.cluster.gossip.GossipProtocol;
 import io.scalecube.cluster.metadata.MetadataStore;
-import io.scalecube.cluster.monitor.ClusterMonitorModel;
 import io.scalecube.cluster.transport.api.Message;
 import io.scalecube.cluster.transport.api.Transport;
 import io.scalecube.net.Address;
@@ -80,7 +79,6 @@ private enum MembershipUpdateReason {
   private final FailureDetector failureDetector;
   private final GossipProtocol gossipProtocol;
   private final MetadataStore metadataStore;
-  private final ClusterMonitorModel.Builder monitorModelBuilder;
 
   // State
 
@@ -111,7 +109,6 @@ private enum MembershipUpdateReason {
    * @param metadataStore metadata store
    * @param config cluster config parameters
    * @param scheduler scheduler
-   * @param monitorModelBuilder monitor model builder
    */
   public MembershipProtocolImpl(
       Member localMember,
@@ -120,16 +117,13 @@ public MembershipProtocolImpl(
       GossipProtocol gossipProtocol,
       MetadataStore metadataStore,
       ClusterConfig config,
-      Scheduler scheduler,
-      ClusterMonitorModel.Builder monitorModelBuilder) {
-
+      Scheduler scheduler) {
     this.transport = Objects.requireNonNull(transport);
     this.failureDetector = Objects.requireNonNull(failureDetector);
     this.gossipProtocol = Objects.requireNonNull(gossipProtocol);
     this.metadataStore = Objects.requireNonNull(metadataStore);
     this.localMember = Objects.requireNonNull(localMember);
     this.scheduler = Objects.requireNonNull(scheduler);
-    this.monitorModelBuilder = Objects.requireNonNull(monitorModelBuilder);
     this.membershipConfig = Objects.requireNonNull(config).membershipConfig();
     this.failureDetectorConfig = Objects.requireNonNull(config).failureDetectorConfig();
 
@@ -250,14 +244,6 @@ public Mono<Void> start() {
   }
 
   private void start0(MonoSink<Object> sink) {
-    // Prepare monitor model
-    monitorModelBuilder
-        .seedMembers(seedMembers)
-        .incarnationSupplier(this::getIncarnation)
-        .aliveMembersSupplier(this::getAliveMembers)
-        .suspectedMembersSupplier(this::getSuspectedMembers)
-        .removedMembersSupplier(this::getRemovedMembers);
-
     // In case no members at the moment just schedule periodic sync
     if (seedMembers.isEmpty()) {
       schedulePeriodicSync();