Repository: oozie
Updated Branches:
refs/heads/branch-4.3 7ccd12254 -> 5a75844f4
Revert "OOZIE-2525 SchemaChecker fails with NPE (rkanter)"
This reverts commit 5759397a939375d235fa75165ff26bd6fcca8f75.
Conflicts:
release-log.txt
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/671142f9
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/671142f9
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/671142f9
Branch: refs/heads/branch-4.3
Commit: 671142f919877d5640351d4ee546157d1075a15d
Parents: 7ccd122
Author: Robert Kanter <rkan...@cloudera.com>
Authored: Tue Oct 4 12:24:48 2016 -0700
Committer: Robert Kanter <rkan...@cloudera.com>
Committed: Tue Oct 4 12:24:48 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/oozie/service/SchemaCheckerService.java | 8 ++++----
release-log.txt | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/671142f9/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java
----------------------------------------------------------------------
diff --git
a/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java
b/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java
index 1101f99..7fda9e2 100644
--- a/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java
+++ b/core/src/main/java/org/apache/oozie/service/SchemaCheckerService.java
@@ -45,7 +45,7 @@ public class SchemaCheckerService implements Service,
Instrumentable {
int interval = ConfigurationService.getInt(CONF_INTERVAL);
if (dbType.equals("derby") || dbType.equals("hsqldb") ||
dbType.equals("sqlserver") || interval <= 0) {
LOG.debug("SchemaCheckerService is disabled: not supported for
{0}", dbType);
- status = "DISABLED (" + dbType + " not supported)";
+ status = "DISABLED (" + dbType + " no supported)";
} else {
String driver = ConfigurationService.get(JPAService.CONF_DRIVER);
String user = ConfigurationService.get(JPAService.CONF_USERNAME);
@@ -96,7 +96,7 @@ public class SchemaCheckerService implements Service,
Instrumentable {
lastCheck = time.toString();
}
- private class SchemaCheckerRunnable implements Runnable {
+ static class SchemaCheckerRunnable implements Runnable {
private String dbType;
private String url;
private String user;
@@ -117,8 +117,8 @@ public class SchemaCheckerService implements Service,
Instrumentable {
Services.get().get(CallableQueueService.class).queue(
new SchemaCheckXCommand(dbType, url, user, pass,
ignoreExtras));
} else {
- status = "DISABLED (not leader in HA)";
- lastCheck = "N/A";
+ Services.get().get(SchemaCheckerService.class).status =
"DISABLED (not leader in HA)";
+ Services.get().get(SchemaCheckerService.class).lastCheck =
"N/A";
}
}
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/671142f9/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 21eb6a4..35cce80 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -17,7 +17,6 @@ OOZIE-2273 MiniOozie does not work outside of Oozie (rkanter)
OOZIE-2667 Optimize queries for DB export (gezapeti via rkanter)
OOZIE-1793 Improve find bugs reporting for Oozie (rkanter)
OOZIE-2572 SLA DURATION miss not shown when job is running for longer than
expected time (satishsaley via puru)
-OOZIE-2525 SchemaChecker fails with NPE (rkanter)
OOZIE-2672 SLA periodic update does not remove job from map if job is removed
from database (satishsaley via puru)
OOZIE-2498 Oozie CallerId configuration for downstream components
(abhishekbafna via rohini)
OOZIE-2491 oozie acl cannot specify group,it does`t work (abhishekbafna via
rohini)
