Merge pull request #150 from Netflix/dynomiteManagerFix

Removes JMX and changes interfaces to implementation as parameters
Netflix · May 1, 2023 · 02916fe · 02916fe
2 parents a89aa18 + 2f94c65
commit 02916fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/dynomitemanager-common/src/main/java/com/netflix/nfsidecar/scheduler/Task.java b/dynomitemanager-common/src/main/java/com/netflix/nfsidecar/scheduler/Task.java
@@ -15,17 +15,11 @@
  */
 package com.netflix.nfsidecar.scheduler;
 
-import com.google.common.base.Throwables;
-
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -49,24 +43,8 @@ public static enum STATE
 
     protected Task()
     {
-        this(ManagementFactory.getPlatformMBeanServer());
     }
 
-    protected Task(MBeanServer mBeanServer) {
-        // TODO: don't do mbean registration here
-        String mbeanName = "com.netflix.florida.scheduler:type=" + this.getClass().getName();
-        try
-        {
-            mBeanServer.registerMBean(this, new ObjectName(mbeanName));
-            initialize();
-        }
-        catch (Exception e)
-        {
-            throw Throwables.propagate(e);
-        }
-    }
-
-
     /**
      * This method has to be implemented and cannot thow any exception.
      */

diff --git a/...nager-core/src/main/java/com/netflix/dynomitemanager/dynomite/DynomiteProcessManager.java b/...nager-core/src/main/java/com/netflix/dynomitemanager/dynomite/DynomiteProcessManager.java
@@ -4,6 +4,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.netflix.dynomitemanager.config.FloridaConfig;
+import com.netflix.dynomitemanager.config.InstanceState;
 import com.netflix.dynomitemanager.storage.JedisUtils;
 import com.netflix.nfsidecar.identity.IInstanceState;
 import com.netflix.nfsidecar.scheduler.SimpleTimer;
@@ -37,17 +38,14 @@ public class DynomiteProcessManager extends Task implements IDynomiteProcess, He
     private static final int SCRIPT_EXECUTE_WAIT_TIME_MS = 5000;
     private final FloridaConfig config;
     private final Sleeper sleeper;
-    private final IInstanceState instanceState;
-    private final IDynomiteProcess dynProcess;
+    private final InstanceState instanceState;
     private boolean dynomiteHealth = false;
 
     @Inject
-    public DynomiteProcessManager(FloridaConfig config, Sleeper sleeper, IInstanceState instanceState,
-            IDynomiteProcess dynProcess) {
+    public DynomiteProcessManager(FloridaConfig config, Sleeper sleeper, InstanceState instanceState) {
         this.config = config;
         this.sleeper = sleeper;
         this.instanceState = instanceState;
-        this.dynProcess = dynProcess;
     }
 
     public static TaskTimer getTimer() {
@@ -213,7 +211,7 @@ public boolean dynomiteCheck() {
         if (!dynomiteRedisCheck()) {
             try {
                 logger.error("Dynomite was down");
-                this.dynProcess.stop();
+                this.stop();
                 sleeper.sleepQuietly(1000);
                 return false;
             } catch (IOException e) {

diff --git a/...anager-core/src/main/java/com/netflix/dynomitemanager/dynomite/DynomiteStandardTuner.java b/...anager-core/src/main/java/com/netflix/dynomitemanager/dynomite/DynomiteStandardTuner.java
@@ -3,6 +3,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.netflix.dynomitemanager.config.FloridaConfig;
+import com.netflix.dynomitemanager.config.InstanceState;
 import com.netflix.dynomitemanager.storage.StorageProxy;
 import com.netflix.nfsidecar.config.CommonConfig;
 import com.netflix.nfsidecar.identity.IInstanceState;
@@ -32,15 +33,15 @@ public class DynomiteStandardTuner implements ProcessTuner {
     protected final CommonConfig commonConfig;
     protected final InstanceIdentity ii;
     protected final StorageProxy storageProxy;
-    protected final IInstanceState instanceState;
+    protected final InstanceState instanceState;
     protected final IEnvVariables envVariables;
     protected final InstanceDataRetriever instanceDataRetriever;
 
     public static final Pattern MEMINFO_PATTERN = Pattern.compile("MemTotal:\\s*([0-9]*)");
 
     @Inject
     public DynomiteStandardTuner(FloridaConfig floridaConfig, CommonConfig commonConfig, InstanceIdentity ii,
-            IInstanceState instanceState, StorageProxy storageProxy, IEnvVariables envVariables,
+            InstanceState instanceState, StorageProxy storageProxy, IEnvVariables envVariables,
             InstanceDataRetriever instanceDataRetriever) {
         this.floridaConfig = floridaConfig;
         this.commonConfig = commonConfig;