Fixing JMX for cache as well as having the index server to kill well.

rbpark · Mar 22, 2012 · 945d000 · 945d000
1 parent 46129ca
commit 945d000
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/azkaban/src/java/azkaban/app/jmx/CacheFlowManager.java b/azkaban/src/java/azkaban/app/jmx/CacheFlowManager.java
@@ -15,23 +15,25 @@ public int getCacheSize() {
     }
 
     @Override
-    public long getCleanIntervalMillisec() {
+    public long getCleanInterval() {
         return this.manager.getCleanInterval();
     }
 
     @Override
-    public void setCleanIntervalMillisec(long interval) {
+    public String setCleanInterval(long interval) {
         this.manager.setCleanInterval(interval);
+        return "success";
     }
 
     @Override
-    public long getTimeToIdleMillisec() {
+    public long getTimeToIdle() {
         return this.manager.getTimeToIdle();
     }
 
     @Override
-    public void setTimeToIdleMillisec(long millisec) {
+    public String setTimeToIdle(long millisec) {
         this.manager.setTimeToIdleMillisec(millisec);
+        return "success";
     }
 
     @Override

diff --git a/azkaban/src/java/azkaban/app/jmx/CacheFlowManagerMBean.java b/azkaban/src/java/azkaban/app/jmx/CacheFlowManagerMBean.java
@@ -2,20 +2,26 @@
 
 public interface CacheFlowManagerMBean {
     @DisplayName("OPERATION: getCacheSize")
-    public int getCacheSize();
+    int getCacheSize();
 
-    @DisplayName("OPERATION: purgeCache")
-    public void purgeCache();
-
-    @DisplayName("OPERATION: getCleanIntervalMillisec")
-    public long getCleanIntervalMillisec();
+    @DisplayName("OPERATION: purgeCache ")
+    void purgeCache();
+    
+    @DisplayName("OPERATION: getTimeToIdle")
+    long getTimeToIdle();
 
-    @DisplayName("OPERATION: setCleanIntervalMillisec")
-    public void setCleanIntervalMillisec(long interval);
+    @DisplayName("OPERATION: setTimeToIdle")
+    String setTimeToIdle(
+            @ParameterName("millisec : The idle age in millisec")
+            long millisec
+     );
 
-    @DisplayName("OPERATION: getTimeToIdleMillisec")
-    public long getTimeToIdleMillisec();
+    @DisplayName("OPERATION: getCleanInterval ")
+    long getCleanInterval();
 
-    @DisplayName("OPERATION: setTimeToIdleMillisec")
-    public void setTimeToIdleMillisec(long millisec);
+    @DisplayName("OPERATION: Set the clean interval ")
+    String setCleanInterval(
+            @ParameterName("interval : The interval in millisec")
+            long interval
+     );
 }
diff --git a/azkaban/src/java/azkaban/web/pages/IndexServlet.java b/azkaban/src/java/azkaban/web/pages/IndexServlet.java
@@ -192,6 +192,12 @@ private void cancelJob(AzkabanApplication app, HttpServletRequest req) throws Se
                 }
             }
         }
+
+        try {
+            app.getJobExecutorManager().cancel(jobId);
+        } catch (Exception e) {
+            logger.info(e.getMessage());
+        }
     }
 
     private String scheduleJobs(AzkabanApplication app,