Author: angeloh
Date: Fri Jan 6 21:58:35 2012
New Revision: 1228454
URL: http://svn.apache.org/viewvc?rev=1228454&view=rev
Log:
OOZIE-585 Coordinator job fail to retrieve log with date range and action
range. (Prakhar via Mohammad)
Modified:
incubator/oozie/branches/3.1/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
incubator/oozie/branches/3.1/release-log.txt
Modified:
incubator/oozie/branches/3.1/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/3.1/core/src/main/java/org/apache/oozie/CoordinatorEngine.java?rev=1228454&r1=1228453&r2=1228454&view=diff
==============================================================================
---
incubator/oozie/branches/3.1/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
(original)
+++
incubator/oozie/branches/3.1/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
Fri Jan 6 21:58:35 2012
@@ -358,17 +358,20 @@ public class CoordinatorEngine extends B
}
Iterator<String> actionsIterator = actions.iterator();
- StringBuilder commaSeparatedActions = new StringBuilder("");
- int commaRequired = 0;
-
+ StringBuilder orSeparatedActions = new StringBuilder("");
+ boolean orRequired = false;
while (actionsIterator.hasNext()) {
- if (commaRequired == 1) {
- commaSeparatedActions.append(",");
+ if (orRequired) {
+ orSeparatedActions.append("|");
}
-
commaSeparatedActions.append(actionsIterator.next().toString());
- commaRequired = 1;
+
orSeparatedActions.append(actionsIterator.next().toString());
+ orRequired = true;
+ }
+ if (actions.size() > 1 && orRequired) {
+ orSeparatedActions.insert(0, "(");
+ orSeparatedActions.append(")");
}
- filter.setParameter(DagXLogInfoService.ACTION,
commaSeparatedActions.toString());
+ filter.setParameter(DagXLogInfoService.ACTION,
orSeparatedActions.toString());
}
// if coordinator action logs are to be retrieved based on date
range
// this block gets the corresponding list of coordinator actions
to be used by the log filter
@@ -380,24 +383,24 @@ public class CoordinatorEngine extends B
catch (XException xe) {
throw new CommandException(ErrorCode.E0302, "Error in date
range for coordinator actions", xe);
}
- StringBuilder commaSeparatedActions = new StringBuilder("");
- boolean commaRequired = false;
+ StringBuilder orSeparatedActions = new StringBuilder("");
+ boolean orRequired = false;
for (CoordinatorActionBean coordAction : actionsList) {
- if (commaRequired) {
- commaSeparatedActions.append(",");
+ if (orRequired) {
+ orSeparatedActions.append("|");
}
- commaSeparatedActions.append(coordAction.getId());
- commaRequired = true;
+ orSeparatedActions.append(coordAction.getId());
+ orRequired = true;
}
- filter.setParameter(DagXLogInfoService.ACTION,
commaSeparatedActions.toString());
+ if (actionsList.size() > 1 && orRequired) {
+ orSeparatedActions.insert(0, "(");
+ orSeparatedActions.append(")");
+ }
+ filter.setParameter(DagXLogInfoService.ACTION,
orSeparatedActions.toString());
}
- CoordinatorJobBean job = getCoordJobWithNoActionInfo(jobId);
- Services.get().get(XLogService.class).streamLog(filter,
job.getCreatedTime(), new Date(), writer);
- }
- else {
- CoordinatorJobBean job = getCoordJobWithNoActionInfo(jobId);
- Services.get().get(XLogService.class).streamLog(filter,
job.getCreatedTime(), new Date(), writer);
}
+ CoordinatorJobBean job = getCoordJobWithNoActionInfo(jobId);
+ Services.get().get(XLogService.class).streamLog(filter,
job.getCreatedTime(), new Date(), writer);
}
/*
Modified: incubator/oozie/branches/3.1/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/3.1/release-log.txt?rev=1228454&r1=1228453&r2=1228454&view=diff
==============================================================================
--- incubator/oozie/branches/3.1/release-log.txt (original)
+++ incubator/oozie/branches/3.1/release-log.txt Fri Jan 6 21:58:35 2012
@@ -1,5 +1,6 @@
-- Oozie 3.1.1 release
+OOZIE-585 Coordinator job fail to retrieve log with date range and action
range.
OOZIE-553 Ability to view log for coordinator actions that ran in a date range.
OOZIE-581 Fix unit test failure in TestStatusTransitService.java.
OOZIE-579 POM file changes for oozie version 3.1.2.
