Author: mona
Date: Thu Aug 22 23:14:13 2013
New Revision: 1516659
URL: http://svn.apache.org/r1516659
Log:
OOZIE-1502 Coordinator Job not going to Failed if a bad HCat-uri is specified
(mona)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java?rev=1516659&r1=1516658&r2=1516659&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
Thu Aug 22 23:14:13 2013
@@ -42,6 +42,7 @@ import org.apache.oozie.coord.TimeUnit;
import org.apache.oozie.executor.jpa.BulkUpdateInsertJPAExecutor;
import org.apache.oozie.executor.jpa.CoordActionsActiveCountJPAExecutor;
import org.apache.oozie.executor.jpa.CoordJobGetJPAExecutor;
+import org.apache.oozie.executor.jpa.CoordJobUpdateJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
import org.apache.oozie.service.EventHandlerService;
import org.apache.oozie.service.JPAService;
@@ -273,8 +274,15 @@ public class CoordMaterializeTransitionX
insertList.clear();
}
catch (Exception e) {
- LOG.error("Exception thrown :", e);
- throw new CommandException(ErrorCode.E1001, e.getMessage(), e);
+ LOG.error("Exception occurred:" + e.getMessage() + " Making the
job failed ", e);
+ coordJob.setStatus(Job.Status.FAILED);
+ try {
+ jpaService.execute(new CoordJobUpdateJPAExecutor(coordJob));
+ }
+ catch (JPAExecutorException jex) {
+ throw new CommandException(ErrorCode.E1011, jex);
+ }
+ throw new CommandException(ErrorCode.E1012, e.getMessage(), e);
}
cron.stop();
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java?rev=1516659&r1=1516658&r2=1516659&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
Thu Aug 22 23:14:13 2013
@@ -98,7 +98,9 @@ public class TestCoordMaterializeTransit
}
catch (CommandException e) {
e.printStackTrace();
- assertEquals(ErrorCode.E1001, e.getErrorCode());
+ job = services.get(JPAService.class).execute(new
CoordJobGetJPAExecutor(job.getId()));
+ assertEquals(CoordinatorJob.Status.FAILED, job.getStatus());
+ assertEquals(ErrorCode.E1012, e.getErrorCode());
}
catch (Exception e) {
fail("Unexpected exception " + e.getMessage());
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1516659&r1=1516658&r2=1516659&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Aug 22 23:14:13 2013
@@ -16,6 +16,7 @@ OOZIE-1440 Build fails in certain enviro
-- Oozie 4.0.0 release
+OOZIE-1502 Coordinator Job not going to Failed if a bad HCat-uri is specified
(mona)
OOZIE-1501 Mapreduce action counters are picked up from launcher job instead
of mapreduce job (rohini)
OOZIE-1405 Fix flakey SLA tests (mona)
OOZIE-1480 Web-console Workflow Job Info popup should display parent-id field
and no empty Nominal time field (mona)
