azkaban-uncached
Details
diff --git a/src/java/azkaban/executor/ExecutionOptions.java b/src/java/azkaban/executor/ExecutionOptions.java
index 25b9575..83d982c 100644
--- a/src/java/azkaban/executor/ExecutionOptions.java
+++ b/src/java/azkaban/executor/ExecutionOptions.java
@@ -171,9 +171,13 @@ public class ExecutionOptions {
options.queueLevel = (Integer)optionsMap.get("queueLevel");
// Success emails
- options.setSuccessEmails((List<String>)optionsMap.get("successEmails"));
+ if (optionsMap.containsKey("successEmails")) {
+ options.setSuccessEmails((List<String>)optionsMap.get("successEmails"));
+ }
// Failure emails
- options.setFailureEmails((List<String>)optionsMap.get("failureEmails"));
+ if (optionsMap.containsKey("failureEmails")) {
+ options.setFailureEmails((List<String>)optionsMap.get("failureEmails"));
+ }
return options;
}
diff --git a/src/java/azkaban/executor/ExecutorManager.java b/src/java/azkaban/executor/ExecutorManager.java
index bff70c2..84781a4 100644
--- a/src/java/azkaban/executor/ExecutorManager.java
+++ b/src/java/azkaban/executor/ExecutorManager.java
@@ -101,6 +101,10 @@ public class ExecutorManager {
return lastThreadCheckTime;
}
+ public long getLastCleanerThreadCheckTime() {
+ return this.lastCleanerThreadCheckTime;
+ }
+
private void loadRunningFlows() throws ExecutorManagerException {
runningFlows.putAll(executorLoader.fetchActiveFlows());
}
diff --git a/src/java/azkaban/jobtype/JobTypeManager.java b/src/java/azkaban/jobtype/JobTypeManager.java
index 6464ca7..a6db77d 100644
--- a/src/java/azkaban/jobtype/JobTypeManager.java
+++ b/src/java/azkaban/jobtype/JobTypeManager.java
@@ -247,6 +247,7 @@ public class JobTypeManager
Props fakeSysProps = new Props(sysConf);
fakeSysProps.put("type", jobtypeName);
Props fakeJobProps = new Props(conf);
+ @SuppressWarnings("unused")
Job job = (Job)Utils.callConstructor(clazz, "dummy", fakeSysProps, fakeJobProps, logger);
}
catch (Exception e) {
src/sql/update_2.0_to_2.01.sql 4(+3 -1)
diff --git a/src/sql/update_2.0_to_2.01.sql b/src/sql/update_2.0_to_2.01.sql
index aaa2c6d..bb39cb4 100644
--- a/src/sql/update_2.0_to_2.01.sql
+++ b/src/sql/update_2.0_to_2.01.sql
@@ -7,7 +7,9 @@ ALTER TABLE execution_jobs ADD PRIMARY KEY(exec_id, job_id, attempt);
ALTER TABLE execution_jobs ADD INDEX exec_job (exec_id, job_id);
ALTER TABLE execution_logs ADD COLUMN attempt INT DEFAULT 0;
-ALTER TABLE execution_logs ADD COLUMN upload_time BIGINT DEFAULT 1364801450000;
+ALTER TABLE execution_logs ADD COLUMN upload_time BIGINT DEFAULT 1420099200000;
+UPDATE execution_logs SET upload_time=(UNIX_TIMESTAMP()*1000) WHERE upload_time=1420099200000;
+
ALTER TABLE execution_logs DROP PRIMARY KEY;
ALTER TABLE execution_logs ADD PRIMARY KEY(exec_id, name, attempt, start_byte);
ALTER TABLE execution_logs ADD INDEX log_attempt (exec_id, name, attempt)
src/web/css/azkaban.css 5(+5 -0)
diff --git a/src/web/css/azkaban.css b/src/web/css/azkaban.css
index 9a335f3..390d64f 100644
--- a/src/web/css/azkaban.css
+++ b/src/web/css/azkaban.css
@@ -2900,6 +2900,11 @@ div.menuContent {
left: -50%;
}
+#schedule-panel p {
+ margin: 10px 30px;
+ font-size: 11pt;
+}
+
#schedule-panel-top {
width: 450px;
margin-top: 250px;