Author: kamrul
Date: Thu Mar 29 19:37:53 2012
New Revision: 1307074
URL: http://svn.apache.org/viewvc?rev=1307074&view=rev
Log:
OOZIE-790 default concurrency value is inconsistent between doc and
implementation.(Mohammad)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
incubator/oozie/trunk/core/src/main/resources/oozie-default.xml
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1307074&r1=1307073&r2=1307074&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
Thu Mar 29 19:37:53 2012
@@ -609,7 +609,7 @@ public class CoordSubmitXCommand extends
val = resolveTagContents("concurrency", eAppXml.getChild("controls",
eAppXml.getNamespace()), evalNofuncs);
if (val == null || val.isEmpty()) {
- val = Services.get().getConf().get(CONF_DEFAULT_CONCURRENCY, "-1");
+ val = Services.get().getConf().get(CONF_DEFAULT_CONCURRENCY, "1");
}
ival = ParamChecker.checkInteger(val, "concurrency");
coordJob.setConcurrency(ival);
Modified: incubator/oozie/trunk/core/src/main/resources/oozie-default.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/resources/oozie-default.xml?rev=1307074&r1=1307073&r2=1307074&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/resources/oozie-default.xml (original)
+++ incubator/oozie/trunk/core/src/main/resources/oozie-default.xml Thu Mar 29
19:37:53 2012
@@ -370,9 +370,9 @@
<property>
<name>oozie.service.coord.default.concurrency
</name>
- <value>-1</value>
- <description>Default concurrency for a coordinator job to
determine how many maximum action should
- be executed at the same time.</description>
+ <value>1</value>
+ <description>Default concurrency for a coordinator job to
determine how many maximum action should
+ be executed at the same time. -1 means infinite
concurrency.</description>
</property>
<property>
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java?rev=1307074&r1=1307073&r2=1307074&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
Thu Mar 29 19:37:53 2012
@@ -65,7 +65,7 @@ public class TestCoordSubmitXCommand ext
Configuration conf = new XConfiguration();
String appPath = getTestCaseDir() + File.separator + "coordinator.xml";
String appXml = "<coordinator-app name=\"NAME\"
frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"
end=\"2009-02-03T23:59Z\" timezone=\"UTC\" "
- + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls>
<concurrency>2</concurrency> "
+ + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> "
+ "<execution>LIFO</execution> </controls> <datasets> "
+ "<dataset name=\"a\" frequency=\"${coord:days(7)}\"
initial-instance=\"2009-02-01T01:00Z\" "
+ "timezone=\"UTC\">
<uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template>
</dataset> "
@@ -90,6 +90,8 @@ public class TestCoordSubmitXCommand ext
if (job != null) {
assertEquals(job.getTimeout(), Services.get().getConf().getInt(
"oozie.service.coord.normal.default.timeout", -2));
+ assertEquals(job.getConcurrency(), Services.get().getConf().getInt(
+ "oozie.service.coord.default.concurrency", 1));
}
}
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1307074&r1=1307073&r2=1307074&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Thu Mar 29 19:37:53 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-790 default concurrency value is inconsistent between doc and
implementation.(Mohammad)
OOZIE-793 remove HiveMain check for HADOOP_HOME (tucu)
OOZIE-792 add default action configs per cluster (tucu)
OOZIE-624 client side improvement of authentication for user defined options
