diff --git a/src/java/azkaban/scheduler/ScheduleManager.java b/src/java/azkaban/scheduler/ScheduleManager.java
index de90a5c..00c4f46 100644
--- a/src/java/azkaban/scheduler/ScheduleManager.java
+++ b/src/java/azkaban/scheduler/ScheduleManager.java
@@ -160,7 +160,7 @@ public class ScheduleManager {
*/
public synchronized void removeSchedule(Schedule sched) {
- Pair<Integer,String> identityPairMap = new Pair<Integer,String>(sched.getProjectId(), sched.getFlowName());
+ Pair<Integer,String> identityPairMap = sched.getScheduleIdentityPair();
Set<Schedule> schedules = scheduleIdentityPairMap.get(identityPairMap);
if(schedules != null) {
schedules.remove(sched);
diff --git a/src/java/azkaban/webapp/servlet/ExecutorServlet.java b/src/java/azkaban/webapp/servlet/ExecutorServlet.java
index f10b43e..a542a82 100644
--- a/src/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/src/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -566,19 +566,6 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
}
ret.put("nodeStatus", nodeStatus);
ret.put("disabled", options.getDisabledJobs());
-
- Schedule sflow = null;// = scheduleManager.getSchedule(project.getId(), exflow.getFlowId());
-
- for (Schedule sched: scheduleManager.getSchedules()) {
- if (sched.getProjectId() == project.getId() && sched.getFlowName().equals(exflow.getFlowId())) {
- sflow = sched;
- break;
- }
- }
-
- if (sflow != null) {
- ret.put("scheduled", sflow.getNextExecTime());
- }
}
private void ajaxCancelFlow(HttpServletRequest req, HttpServletResponse resp, HashMap<String, Object> ret, User user, ExecutableFlow exFlow) throws ServletException{
diff --git a/src/java/azkaban/webapp/servlet/ScheduleServlet.java b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
index 4f4bd32..1807af6 100644
--- a/src/java/azkaban/webapp/servlet/ScheduleServlet.java
+++ b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
@@ -343,73 +343,17 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
}
private void ajaxLoadFlows(HttpServletRequest req, HashMap<String, Object> ret, User user) throws ServletException {
- // Very long day...
-// long day = getLongParam(req, "day");
-// boolean loadPrevious = getIntParam(req, "loadPrev") != 0;
-
+
List<Schedule> schedules = scheduleManager.getSchedules();
// See if anything is scheduled
if (schedules.size() <= 0)
return;
-//
-// // Since size is larger than 0, there's at least one element.
-// DateTime date = new DateTime(day);
-// // Get only the day component while stripping the time component. This
-// // gives us 12:00:00AM of that day
-// DateTime start = date.withTime(0, 0, 0, 0);
-// // Next day
-// DateTime end = start.plusDays(1);
-// // Get microseconds
-// long startTime = start.getMillis();
-// long endTime = end.getMillis();
List<HashMap<String, String>> output = new ArrayList<HashMap<String, String>>();
ret.put("items", output);
for (Schedule schedule : schedules) {
writeScheduleData(output, schedule);
-// long length = 2*3600*1000; //TODO: This is temporary
-// long firstTime = schedule.getFirstSchedTime();
-// long period = 0;
-//
-// if (schedule.getPeriod() != null) {
-// period = start.plus(schedule.getPeriod()).getMillis() - startTime;
-//
-// // Shift time until we're past the start time
-// if (period > 0) {
-// // Calculate next execution time efficiently
-// long periods = (startTime - firstTime) / period;
-// // Take into account items that ends in the date specified, but does not start on that date
-// if(loadPrevious)
-// {
-// periods = (startTime - firstTime - length) / period;
-// }
-// if(periods < 0){
-// periods = 0;
-// }
-// firstTime += period * periods;
-// // Increment in case we haven't arrived yet. This will apply
-// // to most of the cases
-// while ((loadPrevious && firstTime < startTime) || (!loadPrevious && firstTime + length < startTime)) {
-// firstTime += period;
-// }
-// }
-// }
-//
-// // Bad or no period
-// if (period <= 0) {
-// // Single instance case
-// if (firstTime >= startTime && firstTime < endTime) {
-// writeScheduleData(output, schedule, firstTime, length, startTime, endTime);
-// }
-// }
-// else {
-// // Repetitive schedule, firstTime is assumed to be after startTime
-// while (firstTime < endTime) {
-// writeScheduleData(output, schedule, firstTime, length, startTime, endTime);
-// firstTime += period;
-// }
-// }
}
}
@@ -518,11 +462,7 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
ret.put("error", e.getMessage());
}
SlaOptions slaOptions = null;
- // if(sched != null) {
- // if(sched.getSlaOptions() != null) {
- // slaOptions = sched.getSlaOptions();
- // }
- // }
+
Schedule schedule = scheduleManager.scheduleFlow(-1, projectId, projectName, flowName, "ready", firstSchedTime.getMillis(), firstSchedTime.getZone(), thePeriod, DateTime.now().getMillis(), firstSchedTime.getMillis(), firstSchedTime.getMillis(), user.getUserId(), flowOptions, slaOptions);
logger.info("User '" + user.getUserId() + "' has scheduled " + "[" + projectName + flowName + " (" + projectId +")" + "].");
projectManager.postProjectEvent(project, EventType.SCHEDULE, user.getUserId(), "Schedule " + schedule.toString() + " has been added.");
