Updated Branches: refs/heads/master 292566356 -> b66a2dc72
OOZIE-1660 DB connection misconfig causes all or most unit tests to fail (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b66a2dc7 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b66a2dc7 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b66a2dc7 Branch: refs/heads/master Commit: b66a2dc7237e15d106962405f1fc1aa615d57cb6 Parents: 2925663 Author: Robert Kanter <[email protected]> Authored: Fri Jan 3 11:12:51 2014 -0800 Committer: Robert Kanter <[email protected]> Committed: Fri Jan 3 11:12:51 2014 -0800 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/service/JPAService.java | 2 +- core/src/test/java/org/apache/oozie/test/XTestCase.java | 2 ++ release-log.txt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b66a2dc7/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 4d6d13a..aba8709 100644 --- a/core/src/main/java/org/apache/oozie/service/JPAService.java +++ b/core/src/main/java/org/apache/oozie/service/JPAService.java @@ -112,7 +112,7 @@ public class JPAService implements Service, Instrumentable { String maxConn = conf.get(CONF_MAX_ACTIVE_CONN, "10").trim(); String dataSource = conf.get(CONF_CONN_DATA_SOURCE, "org.apache.commons.dbcp.BasicDataSource"); String connPropsConfig = conf.get(CONF_CONN_PROPERTIES); - boolean autoSchemaCreation = conf.getBoolean(CONF_CREATE_DB_SCHEMA, true); + boolean autoSchemaCreation = conf.getBoolean(CONF_CREATE_DB_SCHEMA, false); boolean validateDbConn = conf.getBoolean(CONF_VALIDATE_DB_CONN, true); String evictionInterval = conf.get(CONF_VALIDATE_DB_CONN_EVICTION_INTERVAL, "300000").trim(); String evictionNum = conf.get(CONF_VALIDATE_DB_CONN_EVICTION_NUM, "10").trim(); http://git-wip-us.apache.org/repos/asf/oozie/blob/b66a2dc7/core/src/test/java/org/apache/oozie/test/XTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java index a6ec626..1536927 100644 --- a/core/src/test/java/org/apache/oozie/test/XTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java @@ -353,6 +353,8 @@ public abstract class XTestCase extends TestCase { // Disable sharelib service as it cannot find the sharelib jars // as maven has target/classes in classpath and not the jar because test phase is before package phase oozieSiteConf.set(Services.CONF_SERVICE_CLASSES, classes.replaceAll("org.apache.oozie.service.ShareLibService,","")); + // Make sure to create the Oozie DB during unit tests + oozieSiteConf.set(JPAService.CONF_CREATE_DB_SCHEMA, "true"); File target = new File(testCaseConfDir, "oozie-site.xml"); oozieSiteConf.writeXml(new FileOutputStream(target)); http://git-wip-us.apache.org/repos/asf/oozie/blob/b66a2dc7/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7f4613f..ed25a07 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1660 DB connection misconfig causes all or most unit tests to fail (rkanter) OOZIE-1641 Oozie should mask the signature secret in the configuration output (rkanter) OOZIE-1655 Change oozie.service.JPAService.validate.db.connection to true (rkanter) OOZIE-1643 Oozie doesn't parse Hadoop Job Id from the Hive action (rkanter)
