Repository: oozie Updated Branches: refs/heads/master c618e56eb -> 67a120ee7
OOZIE-2005 Coordinator rerun fails to initialize error code and message (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/67a120ee Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/67a120ee Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/67a120ee Branch: refs/heads/master Commit: 67a120ee7fab208d0f54b6424a65f0cacea32320 Parents: c618e56 Author: egashira <[email protected]> Authored: Wed Oct 15 10:52:00 2014 -0700 Committer: egashira <[email protected]> Committed: Wed Oct 15 10:52:00 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/oozie/CoordinatorActionBean.java | 2 +- .../org/apache/oozie/command/coord/CoordRerunXCommand.java | 2 ++ .../apache/oozie/executor/jpa/CoordActionQueryExecutor.java | 2 ++ .../main/java/org/apache/oozie/store/CoordinatorStore.java | 4 ++-- .../apache/oozie/command/coord/TestCoordRerunXCommand.java | 7 +++++++ release-log.txt | 1 + 6 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/67a120ee/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java b/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java index c5a6ca8..759e643 100644 --- a/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java +++ b/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java @@ -75,7 +75,7 @@ import org.json.simple.JSONObject; @NamedQuery(name = "UPDATE_COORD_ACTION_FOR_MODIFIED_DATE", query = "update CoordinatorActionBean w set w.lastModifiedTimestamp = :lastModifiedTime where w.id = :id"), - @NamedQuery(name = "UPDATE_COORD_ACTION_RERUN", query = "update CoordinatorActionBean w set w.actionXml =:actionXml, w.statusStr = :status, w.externalId = :externalId, w.externalStatus = :externalStatus, w.rerunTimestamp = :rerunTime, w.lastModifiedTimestamp = :lastModifiedTime, w.createdTimestamp = :createdTime, w.createdConf = :createdConf, w.runConf = :runConf, w.missingDependencies = :missingDependencies, w.pushMissingDependencies = :pushMissingDependencies where w.id = :id"), + @NamedQuery(name = "UPDATE_COORD_ACTION_RERUN", query = "update CoordinatorActionBean w set w.actionXml =:actionXml, w.statusStr = :status, w.externalId = :externalId, w.externalStatus = :externalStatus, w.rerunTimestamp = :rerunTime, w.lastModifiedTimestamp = :lastModifiedTime, w.createdTimestamp = :createdTime, w.createdConf = :createdConf, w.runConf = :runConf, w.missingDependencies = :missingDependencies, w.pushMissingDependencies = :pushMissingDependencies, w.errorCode = :errorCode, w.errorMessage = :errorMessage where w.id = :id"), @NamedQuery(name = "DELETE_COMPLETED_ACTIONS_FOR_COORDINATOR", query = "delete from CoordinatorActionBean a where a.jobId = :jobId and (a.statusStr = 'SUCCEEDED' OR a.statusStr = 'FAILED' OR a.statusStr= 'KILLED')"), http://git-wip-us.apache.org/repos/asf/oozie/blob/67a120ee/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java index e70343b..098eb4b 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java @@ -202,6 +202,8 @@ public class CoordRerunXCommand extends RerunTransitionXCommand<CoordinatorActio coordAction.setExternalStatus(null); coordAction.setRerunTime(new Date()); coordAction.setLastModifiedTime(new Date()); + coordAction.setErrorCode(""); + coordAction.setErrorMessage(""); updateList.add(new UpdateEntry<CoordActionQuery>(CoordActionQuery.UPDATE_COORD_ACTION_RERUN, coordAction)); writeActionRegistration(coordAction.getActionXml(), coordAction, coordJob.getUser(), coordJob.getGroup()); } http://git-wip-us.apache.org/repos/asf/oozie/blob/67a120ee/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionQueryExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionQueryExecutor.java index fc81a81..e6ab09b 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionQueryExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionQueryExecutor.java @@ -149,6 +149,8 @@ public class CoordActionQueryExecutor extends query.setParameter("runConf", actionBean.getRunConfBlob()); query.setParameter("missingDependencies", actionBean.getMissingDependenciesBlob()); query.setParameter("pushMissingDependencies", actionBean.getPushMissingDependenciesBlob()); + query.setParameter("errorCode", actionBean.getErrorCode()); + query.setParameter("errorMessage", actionBean.getErrorMessage()); query.setParameter("id", actionBean.getId()); break; http://git-wip-us.apache.org/repos/asf/oozie/blob/67a120ee/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java b/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java index aeb7d38..72d96f1 100644 --- a/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java +++ b/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java @@ -685,8 +685,8 @@ public class CoordinatorStore extends Store { action.setActionXmlBlob(a.getActionXmlBlob()); action.setConsoleUrl(a.getConsoleUrl()); action.setCreatedConfBlob(a.getCreatedConfBlob()); - // action.setErrorCode(a.getErrorCode()); - // action.setErrorMessage(a.getErrorMessage()); + action.setErrorCode(a.getErrorCode()); + action.setErrorMessage(a.getErrorMessage()); action.setExternalStatus(a.getExternalStatus()); action.setMissingDependenciesBlob(a.getMissingDependenciesBlob()); action.setRunConfBlob(a.getRunConfBlob()); http://git-wip-us.apache.org/repos/asf/oozie/blob/67a120ee/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java index 378042c..65338a3 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java @@ -857,6 +857,8 @@ public class TestCoordRerunXCommand extends XDataTestCase { CoordinatorStore store2 = Services.get().get(StoreService.class).getStore(CoordinatorStore.class); CoordinatorActionBean action2 = store2.getCoordinatorAction(actionId, false); assertEquals(action2.getStatus(), CoordinatorAction.Status.WAITING); + assertEquals(action2.getErrorCode(), ""); + assertEquals(action2.getErrorMessage(), ""); } /** @@ -1105,6 +1107,11 @@ public class TestCoordRerunXCommand extends XDataTestCase { action.setCreatedConf(createdConf); + if (status.equals(CoordinatorAction.Status.FAILED)) { + action.setErrorCode("E1000"); + action.setErrorMessage("Error"); + } + try { store.insertCoordinatorAction(action); } http://git-wip-us.apache.org/repos/asf/oozie/blob/67a120ee/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 79bded0..9e8e9bf 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2005 Coordinator rerun fails to initialize error code and message (ryota) OOZIE-1896 ZKUUIDService - Too many job submission fails (puru) OOZIE-2019 SLA miss processed on server2 not send email (puru) OOZIE-1391 Sub wf suspend doesn't update parent wf (jaydeepvishwakarma via shwethags)
