azkaban-developers

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java b/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java
index e966e11..21159fe 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java
@@ -46,7 +46,7 @@ public class ExecutionFlowDao {
     this.dbOperator = dbOperator;
   }
 
-  public synchronized void uploadExecutableFlow(final ExecutableFlow flow)
+  public void uploadExecutableFlow(final ExecutableFlow flow)
       throws ExecutorManagerException {
 
     final String useExecutorParam =

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java
index 480f43a..42628e0 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/AzkabanProcess.java
@@ -122,12 +122,7 @@ public class AzkabanProcess {
       errorGobbler.awaitCompletion(5000);
 
       if (exitCode != 0) {
-        final String output =
-            new StringBuilder().append("Stdout:\n")
-                .append(outputGobbler.getRecentLog()).append("\n\n")
-                .append("Stderr:\n").append(errorGobbler.getRecentLog())
-                .append("\n").toString();
-        throw new ProcessFailureException(exitCode, output);
+        throw new ProcessFailureException(exitCode);
       }
 
     } finally {

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/ProcessFailureException.java b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/ProcessFailureException.java
index 473dace..055436c 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/ProcessFailureException.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/utils/process/ProcessFailureException.java
@@ -21,19 +21,17 @@ public class ProcessFailureException extends RuntimeException {
   private static final long serialVersionUID = 1;
 
   private final int exitCode;
-  private final String logSnippet;
 
-  public ProcessFailureException(final int exitCode, final String logSnippet) {
+  public ProcessFailureException(final int exitCode) {
     this.exitCode = exitCode;
-    this.logSnippet = logSnippet;
   }
 
   public int getExitCode() {
     return this.exitCode;
   }
 
-  public String getLogSnippet() {
-    return this.logSnippet;
+  @Override
+  public String getMessage() {
+    return "Process exited with code " + this.exitCode;
   }
-
 }

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
index d984389..73c755b 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -177,7 +177,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
 
       ret.put("project", projectName);
       if (ajaxName.equals("executeFlow")) {
-        ajaxAttemptExecuteFlow(req, resp, ret, session.getUser());
+        ajaxExecuteFlow(req, resp, ret, session.getUser());
       }
     }
     if (ret != null) {
@@ -943,30 +943,6 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
     ret.putAll(flowObj);
   }
 
-  private void ajaxAttemptExecuteFlow(final HttpServletRequest req,
-      final HttpServletResponse resp, final HashMap<String, Object> ret, final User user)
-      throws ServletException {
-    final String projectName = getParam(req, "project");
-    final String flowId = getParam(req, "flow");
-
-    final Project project =
-        getProjectAjaxByPermission(ret, projectName, user, Type.EXECUTE);
-    if (project == null) {
-      ret.put("error", "Project '" + projectName + "' doesn't exist.");
-      return;
-    }
-
-    ret.put("flow", flowId);
-    final Flow flow = project.getFlow(flowId);
-    if (flow == null) {
-      ret.put("error", "Flow '" + flowId + "' cannot be found in project "
-          + project);
-      return;
-    }
-
-    ajaxExecuteFlow(req, resp, ret, user);
-  }
-
   private void ajaxExecuteFlow(final HttpServletRequest req,
       final HttpServletResponse resp, final HashMap<String, Object> ret, final User user)
       throws ServletException {
@@ -983,8 +959,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
     ret.put("flow", flowId);
     final Flow flow = project.getFlow(flowId);
     if (flow == null) {
-      ret.put("error", "Flow '" + flowId + "' cannot be found in project "
-          + project);
+      ret.put("error", "Flow '" + flowId + "' cannot be found in project " + project);
       return;
     }