Details
diff --git a/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java b/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
index c9af320..a8e36aa 100644
--- a/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
+++ b/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
@@ -61,7 +61,7 @@ public class DataSourceUtils {
/**
* Create Datasource from parameters in the properties
- *
+ *
* @param props
* @return
*/
@@ -90,7 +90,7 @@ public class DataSourceUtils {
/**
* Create a MySQL DataSource
- *
+ *
* @param host
* @param port
* @param dbName
@@ -107,7 +107,7 @@ public class DataSourceUtils {
/**
* Create H2 DataSource
- *
+ *
* @param file
* @return
*/
@@ -123,7 +123,7 @@ public class DataSourceUtils {
/**
* MySQL data source based on AzkabanDataSource
- *
+ *
*/
public static class MySQLBasicDataSource extends AzkabanDataSource {
@@ -210,7 +210,7 @@ public class DataSourceUtils {
/**
* H2 Datasource
- *
+ *
*/
public static class EmbeddedH2BasicDataSource extends AzkabanDataSource {
private EmbeddedH2BasicDataSource(String filePath) {
diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java b/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java
index 83629ae..ba93304 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutorManagerServlet.java
@@ -31,63 +31,59 @@ import azkaban.utils.FileIOUtils.LogData;
import azkaban.utils.JSONUtils;
import azkaban.server.AbstractServiceServlet;
-
public class ExecutorManagerServlet extends AbstractServiceServlet {
private final ExecutorManagerAdapter executorManager;
public static final String URL = "executorManager";
private static final long serialVersionUID = 1L;
- private static final Logger logger = Logger.getLogger(ExecutorManagerServlet.class);
+ private static final Logger logger = Logger
+ .getLogger(ExecutorManagerServlet.class);
public ExecutorManagerServlet(ExecutorManagerAdapter executorManager) {
this.executorManager = executorManager;
}
@Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- HashMap<String,Object> respMap= new HashMap<String,Object>();
- //logger.info("ExecutorServer called by " + req.getRemoteAddr());
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ HashMap<String, Object> respMap = new HashMap<String, Object>();
try {
if (!hasParam(req, ExecutorManagerAdapter.INFO_ACTION)) {
logger.error("Parameter action not set");
respMap.put("error", "Parameter action not set");
- }
- else {
+ } else {
String action = getParam(req, ExecutorManagerAdapter.INFO_ACTION);
if (action.equals(ExecutorManagerAdapter.ACTION_UPDATE)) {
- //logger.info("Updated called");
handleAjaxUpdateRequest(req, respMap);
- }
- else {
- int execid = Integer.parseInt(getParam(req, ExecutorManagerAdapter.INFO_EXEC_ID));
- String user = getParam(req, ExecutorManagerAdapter.INFO_USER_ID, null);
-
- logger.info("User " + user + " has called action " + action + " on " + execid);
+ } else {
+ int execid =
+ Integer.parseInt(getParam(req,
+ ExecutorManagerAdapter.INFO_EXEC_ID));
+ String user =
+ getParam(req, ExecutorManagerAdapter.INFO_USER_ID, null);
+
+ logger.info("User " + user + " has called action " + action + " on "
+ + execid);
if (action.equals(ExecutorManagerAdapter.ACTION_GET_FLOW_LOG)) {
handleFetchFlowLogEvent(execid, req, resp, respMap);
} else if (action.equals(ExecutorManagerAdapter.ACTION_GET_JOB_LOG)) {
handleFetchJobLogEvent(execid, req, resp, respMap);
- }
- else if (action.equals(ExecutorManagerAdapter.ACTION_SUBMIT_FLOW)) {
+ } else if (action.equals(ExecutorManagerAdapter.ACTION_SUBMIT_FLOW)) {
handleAjaxSubmitFlow(req, respMap, execid);
- }
- else if (action.equals(ExecutorManagerAdapter.ACTION_CANCEL_FLOW)) {
+ } else if (action.equals(ExecutorManagerAdapter.ACTION_CANCEL_FLOW)) {
logger.info("Cancel called.");
handleAjaxCancelFlow(respMap, execid, user);
- }
- else if (action.equals(ExecutorManagerAdapter.ACTION_PAUSE_FLOW)) {
+ } else if (action.equals(ExecutorManagerAdapter.ACTION_PAUSE_FLOW)) {
logger.info("Paused called.");
handleAjaxPauseFlow(respMap, execid, user);
- }
- else if (action.equals(ExecutorManagerAdapter.ACTION_RESUME_FLOW)) {
+ } else if (action.equals(ExecutorManagerAdapter.ACTION_RESUME_FLOW)) {
logger.info("Resume called.");
handleAjaxResumeFlow(respMap, execid, user);
- }
- else if (action.equals(ExecutorManagerAdapter.ACTION_MODIFY_EXECUTION)) {
+ } else if (action
+ .equals(ExecutorManagerAdapter.ACTION_MODIFY_EXECUTION)) {
logger.info("Modify Execution Action");
handleModifyExecution(respMap, execid, user, req);
- }
- else {
+ } else {
logger.error("action: '" + action + "' not supported.");
respMap.put("error", "action: '" + action + "' not supported.");
}
@@ -104,39 +100,26 @@ public class ExecutorManagerServlet extends AbstractServiceServlet {
private void handleModifyExecution(HashMap<String, Object> respMap,
int execid, String user, HttpServletRequest req) {
if (!hasParam(req, ExecutorManagerAdapter.INFO_MODIFY_COMMAND)) {
- respMap.put(ExecutorManagerAdapter.INFO_ERROR, "Modification command not set.");
+ respMap.put(ExecutorManagerAdapter.INFO_ERROR,
+ "Modification command not set.");
return;
}
try {
- String modificationType = getParam(req, ExecutorManagerAdapter.INFO_MODIFY_COMMAND);
+ String modificationType =
+ getParam(req, ExecutorManagerAdapter.INFO_MODIFY_COMMAND);
ExecutableFlow exflow = executorManager.getExecutableFlow(execid);
- if (ExecutorManagerAdapter.COMMAND_MODIFY_RETRY_FAILURES.equals(modificationType)) {
+ if (ExecutorManagerAdapter.COMMAND_MODIFY_RETRY_FAILURES
+ .equals(modificationType)) {
executorManager.retryFailures(exflow, user);
}
- else {
-// String modifiedJobList = getParam(req, MODIFY_JOBS_LIST);
-// String[] jobIds = modifiedJobList.split("\\s*,\\s*");
-//
-// if (MODIFY_RETRY_JOBS.equals(modificationType)) {
-// }
-// else if (MODIFY_CANCEL_JOBS.equals(modificationType)) {
-// }
-// else if (MODIFY_DISABLE_JOBS.equals(modificationType)) {
-// }
-// else if (MODIFY_ENABLE_JOBS.equals(modificationType)) {
-// }
-// else if (MODIFY_PAUSE_JOBS.equals(modificationType)) {
-// }
-// else if (MODIFY_RESUME_JOBS.equals(modificationType)) {
-// }
- }
} catch (Exception e) {
respMap.put(ExecutorManagerAdapter.INFO_ERROR, e);
}
}
- private void handleAjaxResumeFlow(HashMap<String, Object> respMap, int execid, String user) {
+ private void handleAjaxResumeFlow(HashMap<String, Object> respMap,
+ int execid, String user) {
try {
ExecutableFlow exFlow = executorManager.getExecutableFlow(execid);
executorManager.resumeFlow(exFlow, user);
@@ -146,7 +129,8 @@ public class ExecutorManagerServlet extends AbstractServiceServlet {
}
- private void handleAjaxPauseFlow(HashMap<String, Object> respMap, int execid, String user) {
+ private void handleAjaxPauseFlow(HashMap<String, Object> respMap, int execid,
+ String user) {
try {
ExecutableFlow exFlow = executorManager.getExecutableFlow(execid);
executorManager.pauseFlow(exFlow, user);
@@ -155,7 +139,8 @@ public class ExecutorManagerServlet extends AbstractServiceServlet {
}
}
- private void handleAjaxCancelFlow(HashMap<String, Object> respMap, int execid, String user) {
+ private void handleAjaxCancelFlow(HashMap<String, Object> respMap,
+ int execid, String user) {
try {
ExecutableFlow exFlow = executorManager.getExecutableFlow(execid);
executorManager.cancelFlow(exFlow, user);
@@ -164,10 +149,14 @@ public class ExecutorManagerServlet extends AbstractServiceServlet {
}
}
- private void handleAjaxSubmitFlow(HttpServletRequest req, HashMap<String, Object> respMap, int execid) {
- try{
- String execFlowJson = getParam(req, ExecutorManagerAdapter.INFO_EXEC_FLOW_JSON);
- ExecutableFlow exflow = ExecutableFlow.createExecutableFlowFromObject(JSONUtils.parseJSONFromString(execFlowJson));
+ private void handleAjaxSubmitFlow(HttpServletRequest req,
+ HashMap<String, Object> respMap, int execid) {
+ try {
+ String execFlowJson =
+ getParam(req, ExecutorManagerAdapter.INFO_EXEC_FLOW_JSON);
+ ExecutableFlow exflow =
+ ExecutableFlow.createExecutableFlowFromObject(JSONUtils
+ .parseJSONFromString(execFlowJson));
String user = getParam(req, ExecutorManagerAdapter.INFO_USER_ID);
executorManager.submitExecutableFlow(exflow, user);
respMap.put(ExecutorManagerAdapter.INFO_EXEC_ID, exflow.getExecutionId());
@@ -177,29 +166,36 @@ public class ExecutorManagerServlet extends AbstractServiceServlet {
}
}
- private void handleFetchJobLogEvent(int execid, HttpServletRequest req, HttpServletResponse resp, HashMap<String, Object> respMap) {
- try{
+ private void handleFetchJobLogEvent(int execid, HttpServletRequest req,
+ HttpServletResponse resp, HashMap<String, Object> respMap) {
+ try {
ExecutableFlow exFlow = executorManager.getExecutableFlow(execid);
String jobId = getParam(req, ExecutorManagerAdapter.INFO_JOB_NAME);
int offset = getIntParam(req, ExecutorManagerAdapter.INFO_OFFSET);
int length = getIntParam(req, ExecutorManagerAdapter.INFO_LENGTH);
int attempt = getIntParam(req, ExecutorManagerAdapter.INFO_ATTEMPT);
- LogData log = executorManager.getExecutionJobLog(exFlow, jobId, offset, length, attempt);
- respMap.put(ExecutorManagerAdapter.INFO_LOG, JSONUtils.toJSON(log.toObject()));
- } catch (Exception e) {
+ LogData log =
+ executorManager.getExecutionJobLog(exFlow, jobId, offset, length,
+ attempt);
+ respMap.put(ExecutorManagerAdapter.INFO_LOG,
+ JSONUtils.toJSON(log.toObject()));
+ } catch (Exception e) {
e.printStackTrace();
respMap.put(ExecutorManagerAdapter.INFO_ERROR, e);
}
}
- private void handleFetchFlowLogEvent(int execid, HttpServletRequest req, HttpServletResponse resp, HashMap<String, Object> respMap) {
- try{
+ private void handleFetchFlowLogEvent(int execid, HttpServletRequest req,
+ HttpServletResponse resp, HashMap<String, Object> respMap) {
+ try {
ExecutableFlow exFlow = executorManager.getExecutableFlow(execid);
int offset = getIntParam(req, ExecutorManagerAdapter.INFO_OFFSET);
int length = getIntParam(req, ExecutorManagerAdapter.INFO_LENGTH);
- LogData log = executorManager.getExecutableFlowLog(exFlow, offset, length);
- respMap.put(ExecutorManagerAdapter.INFO_LOG, JSONUtils.toJSON(log.toObject()));
- } catch (Exception e) {
+ LogData log =
+ executorManager.getExecutableFlowLog(exFlow, offset, length);
+ respMap.put(ExecutorManagerAdapter.INFO_LOG,
+ JSONUtils.toJSON(log.toObject()));
+ } catch (Exception e) {
e.printStackTrace();
respMap.put(ExecutorManagerAdapter.INFO_ERROR, e);
}
@@ -207,20 +203,26 @@ public class ExecutorManagerServlet extends AbstractServiceServlet {
}
@SuppressWarnings("unchecked")
- private void handleAjaxUpdateRequest(HttpServletRequest req, HashMap<String, Object> respMap) {
+ private void handleAjaxUpdateRequest(HttpServletRequest req,
+ HashMap<String, Object> respMap) {
try {
- ArrayList<Object> updateTimesList = (ArrayList<Object>)JSONUtils.parseJSONFromString(getParam(req, ExecutorManagerAdapter.INFO_UPDATE_TIME_LIST));
- ArrayList<Object> execIDList = (ArrayList<Object>)JSONUtils.parseJSONFromString(getParam(req, ExecutorManagerAdapter.INFO_EXEC_ID_LIST));
+ ArrayList<Object> updateTimesList =
+ (ArrayList<Object>) JSONUtils.parseJSONFromString(getParam(req,
+ ExecutorManagerAdapter.INFO_UPDATE_TIME_LIST));
+ ArrayList<Object> execIDList =
+ (ArrayList<Object>) JSONUtils.parseJSONFromString(getParam(req,
+ ExecutorManagerAdapter.INFO_EXEC_ID_LIST));
ArrayList<Object> updateList = new ArrayList<Object>();
for (int i = 0; i < execIDList.size(); ++i) {
long updateTime = JSONUtils.getLongFromObject(updateTimesList.get(i));
- int execId = (Integer)execIDList.get(i);
+ int execId = (Integer) execIDList.get(i);
ExecutableFlow flow = executorManager.getExecutableFlow(execId);
if (flow == null) {
- Map<String, Object> errorResponse = new HashMap<String,Object>();
- errorResponse.put(ExecutorManagerAdapter.INFO_ERROR, "Flow does not exist");
+ Map<String, Object> errorResponse = new HashMap<String, Object>();
+ errorResponse.put(ExecutorManagerAdapter.INFO_ERROR,
+ "Flow does not exist");
errorResponse.put(ExecutorManagerAdapter.INFO_EXEC_ID, execId);
updateList.add(errorResponse);
continue;
diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/LongArgJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/LongArgJob.java
index a5aa0b6..36ba23a 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/LongArgJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/LongArgJob.java
@@ -44,10 +44,7 @@ public abstract class LongArgJob extends AbstractProcessJob {
public LongArgJob(String jobid, String[] command, Props sysProps,
Props jobProp, Logger log, Set<String> suppressedKeys) {
- // super(command, desc);
super(jobid, sysProps, jobProp, log);
- // String cwd = descriptor.getProps().getString(WORKING_DIR, new
- // File(descriptor.getFullPath()).getParent());
this.builder =
new AzkabanProcessBuilder(command)
@@ -71,7 +68,6 @@ public abstract class LongArgJob extends AbstractProcessJob {
info("Working directory: " + builder.getWorkingDir());
File[] propFiles = initPropsFiles();
- // System.err.println("outputfile=" + propFiles[1]);
boolean success = false;
this.process = builder.build();
diff --git a/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java b/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
index b4b1fd6..bde18ec 100644
--- a/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
+++ b/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
@@ -326,7 +326,6 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
final String INSERT_PROJECT_FILES =
"INSERT INTO project_files (project_id, version, chunk, size, file) values (?,?,?,?,?)";
- // int numChunks = (localFileSize / buffer.length) + 1;
BufferedInputStream bufferedStream = null;
int chunk = 0;
try {
@@ -1219,8 +1218,6 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
ArrayList<Triple<String, Boolean, Permission>> permissions =
new ArrayList<Triple<String, Boolean, Permission>>();
do {
- // int project_id = rs.getInt(1);
- // long modifiedTime = rs.getLong(2);
String username = rs.getString(3);
int permissionFlag = rs.getInt(4);
boolean val = rs.getBoolean(5);
@@ -1250,10 +1247,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
ArrayList<Flow> flows = new ArrayList<Flow>();
do {
- // int projectId = rs.getInt(1);
- // int version = rs.getInt(2);
String flowId = rs.getString(3);
- // long modifiedTime = rs.getLong(4);
int encodingType = rs.getInt(5);
byte[] dataBytes = rs.getBytes(6);
@@ -1305,10 +1299,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
List<Pair<String, Props>> properties =
new ArrayList<Pair<String, Props>>();
do {
- // int projectId = rs.getInt(1);
- // int version = rs.getInt(2);
String name = rs.getString(3);
- // long modifiedTime = rs.getLong(4);
int eventType = rs.getInt(5);
byte[] dataBytes = rs.getBytes(6);
@@ -1377,10 +1368,6 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
ArrayList<byte[]> data = new ArrayList<byte[]>();
do {
- // int project_id = rs.getInt(1);
- // int version = rs.getInt(2);
- // int chunk = rs.getInt(3);
- // int size = rs.getInt(4);
byte[] bytes = rs.getBytes(5);
data.add(bytes);
@@ -1396,9 +1383,6 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
private static String SELECT_PROJECT_VERSION =
"SELECT project_id, version, upload_time, uploader, file_type, file_name, md5, num_chunks FROM project_versions WHERE project_id=? AND version=?";
- // private static String SELECT_ALL_PER_PROJECT =
- // "SELECT project_id, version, upload_time, uploader, file_type, file_name, md5, num_chunks FROM project_versions WHERE project_id=?";
-
@Override
public List<ProjectFileHandler> handle(ResultSet rs) throws SQLException {
if (!rs.next()) {
diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
index 104228a..54ab4dd 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
@@ -408,22 +408,6 @@ public class ProjectManager {
projectLoader.uploadProjectProperties(project, propProps);
}
- // TODO: find something else to load triggers
- // if(loadTriggerFromFile) {
- // logger.info("Loading triggers.");
- // Props triggerProps = new Props();
- // triggerProps.put("projectId", project.getId());
- // triggerProps.put("projectName", project.getName());
- // triggerProps.put("submitUser", uploader.getUserId());
- // try {
- // triggerManager.loadTriggerFromDir(file, triggerProps);
- // } catch (Exception e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // logger.error("Failed to load triggers.", e);
- // }
- // }
-
logger.info("Uploaded project files. Cleaning up temp files.");
projectLoader.postEvent(project, EventType.UPLOADED, uploader.getUserId(),
"Uploaded project files zip " + archive.getName());
diff --git a/azkaban-common/src/main/java/azkaban/scheduler/Schedule.java b/azkaban-common/src/main/java/azkaban/scheduler/Schedule.java
index eeb1cac..2b2fc88 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/Schedule.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/Schedule.java
@@ -38,11 +38,6 @@ import azkaban.utils.Pair;
public class Schedule {
- // private long projectGuid;
- // private long flowGuid;
-
- // private String scheduleId;
-
private int scheduleId;
private int projectId;
private String projectName;
@@ -305,7 +300,6 @@ public class Schedule {
if (slaOptions != null) {
List<Object> slaOptionsObject = new ArrayList<Object>();
- // schedObj.put("slaOptions", slaOptions.toObject());
for (SlaOption sla : slaOptions) {
slaOptionsObject.add(sla.toObject());
}
diff --git a/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java b/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
index 7a4c402..c2489ec 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
@@ -70,7 +70,6 @@ public class ScheduleManager implements TriggerAgent {
try {
scheduleList = loader.loadSchedules();
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
logger.error("Failed to load schedules" + e.getCause() + e.getMessage());
e.printStackTrace();
}
@@ -182,7 +181,6 @@ public class ScheduleManager implements TriggerAgent {
try {
loader.removeSchedule(sched);
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
@@ -232,7 +230,6 @@ public class ScheduleManager implements TriggerAgent {
* @param flow
*/
public synchronized void insertSchedule(Schedule s) {
- // boolean exist = s.getScheduleId() != -1;
Schedule exist = scheduleIdentityPairMap.get(s.getScheduleIdentityPair());
if (s.updateTime()) {
try {
@@ -245,7 +242,6 @@ public class ScheduleManager implements TriggerAgent {
internalSchedule(s);
}
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
} else {
diff --git a/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java b/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
index 83e1c9d..7a3c12a 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
@@ -125,14 +125,12 @@ public class TriggerBasedScheduleLoader implements ScheduleLoader {
}
}
- // TODO
- // may need to add logic to filter out skip runs
+ // TODO may need to add logic to filter out skip runs
@Override
public synchronized List<Schedule> loadSchedules()
throws ScheduleManagerException {
List<Trigger> triggers = triggerManager.getTriggers(triggerSource);
List<Schedule> schedules = new ArrayList<Schedule>();
- // triggersLocalCopy = new HashMap<Integer, Trigger>();
for (Trigger t : triggers) {
lastUpdateTime = Math.max(lastUpdateTime, t.getLastModifyTime());
Schedule s = triggerToSchedule(t);
@@ -182,9 +180,7 @@ public class TriggerBasedScheduleLoader implements ScheduleLoader {
public void removeSchedule(Schedule s) throws ScheduleManagerException {
try {
triggerManager.removeTrigger(s.getScheduleId(), s.getSubmitUser());
- // triggersLocalCopy.remove(s.getScheduleId());
} catch (TriggerManagerException e) {
- // TODO Auto-generated catch block
throw new ScheduleManagerException(e.getMessage());
}
@@ -203,7 +199,6 @@ public class TriggerBasedScheduleLoader implements ScheduleLoader {
triggers =
triggerManager.getTriggerUpdates(triggerSource, lastUpdateTime);
} catch (TriggerManagerException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
throw new ScheduleManagerException(e);
}
diff --git a/azkaban-common/src/main/java/azkaban/sla/SlaOption.java b/azkaban-common/src/main/java/azkaban/sla/SlaOption.java
index d5eff76..767b752 100644
--- a/azkaban-common/src/main/java/azkaban/sla/SlaOption.java
+++ b/azkaban-common/src/main/java/azkaban/sla/SlaOption.java
@@ -110,9 +110,6 @@ public class SlaOption {
public Object toWebObject() {
HashMap<String, Object> slaObj = new HashMap<String, Object>();
- // slaObj.put("type", type);
- // slaObj.put("info", info);
- // slaObj.put("actions", actions);
if (type.equals(TYPE_FLOW_FINISH) || type.equals(TYPE_FLOW_SUCCEED)) {
slaObj.put("id", "");
} else {
diff --git a/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java b/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java
index 8c6ad63..45b4fbb 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/ActionTypeLoader.java
@@ -36,13 +36,6 @@ public class ActionTypeLoader {
new HashMap<String, Class<? extends TriggerAction>>();
public void init(Props props) throws TriggerException {
- // load built-in actions
-
- //
- // loadBuiltinActions();
- //
- // loadPluginActions(props);
-
}
public synchronized void registerActionType(String type,
@@ -53,105 +46,6 @@ public class ActionTypeLoader {
}
}
- // private void loadPluginActions(Props props) throws TriggerException {
- // String checkerDir = props.getString("azkaban.trigger.action.plugin.dir",
- // DEFAULT_TRIGGER_ACTION_PLUGIN_DIR);
- // File pluginDir = new File(checkerDir);
- // if(!pluginDir.exists() || !pluginDir.isDirectory() || !pluginDir.canRead())
- // {
- // logger.info("No trigger action plugins to load.");
- // return;
- // }
- //
- // logger.info("Loading plugin trigger actions from " + pluginDir);
- // ClassLoader parentCl = this.getClass().getClassLoader();
- //
- // Props globalActionConf = null;
- // File confFile = Utils.findFilefromDir(pluginDir, COMMONCONFFILE);
- // try {
- // if(confFile != null) {
- // globalActionConf = new Props(null, confFile);
- // } else {
- // globalActionConf = new Props();
- // }
- // } catch (IOException e) {
- // throw new TriggerException("Failed to get global properties." + e);
- // }
- //
- // for(File dir : pluginDir.listFiles()) {
- // if(dir.isDirectory() && dir.canRead()) {
- // try {
- // loadPluginTypes(globalActionConf, pluginDir, parentCl);
- // } catch (Exception e) {
- // logger.info("Plugin actions failed to load. " + e.getCause());
- // throw new TriggerException("Failed to load all trigger actions!", e);
- // }
- // }
- // }
- // }
- //
- // @SuppressWarnings("unchecked")
- // private void loadPluginTypes(Props globalConf, File dir, ClassLoader
- // parentCl) throws TriggerException {
- // Props actionConf = null;
- // File confFile = Utils.findFilefromDir(dir, ACTIONTYPECONFFILE);
- // if(confFile == null) {
- // logger.info("No action type found in " + dir.getAbsolutePath());
- // return;
- // }
- // try {
- // actionConf = new Props(globalConf, confFile);
- // } catch (IOException e) {
- // throw new TriggerException("Failed to load config for the action type", e);
- // }
- //
- // String actionName = dir.getName();
- // String actionClass = actionConf.getString("action.class");
- //
- // List<URL> resources = new ArrayList<URL>();
- // for(File f : dir.listFiles()) {
- // try {
- // if(f.getName().endsWith(".jar")) {
- // resources.add(f.toURI().toURL());
- // logger.info("adding to classpath " + f.toURI().toURL());
- // }
- // } catch (MalformedURLException e) {
- // // TODO Auto-generated catch block
- // throw new TriggerException(e);
- // }
- // }
- //
- // // each job type can have a different class loader
- // ClassLoader actionCl = new URLClassLoader(resources.toArray(new
- // URL[resources.size()]), parentCl);
- //
- // Class<? extends TriggerAction> clazz = null;
- // try {
- // clazz = (Class<? extends TriggerAction>)actionCl.loadClass(actionClass);
- // actionToClass.put(actionName, clazz);
- // }
- // catch (ClassNotFoundException e) {
- // throw new TriggerException(e);
- // }
- //
- // if(actionConf.getBoolean("need.init")) {
- // try {
- // Utils.invokeStaticMethod(actionCl, actionClass, "init", actionConf);
- // } catch (Exception e) {
- // e.printStackTrace();
- // logger.error("Failed to init the action type " + actionName);
- // throw new TriggerException(e);
- // }
- // }
- //
- // logger.info("Loaded action type " + actionName + " " + actionClass);
- // }
- //
- // private void loadBuiltinActions() {
- // actionToClass.put(ExecuteFlowAction.type, ExecuteFlowAction.class);
- // logger.info("Loaded ExecuteFlowAction type.");
- // }
-
public static void registerBuiltinActions(
Map<String, Class<? extends TriggerAction>> builtinActions) {
actionToClass.putAll(builtinActions);
diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java
index 2fe5061..839ab0c 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/CreateTriggerAction.java
@@ -60,7 +60,6 @@ public class CreateTriggerAction implements TriggerAction {
@Override
public CreateTriggerAction fromJson(Object obj) throws Exception {
- // TODO Auto-generated method stub
return createFromJson(obj);
}
diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java
index 7927491..2a1fd9f 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecuteFlowAction.java
@@ -241,9 +241,6 @@ public class ExecuteFlowAction implements TriggerAction {
try {
executorManager.submitExecutableFlow(exflow, submitUser);
- // Map<String, Object> outputProps = new HashMap<String, Object>();
- // outputProps.put(EXEC_ID, exflow.getExecutionId());
- // context.put(actionId, outputProps);
logger.info("Invoked flow " + project.getName() + "." + flowName);
} catch (ExecutorManagerException e) {
throw new RuntimeException(e);
diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java
index b3e249d..8dcb37d 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/ExecutionChecker.java
@@ -54,7 +54,6 @@ public class ExecutionChecker implements ConditionChecker {
try {
exflow = executorManager.getExecutableFlow(execId);
} catch (ExecutorManagerException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
return Boolean.FALSE;
}
diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java
index ea26983..e4a1dbf 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/KillExecutionAction.java
@@ -100,8 +100,6 @@ public class KillExecutionAction implements TriggerAction {
@Override
public void setContext(Map<String, Object> context) {
- // TODO Auto-generated method stub
-
}
@Override
diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java
index 64e3d7e..5b89ca7 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/SlaAlertAction.java
@@ -36,7 +36,6 @@ public class SlaAlertAction implements TriggerAction {
private String actionId;
private SlaOption slaOption;
private int execId;
- // private List<Map<String, Object>> alerts;
private static Map<String, azkaban.alert.Alerter> alerters;
private static ExecutorManagerAdapter executorManager;
@@ -44,7 +43,6 @@ public class SlaAlertAction implements TriggerAction {
this.actionId = id;
this.slaOption = slaOption;
this.execId = execId;
- // this.alerts = alerts;
}
public static void setAlerters(Map<String, Alerter> alts) {
@@ -80,8 +78,6 @@ public class SlaAlertAction implements TriggerAction {
String actionId = (String) jsonObj.get("actionId");
SlaOption slaOption = SlaOption.fromObject(jsonObj.get("slaOption"));
int execId = Integer.valueOf((String) jsonObj.get("execId"));
- // List<Map<String, Object>> alerts = (List<Map<String, Object>>)
- // jsonObj.get("alerts");
return new SlaAlertAction(actionId, slaOption, execId);
}
@@ -97,14 +93,12 @@ public class SlaAlertAction implements TriggerAction {
jsonObj.put("type", type);
jsonObj.put("slaOption", slaOption.toObject());
jsonObj.put("execId", String.valueOf(execId));
- // jsonObj.put("alerts", alerts);
return jsonObj;
}
@Override
public void doAction() throws Exception {
- // for(Map<String, Object> alert : alerts) {
logger.info("Alerting on sla failure.");
Map<String, Object> alert = slaOption.getInfo();
if (alert.containsKey(SlaOption.ALERT_TYPE)) {
@@ -116,7 +110,6 @@ public class SlaAlertAction implements TriggerAction {
alerter.alertOnSla(slaOption,
SlaOption.createSlaMessage(slaOption, flow));
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
logger.error("Failed to alert by " + alertType);
}
@@ -125,59 +118,8 @@ public class SlaAlertAction implements TriggerAction {
+ " doesn't exist. Failed to alert.");
}
}
- // }
}
- // private String createSlaMessage() {
- // ExecutableFlow flow = null;
- // try {
- // flow = executorManager.getExecutableFlow(execId);
- // } catch (ExecutorManagerException e) {
- // e.printStackTrace();
- // logger.error("Failed to get executable flow.");
- // }
- // String type = slaOption.getType();
- // if(type.equals(SlaOption.TYPE_FLOW_FINISH)) {
- // String flowName = (String)
- // slaOption.getInfo().get(SlaOption.INFO_FLOW_NAME);
- // String duration = (String)
- // slaOption.getInfo().get(SlaOption.INFO_DURATION);
- // String basicinfo = "SLA Alert: Your flow " + flowName +
- // " failed to FINISH within " + duration + "</br>";
- // String expected = "Here is details : </br>" + "Flow " + flowName +
- // " in execution " + execId + " is expected to FINISH within " + duration +
- // " from " + flow.getStartTime() + "</br>";
- // String actual = "Actual flow status is " + flow.getStatus();
- // return basicinfo + expected + actual;
- // } else if(type.equals(SlaOption.TYPE_FLOW_SUCCEED)) {
- // String flowName = (String)
- // slaOption.getInfo().get(SlaOption.INFO_FLOW_NAME);
- // String duration = (String)
- // slaOption.getInfo().get(SlaOption.INFO_DURATION);
- // String basicinfo = "SLA Alert: Your flow " + flowName +
- // " failed to SUCCEED within " + duration + "</br>";
- // String expected = "Here is details : </br>" + "Flow " + flowName +
- // " in execution " + execId + " expected to FINISH within " + duration +
- // " from " + flow.getStartTime() + "</br>";
- // String actual = "Actual flow status is " + flow.getStatus();
- // return basicinfo + expected + actual;
- // } else if(type.equals(SlaOption.TYPE_JOB_FINISH)) {
- // String jobName = (String) slaOption.getInfo().get(SlaOption.INFO_JOB_NAME);
- // String duration = (String)
- // slaOption.getInfo().get(SlaOption.INFO_DURATION);
- // return "SLA Alert: Your job " + jobName + " failed to FINISH within " +
- // duration + " in execution " + execId;
- // } else if(type.equals(SlaOption.TYPE_JOB_SUCCEED)) {
- // String jobName = (String) slaOption.getInfo().get(SlaOption.INFO_JOB_NAME);
- // String duration = (String)
- // slaOption.getInfo().get(SlaOption.INFO_DURATION);
- // return "SLA Alert: Your job " + jobName + " failed to SUCCEED within " +
- // duration + " in execution " + execId;
- // } else {
- // return "Unrecognized SLA type " + type;
- // }
- // }
-
@Override
public void setContext(Map<String, Object> context) {
}
diff --git a/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java b/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java
index 829b343..664e2fd 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/CheckerTypeLoader.java
@@ -35,13 +35,6 @@ public class CheckerTypeLoader {
new HashMap<String, Class<? extends ConditionChecker>>();
public void init(Props props) throws TriggerException {
-
- // load built-in checkers
- //
- // loadBuiltinCheckers();
- //
- // loadPluginCheckers(props);
-
}
public synchronized void registerCheckerType(String type,
@@ -52,103 +45,6 @@ public class CheckerTypeLoader {
}
}
- // private void loadPluginCheckers(Props props) throws TriggerException {
- //
- // String checkerDir = props.getString("azkaban.condition.checker.plugin.dir",
- // DEFAULT_CONDITION_CHECKER_PLUGIN_DIR);
- // File pluginDir = new File(checkerDir);
- // if(!pluginDir.exists() || !pluginDir.isDirectory() || !pluginDir.canRead())
- // {
- // logger.info("No conditon checker plugins to load.");
- // return;
- // }
- //
- // logger.info("Loading plugin condition checkers from " + pluginDir);
- // ClassLoader parentCl = this.getClass().getClassLoader();
- //
- // Props globalCheckerConf = null;
- // File confFile = Utils.findFilefromDir(pluginDir, COMMONCONFFILE);
- // try {
- // if(confFile != null) {
- // globalCheckerConf = new Props(null, confFile);
- // } else {
- // globalCheckerConf = new Props();
- // }
- // } catch (IOException e) {
- // throw new TriggerException("Failed to get global properties." + e);
- // }
- //
- // for(File dir : pluginDir.listFiles()) {
- // if(dir.isDirectory() && dir.canRead()) {
- // try {
- // loadPluginTypes(globalCheckerConf, pluginDir, parentCl);
- // } catch (Exception e) {
- // logger.info("Plugin checkers failed to load. " + e.getCause());
- // throw new TriggerException("Failed to load all condition checkers!", e);
- // }
- // }
- // }
- // }
- //
- // @SuppressWarnings("unchecked")
- // private void loadPluginTypes(Props globalConf, File dir, ClassLoader
- // parentCl) throws TriggerException {
- // Props checkerConf = null;
- // File confFile = Utils.findFilefromDir(dir, CHECKERTYPECONFFILE);
- // if(confFile == null) {
- // logger.info("No checker type found in " + dir.getAbsolutePath());
- // return;
- // }
- // try {
- // checkerConf = new Props(globalConf, confFile);
- // } catch (IOException e) {
- // throw new TriggerException("Failed to load config for the checker type",
- // e);
- // }
- //
- // String checkerName = dir.getName();
- // String checkerClass = checkerConf.getString("checker.class");
- //
- // List<URL> resources = new ArrayList<URL>();
- // for(File f : dir.listFiles()) {
- // try {
- // if(f.getName().endsWith(".jar")) {
- // resources.add(f.toURI().toURL());
- // logger.info("adding to classpath " + f.toURI().toURL());
- // }
- // } catch (MalformedURLException e) {
- // // TODO Auto-generated catch block
- // throw new TriggerException(e);
- // }
- // }
- //
- // // each job type can have a different class loader
- // ClassLoader checkerCl = new URLClassLoader(resources.toArray(new
- // URL[resources.size()]), parentCl);
- //
- // Class<? extends ConditionChecker> clazz = null;
- // try {
- // clazz = (Class<? extends
- // ConditionChecker>)checkerCl.loadClass(checkerClass);
- // checkerToClass.put(checkerName, clazz);
- // }
- // catch (ClassNotFoundException e) {
- // throw new TriggerException(e);
- // }
- //
- // if(checkerConf.getBoolean("need.init")) {
- // try {
- // Utils.invokeStaticMethod(checkerCl, checkerClass, "init", checkerConf);
- // } catch (Exception e) {
- // e.printStackTrace();
- // logger.error("Failed to init the checker type " + checkerName);
- // throw new TriggerException(e);
- // }
- // }
- //
- // logger.info("Loaded checker type " + checkerName + " " + checkerClass);
- // }
-
public static void registerBuiltinCheckers(
Map<String, Class<? extends ConditionChecker>> builtinCheckers) {
checkerToClass.putAll(checkerToClass);
@@ -157,11 +53,6 @@ public class CheckerTypeLoader {
}
}
- // private void loadBuiltinCheckers() {
- // checkerToClass.put("BasicTimeChecker", BasicTimeChecker.class);
- // logger.info("Loaded BasicTimeChecker type.");
- // }
-
public ConditionChecker createCheckerFromJson(String type, Object obj)
throws Exception {
ConditionChecker checker = null;
diff --git a/azkaban-common/src/main/java/azkaban/trigger/Condition.java b/azkaban-common/src/main/java/azkaban/trigger/Condition.java
index 07c0a65..7bb275b 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/Condition.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/Condition.java
@@ -50,9 +50,6 @@ public class Condition {
long nextCheckTime) {
this.nextCheckTime = nextCheckTime;
setCheckers(checkers);
- // for(ConditionChecker ck : checkers.values()) {
- // ck.setCondition(this);
- // }
this.expression = jexl.createExpression(expr);
}
@@ -86,7 +83,6 @@ public class Condition {
this.checkers = checkers;
for (ConditionChecker checker : checkers.values()) {
this.context.set(checker.getId(), checker);
- // checker.setCondition(this);
}
updateNextCheckTime();
}
diff --git a/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java b/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java
index 61333ac..68c0508 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerLoader.java
@@ -237,7 +237,6 @@ public class JdbcTriggerLoader extends AbstractJdbcLoader implements
connection.commit();
if (updates == 0) {
throw new TriggerLoaderException("No trigger has been updated.");
- // logger.error("No trigger is updated!");
} else {
logger.info("Updated " + updates + " records.");
}
@@ -274,8 +273,6 @@ public class JdbcTriggerLoader extends AbstractJdbcLoader implements
ArrayList<Trigger> triggers = new ArrayList<Trigger>();
do {
int triggerId = rs.getInt(1);
- // String triggerSource = rs.getString(2);
- // long modifyTime = rs.getLong(3);
int encodingType = rs.getInt(4);
byte[] data = rs.getBytes(5);
@@ -304,7 +301,6 @@ public class JdbcTriggerLoader extends AbstractJdbcLoader implements
t = Trigger.fromJson(jsonObj);
triggers.add(t);
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
logger.error("Failed to load trigger " + triggerId);
}
diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
index 24bb8e3..1998496 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
@@ -185,7 +185,6 @@ public class TriggerManager extends EventHandler implements
private BlockingQueue<Trigger> triggers;
private Map<Integer, ExecutableFlow> justFinishedFlows;
private boolean shutdown = false;
- // private AtomicBoolean stillAlive = new AtomicBoolean(true);
private final long scannerInterval;
public TriggerScannerThread(long scannerInterval) {
@@ -198,7 +197,6 @@ public class TriggerManager extends EventHandler implements
public void shutdown() {
logger.error("Shutting down trigger manager thread " + this.getName());
shutdown = true;
- // stillAlive.set(false);
this.interrupt();
}
@@ -220,7 +218,6 @@ public class TriggerManager extends EventHandler implements
}
public void run() {
- // while(stillAlive.get()) {
while (!shutdown) {
synchronized (syncObj) {
try {
@@ -348,7 +345,6 @@ public class TriggerManager extends EventHandler implements
if (t.isResetOnExpire()) {
t.resetTriggerConditions();
t.resetExpireCondition();
- // updateTrigger(t);
} else {
t.setStatus(TriggerStatus.EXPIRED);
}
@@ -384,7 +380,6 @@ public class TriggerManager extends EventHandler implements
public void expireTrigger(int triggerId) {
Trigger t = getTrigger(triggerId);
t.setStatus(TriggerStatus.EXPIRED);
- // updateAgent(t);
}
@Override
diff --git a/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java b/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
index 34a6d63..3d453b1 100644
--- a/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
+++ b/azkaban-common/src/main/java/azkaban/utils/EmailMessage.java
@@ -133,14 +133,6 @@ public class EmailMessage {
throw new RuntimeException("Mail host not set.");
}
- // if (_mailUser == null) {
- // throw new RuntimeException("Mail user not set.");
- // }
- //
- // if (_mailPassword == null) {
- // throw new RuntimeException("Mail password not set.");
- // }
-
if (_fromAddress == null || _fromAddress.length() == 0) {
throw new RuntimeException("From address not set.");
}
@@ -157,7 +149,6 @@ public class EmailMessage {
public void sendEmail() throws MessagingException {
checkSettings();
Properties props = new Properties();
- // props.setProperty("mail.transport.protocol", "smtp");
props.put("mail." + protocol + ".host", _mailHost);
props.put("mail." + protocol + ".auth", "true");
props.put("mail.user", _mailUser);
diff --git a/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java b/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java
index 202cc2b..813de2b 100644
--- a/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/FileIOUtils.java
@@ -102,7 +102,6 @@ public class FileIOUtils {
createDirsFindFiles(sourceDir, sourceDir, destDir, paths);
StringBuffer buffer = new StringBuffer();
- // buffer.append("sh '");
for (String path : paths) {
File sourceLink = new File(sourceDir, path);
path = "." + path;
@@ -111,9 +110,7 @@ public class FileIOUtils {
.append(" ").append(path).append(";");
}
- // buffer.append("'");
String command = buffer.toString();
- // System.out.println(command);
ProcessBuilder builder = new ProcessBuilder().command("sh", "-c", command);
builder.directory(destDir);
diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java b/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java
index 804ae8d..6b04a85 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/ExecutorServlet.java
@@ -147,22 +147,6 @@ public class ExecutorServlet extends HttpServlet implements ConnectorParams {
try {
if (MODIFY_RETRY_FAILURES.equals(modificationType)) {
flowRunnerManager.retryFailures(execId, user);
- } else {
- // String modifiedJobList = getParam(req, MODIFY_JOBS_LIST);
- // String[] jobIds = modifiedJobList.split("\\s*,\\s*");
- //
- // if (MODIFY_RETRY_JOBS.equals(modificationType)) {
- // }
- // else if (MODIFY_CANCEL_JOBS.equals(modificationType)) {
- // }
- // else if (MODIFY_DISABLE_JOBS.equals(modificationType)) {
- // }
- // else if (MODIFY_ENABLE_JOBS.equals(modificationType)) {
- // }
- // else if (MODIFY_PAUSE_JOBS.equals(modificationType)) {
- // }
- // else if (MODIFY_RESUME_JOBS.equals(modificationType)) {
- // }
}
} catch (ExecutorManagerException e) {
logger.error(e);
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java
index f6cc83e..8670753 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -204,7 +204,6 @@ public class AzkabanWebServer extends AzkabanServer {
loadPluginCheckersAndActions(triggerPluginDir);
- // baseClassLoader = getBaseClassloader();
baseClassLoader = this.getClassLoader();
tempDir = new File(props.getString("azkaban.temp.dir", "temp"));
@@ -259,18 +258,6 @@ public class AzkabanWebServer extends AzkabanServer {
return execManager;
}
- // private ExecutorManagerAdapter loadExecutorManagerAdapter(Props props)
- // throws Exception {
- // String executorMode = props.getString("executor.manager.mode", "local");
- // ExecutorManagerAdapter adapter;
- // if(executorMode.equals("local")) {
- // adapter = loadExecutorManager(props);
- // } else {
- // throw new Exception("Unknown ExecutorManager mode " + executorMode);
- // }
- // return adapter;
- // }
-
private ScheduleManager loadScheduleManager(TriggerManager tm, Props props)
throws Exception {
logger.info("Loading trigger based scheduler");
@@ -294,7 +281,6 @@ public class AzkabanWebServer extends AzkabanServer {
ExecuteFlowAction.setTriggerManager(triggerManager);
KillExecutionAction.setExecutorManager(executorManager);
SlaAlertAction.setExecutorManager(executorManager);
- // Map<String, azkaban.alert.Alerter> alerters = loadAlerters(props);
SlaAlertAction.setAlerters(alerters);
SlaAlertAction.setExecutorManager(executorManager);
CreateTriggerAction.setTriggerManager(triggerManager);
@@ -625,10 +611,6 @@ public class AzkabanWebServer extends AzkabanServer {
return triggerManager;
}
- // public TriggerBasedScheduler getScheduler() {
- // return scheduler;
- // }
- //
/**
* Creates and configures the velocity engine.
*
@@ -666,29 +648,6 @@ public class AzkabanWebServer extends AzkabanServer {
return engine;
}
- // private ClassLoader getBaseClassloader() throws MalformedURLException {
- // final ClassLoader retVal;
- //
- // String hadoopHome = System.getenv("HADOOP_HOME");
- // String hadoopConfDir = System.getenv("HADOOP_CONF_DIR");
- //
- // if (hadoopConfDir != null) {
- // logger.info("Using hadoop config found in " + hadoopConfDir);
- // retVal = new URLClassLoader(new URL[] { new File(hadoopConfDir)
- // .toURI().toURL() }, getClass().getClassLoader());
- // } else if (hadoopHome != null) {
- // logger.info("Using hadoop config found in " + hadoopHome);
- // retVal = new URLClassLoader(
- // new URL[] { new File(hadoopHome, "conf").toURI().toURL() },
- // getClass().getClassLoader());
- // } else {
- // logger.info("HADOOP_HOME not set, using default hadoop config.");
- // retVal = getClass().getClassLoader();
- // }
- //
- // return retVal;
- // }
-
public ClassLoader getClassLoader() {
return baseClassLoader;
}
@@ -831,14 +790,6 @@ public class AzkabanWebServer extends AzkabanServer {
app.setTriggerPlugins(triggerPlugins);
// always have basic time trigger
// TODO: find something else to do the job
- // app.getTriggerManager().addTriggerAgent(app.getScheduleManager().getTriggerSource(),
- // app.getScheduleManager());
- // add additional triggers
- // for(TriggerPlugin plugin : triggerPlugins.values()) {
- // TriggerAgent agent = plugin.getAgent();
- // app.getTriggerManager().addTriggerAgent(agent.getTriggerSource(), agent);
- // }
- // fire up
app.getTriggerManager().start();
root.setAttribute(ServerConstants.AZKABAN_SERVLET_CONTEXT_KEY, app);
@@ -871,7 +822,6 @@ public class AzkabanWebServer extends AzkabanServer {
String pluginPath, AzkabanWebServer azkabanWebApp) {
File triggerPluginPath = new File(pluginPath);
if (!triggerPluginPath.exists()) {
- // return Collections.<String, TriggerPlugin>emptyMap();
return new HashMap<String, TriggerPlugin>();
}
@@ -918,9 +868,6 @@ public class AzkabanWebServer extends AzkabanServer {
}
String pluginName = pluginProps.getString("trigger.name");
- // String pluginWebPath = pluginProps.getString("trigger.web.path");
- // int pluginOrder = pluginProps.getInt("trigger.order", 0);
- // boolean pluginHidden = pluginProps.getBoolean("trigger.hidden", false);
List<String> extLibClasspath =
pluginProps.getStringList("trigger.external.classpaths",
(List<String>) null);
@@ -1259,10 +1206,6 @@ public class AzkabanWebServer extends AzkabanServer {
registerMbean("executorManager", new JmxExecutorManager(
(ExecutorManager) executorManager));
}
- // registerMbean("executorManager", new
- // JmxExecutorManager(executorManager));
- // registerMbean("executorManager", new
- // JmxExecutorManager(executorManager));
}
public void close() {
@@ -1275,9 +1218,6 @@ public class AzkabanWebServer extends AzkabanServer {
logger.error("Failed to cleanup MBeanServer", e);
}
scheduleManager.shutdown();
- // if(executorManager instanceof ExecutorManagerLocalAdapter) {
- // ((ExecutorManagerLocalAdapter)executorManager).getExecutorManager().shutdown();
- // }
executorManager.shutdown();
}
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
index c282391..0bb454c 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
@@ -277,8 +277,6 @@ public abstract class AbstractAzkabanServlet extends HttpServlet {
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (Cookie cookie : cookies) {
- // if (name.equals(cookie.getName()) && cookie.getPath()!=null &&
- // cookie.getPath().equals("/")) {
if (name.equals(cookie.getName())) {
return cookie;
}
@@ -324,9 +322,6 @@ public abstract class AbstractAzkabanServlet extends HttpServlet {
// the first one
if (viewerPlugins != null && !viewerPlugins.isEmpty()) {
page.add("viewers", viewerPlugins);
- // ViewerPlugin plugin = viewerPlugins.get(0);
- // page.add("viewerName", plugin.getPluginName());
- // page.add("viewerPath", plugin.getPluginPath());
}
if (triggerPlugins != null && !triggerPlugins.isEmpty()) {
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
index 66d8934..c5ae77c 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -123,14 +123,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
ajaxFetchJobStats(req, resp, ret, session.getUser(), exFlow);
} else if (ajaxName.equals("retryFailedJobs")) {
ajaxRestartFailed(req, resp, ret, session.getUser(), exFlow);
- }
- // else if (ajaxName.equals("fetchLatestJobStatus")) {
- // ajaxFetchLatestJobStatus(req, resp, ret, session.getUser(), exFlow);
- // }
- else if (ajaxName.equals("flowInfo")) {
- // String projectName = getParam(req, "project");
- // Project project = projectManager.getProject(projectName);
- // String flowName = getParam(req, "flow");
+ } else if (ajaxName.equals("flowInfo")) {
ajaxFetchExecutableFlowInfo(req, resp, ret, session.getUser(), exFlow);
}
}
@@ -331,55 +324,6 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
return null;
}
- // private void ajaxFetchLatestJobStatus(HttpServletRequest
- // req,HttpServletResponse resp, HashMap<String, Object> ret, User user,
- // ExecutableFlow exFlow) {
- // Project project = getProjectAjaxByPermission(ret, exFlow.getProjectId(),
- // user, Type.READ);
- // if (project == null) {
- // ret.put("error", "Project doesn't exist or incorrect access permission.");
- // return;
- // }
- //
- // String projectName;
- // String flowName;
- // String jobName;
- // try {
- // projectName = getParam(req, "projectName");
- // flowName = getParam(req, "flowName");
- // jobName = getParam(req, "jobName");
- // } catch (Exception e) {
- // ret.put("error", e.getMessage());
- // return;
- // }
- //
- // try {
- // ExecutableNode node = exFlow.getExecutableNode(jobId);
- // if (node == null) {
- // ret.put("error", "Job " + jobId + " doesn't exist in " +
- // exFlow.getExecutionId());
- // return;
- // }
- //
- // int attempt = this.getIntParam(req, "attempt", node.getAttempt());
- // LogData data = executorManager.getExecutionJobLog(exFlow, jobId, offset,
- // length, attempt);
- // if (data == null) {
- // ret.put("length", 0);
- // ret.put("offset", offset);
- // ret.put("data", "");
- // }
- // else {
- // ret.put("length", data.getLength());
- // ret.put("offset", data.getOffset());
- // ret.put("data", data.getData());
- // }
- // } catch (ExecutorManagerException e) {
- // throw new ServletException(e);
- // }
- //
- // }
-
private void ajaxRestartFailed(HttpServletRequest req,
HttpServletResponse resp, HashMap<String, Object> ret, User user,
ExecutableFlow exFlow) throws ServletException {
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
index 1ff0d8f..3a91f6e 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
@@ -85,27 +85,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
private void fetchHistoryData(HttpServletRequest req,
HttpServletResponse resp, HashMap<String, Object> ret)
throws ServletException {
- // long start = getLongParam(req, "start");
- // long end = getLongParam(req, "end");
- //
- // ret.put("start", start);
- // ret.put("end", end);
- //
- // List<ExecutionReference> refs = executorManager.getFlowHistory(start,
- // end);
- // ArrayList<Object> refList = new ArrayList<Object>();
- // for (ExecutionReference ref: refs) {
- //
- // HashMap<String,Object> refObj = new HashMap<String,Object>();
- // refObj.put("execId", ref.getExecId());
- // refObj.put("start", ref.getStartTime());
- // refObj.put("end", ref.getEndTime());
- // refObj.put("status", ref.getStatus().toString());
- //
- // refList.add(refObj);
- // }
- //
- // ret.put("data", refList);
}
private void handleHistoryPage(HttpServletRequest req,
@@ -149,7 +128,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
executorManager.getExecutableFlows(searchTerm, (pageNum - 1)
* pageSize, pageSize);
} catch (ExecutorManagerException e) {
- // TODO Auto-generated catch block
page.add("error", e.getMessage());
}
} else {
@@ -179,9 +157,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
page.add("begin", getParam(req, "begin"));
page.add("end", getParam(req, "end"));
}
- // else {
- // page.add("search_term", "");
- // }
if (pageNum == 1) {
page.add("previous", new PageSelection(1, pageSize, true, false));
@@ -217,60 +192,10 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
private void handleHistoryTimelinePage(HttpServletRequest req,
HttpServletResponse resp, Session session) {
- // Page page = newPage(req, resp, session,
- // "azkaban/webapp/servlet/velocity/historytimelinepage.vm");
- // long currentTime = System.currentTimeMillis();
- // long begin = getLongParam(req, "begin", currentTime - 86400000);
- // long end = getLongParam(req, "end", currentTime);
- //
- // page.add("begin", begin);
- // page.add("end", end);
- //
- // List<ExecutionReference> refs = executorManager.getFlowHistory(begin,
- // end);
- // ArrayList<Object> refList = new ArrayList<Object>();
- // for (ExecutionReference ref: refs) {
- //
- // HashMap<String,Object> refObj = new HashMap<String,Object>();
- // refObj.put("execId", ref.getExecId());
- // refObj.put("start", ref.getStartTime());
- // refObj.put("end", ref.getEndTime());
- // refObj.put("status", ref.getStatus().toString());
- //
- // refList.add(refObj);
- // }
- //
- // page.add("data", JSONUtils.toJSON(refList));
- // page.render();
}
private void handleHistoryDayPage(HttpServletRequest req,
HttpServletResponse resp, Session session) {
- // Page page = newPage(req, resp, session,
- // "azkaban/webapp/servlet/velocity/historydaypage.vm");
- // long currentTime = System.currentTimeMillis();
- // long begin = getLongParam(req, "begin", currentTime - 86400000);
- // long end = getLongParam(req, "end", currentTime);
- //
- // page.add("begin", begin);
- // page.add("end", end);
- //
- // List<ExecutionReference> refs = executorManager.getFlowHistory(begin,
- // end);
- // ArrayList<Object> refList = new ArrayList<Object>();
- // for (ExecutionReference ref: refs) {
- //
- // HashMap<String,Object> refObj = new HashMap<String,Object>();
- // refObj.put("execId", ref.getExecId());
- // refObj.put("start", ref.getStartTime());
- // refObj.put("end", ref.getEndTime());
- // refObj.put("status", ref.getStatus().toString());
- //
- // refList.add(refObj);
- // }
- //
- // page.add("data", JSONUtils.toJSON(refList));
- // page.render();
}
public class PageSelection {
@@ -310,8 +235,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
@Override
protected void handlePost(HttpServletRequest req, HttpServletResponse resp,
Session session) throws ServletException, IOException {
- // TODO Auto-generated method stub
-
}
public class ExecutorVMHelper {
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
index 74b419e..2c690d9 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/JMXHttpServlet.java
@@ -96,22 +96,7 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
executorManager.callExecutorJMX(hostPort,
JMX_GET_ALL_MBEAN_ATTRIBUTES, mbean);
ret = result;
- }
- // else
- // if
- // (TriggerConnectorParams.JMX_GET_ALL_TRIGGER_SERVER_ATTRIBUTES.equals(ajax))
- // {
- // if(!hasParam(req, JMX_MBEAN) || !hasParam(req, JMX_HOSTPORT)) {
- // ret.put("error", "Parameters '" + JMX_MBEAN + "' and '"+ JMX_HOSTPORT
- // +"' must be set");
- // this.writeJSON(resp, ret, true);
- // return;
- // }
- // // String hostPort = getParam(req, JMX_HOSTPORT);
- // // String mbean = getParam(req, JMX_MBEAN);
- // ret = triggerManager.getJMX().getAllJMXMbeans();
- // }
- else if (JMX_GET_MBEANS.equals(ajax)) {
+ } else if (JMX_GET_MBEANS.equals(ajax)) {
ret.put("mbeans", server.getMbeanNames());
} else if (JMX_GET_MBEAN_INFO.equals(ajax)) {
if (hasParam(req, JMX_MBEAN)) {
@@ -196,19 +181,12 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
page.add("mbeans", server.getMbeanNames());
Map<String, Object> executorMBeans = new HashMap<String, Object>();
- // Set<String> primaryServerHosts = executorManager.getPrimaryServerHosts();
for (String hostPort : executorManager.getAllActiveExecutorServerHosts()) {
try {
Map<String, Object> mbeans =
executorManager.callExecutorJMX(hostPort, JMX_GET_MBEANS, null);
executorMBeans.put(hostPort, mbeans.get("mbeans"));
- // if (primaryServerHosts.contains(hostPort)) {
- // executorMBeans.put(hostPort, mbeans.get("mbeans"));
- // }
- // else {
- // executorMBeans.put(hostPort, mbeans.get("mbeans"));
- // }
} catch (IOException e) {
logger.error("Cannot contact executor " + hostPort, e);
}
@@ -217,25 +195,6 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
page.add("executorRemoteMBeans", executorMBeans);
Map<String, Object> triggerserverMBeans = new HashMap<String, Object>();
- // Set<String> primaryTriggerServerHosts =
- // triggerManager.getPrimaryServerHosts();
- // for (String hostPort: triggerManager.getAllActiveTriggerServerHosts()) {
- // try {
- // Map<String, Object> mbeans =
- // triggerManager.callTriggerServerJMX(hostPort,
- // TriggerConnectorParams.JMX_GET_MBEANS, null);
- //
- // if (primaryTriggerServerHosts.contains(hostPort)) {
- // triggerserverMBeans.put(hostPort, mbeans.get("mbeans"));
- // }
- // else {
- // triggerserverMBeans.put(hostPort, mbeans.get("mbeans"));
- // }
- // }
- // catch (IOException e) {
- // logger.error("Cannot contact executor " + hostPort, e);
- // }
- // }
triggerserverMBeans.put(triggerManager.getJMX().getPrimaryServerHost(),
triggerManager.getJMX().getAllJMXMbeans());
@@ -250,18 +209,6 @@ public class JMXHttpServlet extends LoginAbstractAzkabanServlet implements
}
- // private boolean hasAdminRole(User user) {
- // for(String roleName: user.getRoles()) {
- // Role role = userManager.getRole(roleName);
- // Permission perm = role.getPermission();
- // if (perm.isPermissionSet(Permission.Type.ADMIN)) {
- // return true;
- // }
- // }
- //
- // return false;
- // }
-
protected boolean hasPermission(User user, Permission.Type type) {
for (String roleName : user.getRoles()) {
Role role = userManager.getRole(roleName);
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index 95644e2..018fa64 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -438,7 +438,6 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
}
}
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
throw new ServletException(e);
}
@@ -465,7 +464,6 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
return;
}
- // project.info("Project removing by '" + user.getUserId() + "'");
try {
projectManager.removeProject(project, user);
} catch (ProjectManagerException e) {
@@ -539,7 +537,6 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
generalParams.put(ps, prop.getString(ps));
}
for (String ops : overrideProp.getKeySet()) {
- // generalParams.put(ops, overrideProp.getString(ops));
overrideParams.put(ops, overrideProp.getString(ops));
}
ret.put("generalParams", generalParams);
@@ -609,10 +606,7 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
nodeObj.put("type", node.getType());
if (node.getEmbeddedFlowId() != null) {
nodeObj.put("flowId", node.getEmbeddedFlowId());
- // HashMap<String, Object> embeddedNodeObj = new HashMap<String,
- // Object>();
fillFlowInfo(project, node.getEmbeddedFlowId(), nodeObj);
- // nodeObj.put("flowData", embeddedNodeObj);
}
nodeList.add(nodeObj);
@@ -914,8 +908,6 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
page.add("errorMsg", e.getMessage());
}
- // page.add("projectManager", projectManager);
- // int bytesSkip = 0;
int numBytes = 1024;
// Really sucks if we do a lot of these because it'll eat up memory fast.
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java
index 2baef36..f688820 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/ScheduleServlet.java
@@ -172,7 +172,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
}
private SlaOption parseSlaSetting(String set) throws ScheduleManagerException {
- // "" + Duration + EmailAction + KillAction
logger.info("Tryint to set sla with the following set: " + set);
String slaType;
@@ -185,8 +184,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
String emailAction = parts[3];
String killAction = parts[4];
if (emailAction.equals("true") || killAction.equals("true")) {
- // String type = id.equals("") ? SlaOption.RULE_FLOW_RUNTIME_SLA :
- // SlaOption.RULE_JOB_RUNTIME_SLA ;
if (emailAction.equals("true")) {
slaActions.add(SlaOption.ACTION_ALERT);
slaInfo.put(SlaOption.ALERT_TYPE, "email");
@@ -348,14 +345,9 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
try {
schedules = scheduleManager.getSchedules();
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
throw new ServletException(e);
}
page.add("schedules", schedules);
- //
- // List<SLA> slas = slaManager.getSLAs();
- // page.add("slas", slas);
-
page.render();
}
@@ -371,14 +363,9 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
try {
schedules = scheduleManager.getSchedules();
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
throw new ServletException(e);
}
page.add("schedules", schedules);
- //
- // List<SLA> slas = slaManager.getSLAs();
- // page.add("slas", slas);
-
page.render();
}
@@ -413,7 +400,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
try {
schedules = scheduleManager.getSchedules();
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
throw new ServletException(e);
}
// See if anything is scheduled
@@ -428,7 +414,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
try {
writeScheduleData(output, schedule);
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
throw new ServletException(e);
}
}
@@ -477,7 +462,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
useCache = true;
}
long endTime = startTime + 24 * 3600 * 1000;
- // long endTime = getLongParam(req, "endTime");
int loadAll = getIntParam(req, "loadAll");
// Cache file
@@ -499,7 +483,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
new BufferedInputStream(new FileInputStream(cache));
try {
IOUtils.copy(cacheInput, resp.getOutputStream());
- // System.out.println("Using cache copy for " + start);
return;
} finally {
IOUtils.closeQuietly(cacheInput);
@@ -585,7 +568,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
try {
sched = scheduleManager.getSchedule(scheduleId);
} catch (ScheduleManagerException e) {
- // TODO Auto-generated catch block
throw new ServletException(e);
}
if (sched == null) {
@@ -671,7 +653,6 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
ret.put("error", e.getMessage());
}
- // Schedule sched = scheduleManager.getSchedule(projectId, flowName);
ExecutionOptions flowOptions = null;
try {
flowOptions = HttpRequestUtils.parseFlowOptions(req);
@@ -712,9 +693,8 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
if (scheduleDate == null || scheduleDate.trim().length() == 0) {
day = new LocalDateTime().toDateTime();
} else {
- day =
- DateTimeFormat.forPattern("MM/dd/yyyy").withZone(timezone)
- .parseDateTime(scheduleDate);
+ day = DateTimeFormat.forPattern("MM/dd/yyyy")
+ .withZone(timezone).parseDateTime(scheduleDate);
}
hour %= 12;
diff --git a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java
index 81eff00..18cdcd9 100644
--- a/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java
+++ b/azkaban-webserver/src/main/java/azkaban/webapp/servlet/TriggerManagerServlet.java
@@ -87,10 +87,6 @@ public class TriggerManagerServlet extends LoginAbstractAzkabanServlet {
List<Trigger> triggers = triggerManager.getTriggers();
page.add("triggers", triggers);
- //
- // List<SLA> slas = slaManager.getSLAs();
- // page.add("slas", slas);
-
page.render();
}
@@ -113,18 +109,9 @@ public class TriggerManagerServlet extends LoginAbstractAzkabanServlet {
return;
}
- // if(!hasPermission(project, user, Type.SCHEDULE)) {
- // ret.put("status", "error");
- // ret.put("message", "Permission denied. Cannot remove trigger with id " +
- // triggerId);
- // return;
- // }
-
triggerManager.expireTrigger(triggerId);
logger.info("User '" + user.getUserId() + " has removed trigger "
+ t.getDescription());
- // projectManager.postProjectEvent(project, EventType.SCHEDULE,
- // user.getUserId(), "Schedule " + sched.toString() + " has been removed.");
ret.put("status", "success");
ret.put("message", "trigger " + triggerId + " removed from Schedules.");
