azkaban-aplcache

Update according to the Comments.

9/22/2015 6:51:56 PM

Details

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
index cbb02be..2273fd1 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
@@ -117,7 +117,6 @@ public class ExecutorManager extends EventHandler implements
 
   public ExecutorManager(Props props, ExecutorLoader loader,
       Map<String, Alerter> alters) throws ExecutorManagerException {
-    alerters = alters;
     azkProps = props;
     this.executorLoader = loader;
     this.setupExecutors();
@@ -242,7 +241,7 @@ public class ExecutorManager extends EventHandler implements
             @Override
             public String call() throws Exception {
               return callExecutorForJsonString(executor.getHost(),
-                executor.getPort(), "/serverstatistics", null);
+                executor.getPort(), "/serverStatistics", null);
             }
           });
         futures.add(new Pair<Executor, Future<String>>(executor,
@@ -1039,7 +1038,6 @@ public class ExecutorManager extends EventHandler implements
           Executor executor = activeExecutors.iterator().next();
           // assign only local executor we have
           reference.setExecutor(executor);
-          executorLoader.assignExecutor(executor.getId(), exflow.getExecutionId());
           executorLoader.addActiveExecutableReference(reference);
           try {
             callExecutorServer(exflow, executor, ConnectorParams.EXECUTE_ACTION);
diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java b/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
index 32d189d..47fbfad 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
@@ -132,7 +132,7 @@ public class AzkabanExecutorServer {
     root.addServlet(new ServletHolder(new ExecutorServlet()), "/executor");
     root.addServlet(new ServletHolder(new JMXHttpServlet()), "/jmx");
     root.addServlet(new ServletHolder(new StatsServlet()), "/stats");
-    root.addServlet(new ServletHolder(new ServerStatisticsServlet()), "/serverstatistics");
+    root.addServlet(new ServletHolder(new ServerStatisticsServlet()), "/serverStatistics");
 
     root.setAttribute(ServerConstants.AZKABAN_SERVLET_CONTEXT_KEY, this);