Author: rohini
Date: Tue Nov 26 18:35:28 2013
New Revision: 1545770
URL: http://svn.apache.org/r1545770
Log:
OOZIE-1627 Rerun doesn't resolve workflow app name (puru via rohini)
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
oozie/branches/branch-4.0/core/src/test/resources/rerun-el-wf.xml
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java?rev=1545770&r1=1545769&r2=1545770&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
Tue Nov 26 18:35:28 2013
@@ -163,7 +163,7 @@ public class ReRunXCommand extends Workf
catch (WorkflowException e) {
throw new CommandException(e);
}
-
+ String appName = ELUtils.resolveAppName(app.getName(), conf);
if (SLAService.isEnabled()) {
Element wfElem = XmlUtils.parseXml(app.getDefinition());
ELEvaluator evalSla =
SubmitXCommand.createELEvaluatorForGroup(conf, "wf-sla-submit");
@@ -172,12 +172,11 @@ public class ReRunXCommand extends Workf
if (eSla != null) {
jobSlaXml = SubmitXCommand.resolveSla(eSla, evalSla);
}
- String appName = ELUtils.resolveAppName(app.getName(), conf);
writeSLARegistration(wfElem, jobSlaXml, newWfInstance.getId(),
conf.get(SubWorkflowActionExecutor.PARENT_ID),
conf.get(OozieClient.USER_NAME), appName,
evalSla);
}
- wfBean.setAppName(app.getName());
+ wfBean.setAppName(appName);
wfBean.setProtoActionConf(protoActionConf.toXmlString());
}
catch (WorkflowException ex) {
Modified:
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java?rev=1545770&r1=1545769&r2=1545770&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
Tue Nov 26 18:35:28 2013
@@ -216,6 +216,8 @@ public class TestReRunXCommand extends X
sleep(5000);
conf.setProperty(OozieClient.RERUN_SKIP_NODES, "hdfs11");
+ conf.setProperty("WF_NAME", "wf_test");
+ conf.setProperty("FEED_NAME", "feed_test");
wfClient.reRun(jobId1, conf);
waitFor(15 * 1000, new Predicate() {
public boolean evaluate() throws Exception {
@@ -223,5 +225,6 @@ public class TestReRunXCommand extends X
}
});
assertEquals(WorkflowJob.Status.SUCCEEDED,
wfClient.getJobInfo(jobId1).getStatus());
+ assertEquals("wf_test-feed_test",
wfClient.getJobInfo(jobId1).getAppName());
}
}
Modified: oozie/branches/branch-4.0/core/src/test/resources/rerun-el-wf.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/test/resources/rerun-el-wf.xml?rev=1545770&r1=1545769&r2=1545770&view=diff
==============================================================================
--- oozie/branches/branch-4.0/core/src/test/resources/rerun-el-wf.xml (original)
+++ oozie/branches/branch-4.0/core/src/test/resources/rerun-el-wf.xml Tue Nov
26 18:35:28 2013
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<workflow-app xmlns="uri:oozie:workflow:0.1" name="recovery-el-wf">
+<workflow-app xmlns="uri:oozie:workflow:0.1" name="${WF_NAME}-${FEED_NAME}">
<start to="hdfs11"/>
<action name="hdfs11">
<fs>
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1545770&r1=1545769&r2=1545770&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Tue Nov 26 18:35:28 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.1 release (unreleased)
+OOZIE-1627 Rerun doesn't resolve workflow app name (puru via rohini)
OOZIE-1626 pig action pop-up is not working properly in UI (ryota)
OOZIE-1607 [Doc]Update workflow specification for chgrp command (puru via
rohini)
OOZIE-1542 When extjs isn't installed, the web UI is unhelpfully blank
(rkanter)
