Author: kamrul
Date: Mon Apr 2 21:34:46 2012
New Revision: 1308584
URL: http://svn.apache.org/viewvc?rev=1308584&view=rev
Log:
OZIE-794: oozie job -info -filter should error out on bundle job and workflow
job (virag via Mohammad)
Modified:
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/java/org/apache/oozie/cli/OozieCLI.java?rev=1308584&r1=1308583&r2=1308584&view=diff
==============================================================================
---
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
(original)
+++
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
Mon Apr 2 21:34:46 2012
@@ -618,6 +618,7 @@ public class OozieCLI {
}
protected void setDebugMode(OozieClient wc) {
+
String debug = System.getenv(ENV_OOZIE_DEBUG);
if (debug != null && !debug.isEmpty()) {
int debugVal = 0;
@@ -751,6 +752,10 @@ public class OozieCLI {
}
else if (options.contains(INFO_OPTION)) {
if (commandLine.getOptionValue(INFO_OPTION).endsWith("-B")) {
+ String filter = commandLine.getOptionValue(FILTER_OPTION);
+ if (filter != null) {
+ throw new OozieCLIException("Filter option is
currently not supported for a Bundle job");
+ }
printBundleJob(wc.getBundleJobInfo(commandLine.getOptionValue(INFO_OPTION)),
options
.contains(LOCAL_TIME_OPTION),
options.contains(VERBOSE_OPTION));
}
@@ -764,14 +769,26 @@ public class OozieCLI {
.contains(LOCAL_TIME_OPTION),
options.contains(VERBOSE_OPTION));
}
else if
(commandLine.getOptionValue(INFO_OPTION).contains("-C@")) {
+ String filter = commandLine.getOptionValue(FILTER_OPTION);
+ if (filter != null) {
+ throw new OozieCLIException("Filter option is not
supported for a Coordinator action");
+ }
printCoordAction(wc.getCoordActionInfo(commandLine.getOptionValue(INFO_OPTION)),
options
.contains(LOCAL_TIME_OPTION));
}
else if
(commandLine.getOptionValue(INFO_OPTION).contains("-W@")) {
+ String filter = commandLine.getOptionValue(FILTER_OPTION);
+ if (filter != null) {
+ throw new OozieCLIException("Filter option is not
supported for a Workflow action");
+ }
printWorkflowAction(wc.getWorkflowActionInfo(commandLine.getOptionValue(INFO_OPTION)),
options.contains(LOCAL_TIME_OPTION),
options.contains(VERBOSE_OPTION));
}
else {
+ String filter = commandLine.getOptionValue(FILTER_OPTION);
+ if (filter != null) {
+ throw new OozieCLIException("Filter option is
currently not supported for a Workflow job");
+ }
String s = commandLine.getOptionValue(OFFSET_OPTION);
int start = Integer.parseInt((s != null) ? s : "0");
s = commandLine.getOptionValue(LEN_OPTION);
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1308584&r1=1308583&r2=1308584&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Apr 2 21:34:46 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-794: oozie job -info -filter should error out on bundle job and workflow
job (virag via Mohammad)
OOZIE-799: Testcases failing due to missing action-conf dir. (Virag via
Mohammad)
OOZIE-798 it would be nice to keep action specific configs in action-conf
instead of hadoop-conf (rvs via tucu)
OOZIE-790 default concurrency value is inconsistent between doc and
implementation.(Mohammad)
