You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2016/08/03 18:06:41 UTC
oozie git commit: OOZIE-2574 Oozie to support replication-enabled
mysql urls (abhishekbafna via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 61a061c70 -> 630868bc6
OOZIE-2574 Oozie to support replication-enabled mysql urls (abhishekbafna via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/630868bc
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/630868bc
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/630868bc
Branch: refs/heads/master
Commit: 630868bc6b5b53718a34e6e1eaa2f815146d16c9
Parents: 61a061c
Author: Robert Kanter <rk...@cloudera.com>
Authored: Wed Aug 3 11:05:28 2016 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Wed Aug 3 11:06:24 2016 -0700
----------------------------------------------------------------------
core/src/main/java/org/apache/oozie/service/JPAService.java | 6 ++++++
release-log.txt | 1 +
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/630868bc/core/src/main/java/org/apache/oozie/service/JPAService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/service/JPAService.java b/core/src/main/java/org/apache/oozie/service/JPAService.java
index fd3f6cb..028381d 100644
--- a/core/src/main/java/org/apache/oozie/service/JPAService.java
+++ b/core/src/main/java/org/apache/oozie/service/JPAService.java
@@ -174,6 +174,12 @@ public class JPAService implements Service, Instrumentable {
throw new ServiceException(ErrorCode.E0609, dbType, ormFile);
}
+ // support for mysql replication urls "jdbc:mysql:replication://master:port,slave:port[,slave:port]/db"
+ if (url.startsWith("jdbc:mysql:replication")) {
+ url = "\"".concat(url).concat("\"");
+ LOG.info("A jdbc replication url is provided. Url: [{0}]", url);
+ }
+
String connProps = "DriverClassName={0},Url={1},Username={2},Password={3},MaxActive={4}";
connProps = MessageFormat.format(connProps, driver, url, user, password, maxConn);
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/oozie/blob/630868bc/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 94f37d8..62feaa6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2574 Oozie to support replication-enabled mysql urls (abhishekbafna via rkanter)
OOZIE-2433 oozie restart required if oozie metrics to graphing tool broken (nperiwal via jaydeepvishwakarma)
OOZIE-2244 Oozie should mask passwords in the logs when logging command arguments (venkatnrangan via jaydeepvishwakarma)
OOZIE-2516 Update web service documentation for jobs API (abhishekbafna via rkanter)