You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2013/01/07 23:10:46 UTC
svn commit: r1430055 [1/3] - in /oozie/branches/hcat-intre: ./
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/action/hadoop/
core/src/main/java/org/apache/oozie/command/
core/src/main/java/org/apache/oozie/command/bundle/ core...
Author: mona
Date: Mon Jan 7 22:10:44 2013
New Revision: 1430055
URL: http://svn.apache.org/viewvc?rev=1430055&view=rev
Log:
sync trunk patches with hcat-intre branch
Modified:
oozie/branches/hcat-intre/README.txt
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/BundleEngine.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/DagEngine.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/ErrorCode.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/Command.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/XCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/CompletedActionXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/DefinitionXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkDeleteForPurgeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateDeleteJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStartJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStatusJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetByLastModifiedTimeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetStatusPendingJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetForPurgeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetNeedStartJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetPausedJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetRunningOrPendingJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetUnpausedJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInputCheckJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForTimeoutJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionRemoveJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionUpdateForInputCheckJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionUpdateJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionUpdateStatusJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsActiveCountJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsGetByLastModifiedTimeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseCountGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsPendingFalseStatusCountGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsRunningGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionByActionNumberJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionIdsForDateRangeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsForDatesJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetPendingActionsCountJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobUpdateJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetForPurgeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPausedJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPendingJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetUnpausedJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionUpdateJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsRunningGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobUpdateJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobsGetForPurgeJPAExecutor.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/ActionService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/CallbackService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/Services.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/StoreService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/servlet/ServletUtilities.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/servlet/V0AdminServlet.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/store/SLAStore.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/test/EmbeddedServletContainer.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/ParamChecker.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/test/XTestCase.java
oozie/branches/hcat-intre/distro/pom.xml
oozie/branches/hcat-intre/docs/src/site/twiki/AG_Install.twiki
oozie/branches/hcat-intre/docs/src/site/twiki/DG_HiveActionExtension.twiki
oozie/branches/hcat-intre/docs/src/site/twiki/ENG_Custom_Authentication.twiki
oozie/branches/hcat-intre/examples/src/main/apps/hive/workflow.xml
oozie/branches/hcat-intre/hadooplibs/hadoop-1/pom.xml
oozie/branches/hcat-intre/hadooplibs/hadoop-3/pom.xml
oozie/branches/hcat-intre/hadooplibs/hadoop-distcp-1/pom.xml
oozie/branches/hcat-intre/hadooplibs/hadoop-test-1/pom.xml
oozie/branches/hcat-intre/pom.xml
oozie/branches/hcat-intre/release-log.txt
oozie/branches/hcat-intre/src/main/assemblies/distro.xml
Modified: oozie/branches/hcat-intre/README.txt
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/README.txt?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/README.txt (original)
+++ oozie/branches/hcat-intre/README.txt Mon Jan 7 22:10:44 2013
@@ -39,10 +39,11 @@ Documentations :
Oozie web service is bundle with the built-in details documentation.
More inforamtion could be found at:
-http://incubator.apache.org/oozie/
+http://oozie.apache.org/
Oozie Quick Start:
- http://incubator.apache.org/oozie/QuickStart.html
+http://oozie.apache.org/docs/3.2.0-incubating/DG_QuickStart.html
+
Supported Hadoop Versions:
----------------------------
@@ -53,10 +54,10 @@ This version of Oozie was primarily test
If you have any questions/issues, please send an email to:
-oozie-users@incubator.apache.org
+user@oozie.apache.org
Subscribe using the link:
-http://incubator.apache.org/oozie/MailingLists.html
+http://oozie.apache.org/mail-lists.html
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/BundleEngine.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/BundleEngine.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/BundleEngine.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/BundleEngine.java Mon Jan 7 22:10:44 2013
@@ -107,7 +107,7 @@ public class BundleEngine extends BaseEn
*/
@Override
public CoordinatorJob getCoordJob(String jobId) throws BundleEngineException {
- throw new BundleEngineException(new XException(ErrorCode.E0301));
+ throw new BundleEngineException(new XException(ErrorCode.E0301, "cannot get a coordinator job from BundleEngine"));
}
public BundleJobBean getBundleJob(String jobId) throws BundleEngineException {
@@ -124,7 +124,7 @@ public class BundleEngine extends BaseEn
*/
@Override
public CoordinatorJob getCoordJob(String jobId, String filter, int start, int length) throws BundleEngineException {
- throw new BundleEngineException(new XException(ErrorCode.E0301));
+ throw new BundleEngineException(new XException(ErrorCode.E0301, "cannot get a coordinator job from BundleEngine"));
}
/* (non-Javadoc)
@@ -147,7 +147,7 @@ public class BundleEngine extends BaseEn
*/
@Override
public WorkflowJob getJob(String jobId) throws BundleEngineException {
- throw new BundleEngineException(new XException(ErrorCode.E0301));
+ throw new BundleEngineException(new XException(ErrorCode.E0301, "cannot get a workflow job from BundleEngine"));
}
/* (non-Javadoc)
@@ -155,7 +155,7 @@ public class BundleEngine extends BaseEn
*/
@Override
public WorkflowJob getJob(String jobId, int start, int length) throws BundleEngineException {
- throw new BundleEngineException(new XException(ErrorCode.E0301));
+ throw new BundleEngineException(new XException(ErrorCode.E0301, "cannot get a workflow job from BundleEngine"));
}
/* (non-Javadoc)
@@ -185,7 +185,7 @@ public class BundleEngine extends BaseEn
@Override
@Deprecated
public void reRun(String jobId, Configuration conf) throws BundleEngineException {
- throw new BundleEngineException(new XException(ErrorCode.E0301));
+ throw new BundleEngineException(new XException(ErrorCode.E0301, "rerun"));
}
/**
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/CoordinatorEngine.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/CoordinatorEngine.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/CoordinatorEngine.java Mon Jan 7 22:10:44 2013
@@ -193,7 +193,7 @@ public class CoordinatorEngine extends B
@Override
@Deprecated
public void reRun(String jobId, Configuration conf) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "invalid use of rerun"));
}
/**
@@ -235,7 +235,7 @@ public class CoordinatorEngine extends B
@Override
@Deprecated
public void start(String jobId) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "invalid use of start"));
}
/*
@@ -285,14 +285,18 @@ public class CoordinatorEngine extends B
int end;
try {
start = Integer.parseInt(range[0].trim());
+ } catch (NumberFormatException ne) {
+ throw new CommandException(ErrorCode.E0302, "could not parse " + range[0].trim() + "into an integer",
+ ne);
+ }
+ try {
end = Integer.parseInt(range[1].trim());
- if (start > end) {
- throw new CommandException(ErrorCode.E0302, "format is wrong for action's range '" + s
- + "'");
- }
+ } catch (NumberFormatException ne) {
+ throw new CommandException(ErrorCode.E0302, "could not parse " + range[1].trim() + "into an integer",
+ ne);
}
- catch (NumberFormatException ne) {
- throw new CommandException(ErrorCode.E0302, ne);
+ if (start > end) {
+ throw new CommandException(ErrorCode.E0302, "format is wrong for action's range '" + s + "'");
}
for (int i = start; i <= end; i++) {
actions.add(jobId + "@" + i);
@@ -416,7 +420,7 @@ public class CoordinatorEngine extends B
*/
@Override
public WorkflowJob getJob(String jobId) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "cannot get a workflow job from CoordinatorEngine"));
}
/*
@@ -426,7 +430,7 @@ public class CoordinatorEngine extends B
*/
@Override
public WorkflowJob getJob(String jobId, int start, int length) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "cannot get a workflow job from CoordinatorEngine"));
}
private static final Set<String> FILTER_NAMES = new HashSet<String>();
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/DagEngine.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/DagEngine.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/DagEngine.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/DagEngine.java Mon Jan 7 22:10:44 2013
@@ -462,12 +462,12 @@ public class DagEngine extends BaseEngin
@Override
public CoordinatorJob getCoordJob(String jobId) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "cannot get a coordinator job from DagEngine"));
}
@Override
public CoordinatorJob getCoordJob(String jobId, String filter, int start, int length) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "cannot get a coordinator job from DagEngine"));
}
public WorkflowActionBean getWorkflowAction(String actionId) throws BaseEngineException {
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/ErrorCode.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/ErrorCode.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/ErrorCode.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/ErrorCode.java Mon Jan 7 22:10:44 2013
@@ -96,7 +96,7 @@ public enum ErrorCode {
E0600(XLog.OPS, "Could not get connection, {0}"),
E0601(XLog.OPS, "Could not close connection, {0}"),
E0602(XLog.OPS, "Could not commit connection, {0}"),
- E0603(XLog.OPS, "SQL error in operation [{0}], {1}"),
+ E0603(XLog.OPS, "SQL error in operation, {0}"),
E0604(XLog.STD, "Job does not exist [{0}]"),
E0605(XLog.STD, "Action does not exist [{0}]"),
E0606(XLog.STD, "Could not get lock [{0}], timed out [{1}]ms"),
@@ -104,6 +104,7 @@ public enum ErrorCode {
E0608(XLog.OPS, "JDBC setup error [{0}], {1}"),
E0609(XLog.OPS, "Missing [{0}] ORM file [{1}]"),
E0610(XLog.OPS, "Missing JPAService, StoreService cannot run without a JPAService"),
+ E0611(XLog.OPS, "SQL error in operation [{0}], {1}"),
E0700(XLog.STD, "XML error, {0}"),
E0701(XLog.STD, "XML schema error, {0}"),
@@ -178,7 +179,7 @@ public enum ErrorCode {
E1001(XLog.STD, "Could not read the coordinator job definition, {0}"),
E1002(XLog.STD, "Invalid coordinator application URI [{0}], {1}"),
E1003(XLog.STD, "Invalid coordinator application attributes, {0}"),
- E1004(XLog.STD, "Expression language evaluation error [{0}], {1}"),
+ E1004(XLog.STD, "Expression language evaluation error, {0}"),
E1005(XLog.STD, "Could not read the coordinator job configuration read from DB, {0}"),
E1006(XLog.STD, "Invalid coordinator application [{0}], {1}"),
E1007(XLog.STD, "Unable to add record to SLA table. [{0}], {1}"),
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java Mon Jan 7 22:10:44 2013
@@ -19,21 +19,17 @@ package org.apache.oozie.action.hadoop;
import static org.apache.oozie.action.hadoop.LauncherMapper.CONF_OOZIE_ACTION_MAIN_CLASS;
-import java.io.StringReader;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.oozie.action.ActionExecutorException;
import org.apache.oozie.client.WorkflowAction;
-import org.apache.oozie.util.XConfiguration;
-import org.apache.oozie.util.XmlUtils;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.Namespace;
public class HiveActionExecutor extends JavaActionExecutor {
- private static final String OOZIE_HIVE_DEFAULTS = "oozie.hive.defaults";
public HiveActionExecutor() {
super("hive");
@@ -53,30 +49,6 @@ public class HiveActionExecutor extends
return launcherConf.get(CONF_OOZIE_ACTION_MAIN_CLASS, HiveMain.class.getName());
}
- public Configuration setupHiveDefault(Configuration conf, Path appPath, Element actionXml)
- throws ActionExecutorException {
- try {
- //Setting up hive-default.xml file if specified by the Hive action
- Element actionConf = actionXml.getChild("configuration", actionXml.getNamespace());
- if (actionConf != null) {
- String strConf = XmlUtils.prettyPrint(actionConf).toString();
- XConfiguration inlineConf = new XConfiguration(new StringReader(strConf));
- if (inlineConf.get(OOZIE_HIVE_DEFAULTS) != null) {
- Path hiveDefaults = new Path(inlineConf.get(OOZIE_HIVE_DEFAULTS));
- // hive-default.xml will be softlinked to the working dir which is in the launcher CP.
- // the softlink is done as 'oozie-user-hive-default.xml' and Oozie HiveMain class will
- // check if the Hive being used has a hive-default.xml or not, if not it will rename
- // it as hive-default.xml before invoking hive
- addToCache(conf, appPath, hiveDefaults + "#" + HiveMain.USER_HIVE_DEFAULT_FILE, false);
- }
- }
- return conf;
- }
- catch (Exception ex) {
- throw convertException(ex);
- }
- }
-
@Override
protected Configuration setupLauncherConf(Configuration conf, Element actionXml, Path appPath, Context context)
throws ActionExecutorException {
@@ -84,8 +56,6 @@ public class HiveActionExecutor extends
super.setupLauncherConf(conf, actionXml, appPath, context);
Namespace ns = actionXml.getNamespace();
- setupHiveDefault(conf, appPath, actionXml);
-
String script = actionXml.getChild("script", ns).getTextTrim();
String scriptName = new Path(script).getName();
addToCache(conf, appPath, script + "#" + scriptName, false);
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java Mon Jan 7 22:10:44 2013
@@ -18,18 +18,14 @@
package org.apache.oozie.action.hadoop;
import java.io.BufferedReader;
-import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.regex.Pattern;
@@ -39,8 +35,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.cli.CliDriver;
public class HiveMain extends LauncherMain {
- public static final String USER_HIVE_DEFAULT_FILE = "oozie-user-hive-default.xml";
-
private static final Pattern[] HIVE_JOB_IDS_PATTERNS = {
Pattern.compile("Ended Job = (job_\\S*)")
};
@@ -167,6 +161,7 @@ public class HiveMain extends LauncherMa
System.out.println();
System.out.println("Oozie Hive action configuration");
System.out.println("=================================================================");
+ System.out.println();
Configuration hiveConf = setUpHiveSite();
@@ -181,32 +176,6 @@ public class HiveMain extends LauncherMa
throw new RuntimeException("Hive script file [" + scriptPath + "] does not exist");
}
- // check if hive-default.xml is in the classpath, if not look for oozie-user-hive-default.xml
- // in the current directory (it will be there if the Hive action has the 'oozie.hive.defaults'
- // property) and rename it to hive-default.xml
- if (Thread.currentThread().getContextClassLoader().getResource("hive-default.xml") == null) {
- File userProvidedDefault = new File(USER_HIVE_DEFAULT_FILE);
- if (userProvidedDefault.exists()) {
- if (!userProvidedDefault.renameTo(new File("hive-default.xml"))) {
- throw new RuntimeException(
- "Could not rename user provided Hive defaults file to 'hive-default.xml'");
- }
- System.out.println("Using 'hive-default.xml' defined in the Hive action");
- }
- else {
- throw new RuntimeException(
- "Hive JAR does not bundle a 'hive-default.xml' and Hive action does not define one");
- }
- }
- else {
- System.out.println("Using 'hive-default.xml' defined in the Hive JAR");
- File userProvidedDefault = new File(USER_HIVE_DEFAULT_FILE);
- if (userProvidedDefault.exists()) {
- System.out.println("WARNING: Ignoring user provided Hive defaults");
- }
- }
- System.out.println();
-
String logFile = setUpHiveLog4J(hiveConf);
// print out current directory & its contents
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java Mon Jan 7 22:10:44 2013
@@ -195,7 +195,7 @@ public class MapReduceActionExecutor ext
&& (statsJsonString.getBytes().length <= getMaxExternalStatsSize())) {
context.setExecutionStats(statsJsonString);
log.debug(
- "Printing stats for Map-Reduce action as a JSON string : [{0}]" + statsJsonString);
+ "Printing stats for Map-Reduce action as a JSON string : [{0}]", statsJsonString);
}
}
else {
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java Mon Jan 7 22:10:44 2013
@@ -116,7 +116,7 @@ public class ShellActionExecutor extends
String[] varValue = pair.split("=");
if (varValue == null || varValue.length <= 1) {
throw new ActionExecutorException(ActionExecutorException.ErrorType.FAILED, "JA010",
- "Wrong ENV format [{0}] in <env-var> , key=value format expected " + pair);
+ "Wrong ENV format [{0}] in <env-var> , key=value format expected ", pair);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java Mon Jan 7 22:10:44 2013
@@ -67,17 +67,6 @@ public class SqoopActionExecutor extends
}
@Override
- Configuration setupLauncherConf(Configuration conf, Element actionXml, Path appPath, Context context)
- throws ActionExecutorException {
- super.setupLauncherConf(conf, actionXml, appPath, context);
-
- HiveActionExecutor hiveAE = new HiveActionExecutor();
- hiveAE.setupHiveDefault(conf, appPath, actionXml);
-
- return conf;
- }
-
- @Override
@SuppressWarnings("unchecked")
Configuration setupActionConf(Configuration actionConf, Context context, Element actionXml, Path appPath)
throws ActionExecutorException {
@@ -179,7 +168,7 @@ public class SqoopActionExecutor extends
&& (statsJsonString.getBytes().length <= getMaxExternalStatsSize())) {
context.setExecutionStats(statsJsonString);
log.debug(
- "Printing stats for sqoop action as a JSON string : [{0}]" + statsJsonString);
+ "Printing stats for sqoop action as a JSON string : [{0}]", statsJsonString);
}
} else {
context.setVar(MapReduceActionExecutor.HADOOP_COUNTERS, "");
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/Command.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/Command.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/Command.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/Command.java Mon Jan 7 22:10:44 2013
@@ -237,7 +237,7 @@ public abstract class Command<T, S exten
return result;
}
catch (XException ex) {
- log.error(logMask | XLog.OPS, "XException, {0}", ex);
+ log.error(logMask | XLog.OPS, "XException, {0}", ex.getMessage(), ex);
if (store != null) {
log.info(XLog.STD, "XException - connection logs from store {0}, {1}", store.getConnection(), store
.isClosed());
@@ -266,7 +266,7 @@ public abstract class Command<T, S exten
}
}
catch (Exception ex) {
- log.error(logMask | XLog.OPS, "Exception, {0}", ex);
+ log.error(logMask | XLog.OPS, "Exception, {0}", ex.getMessage(), ex);
exception = true;
if (store != null && store.isActive()) {
try {
@@ -276,10 +276,10 @@ public abstract class Command<T, S exten
log.warn(logMask | XLog.OPS, "openjpa error, {0}, {1}", name, rex.getMessage(), rex);
}
}
- throw new CommandException(ErrorCode.E0607, ex);
+ throw new CommandException(ErrorCode.E0607, name, ex.getMessage(), ex);
}
catch (Error er) {
- log.error(logMask | XLog.OPS, "Error, {0}", er);
+ log.error(logMask | XLog.OPS, "Error, {0}", er.getMessage(), er);
exception = true;
if (store != null && store.isActive()) {
try {
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/XCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/XCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/XCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/XCommand.java Mon Jan 7 22:10:44 2013
@@ -314,7 +314,7 @@ public abstract class XCommand<T> implem
catch (Exception ex) {
LOG.error("Exception, ", ex);
instrumentation.incr(INSTRUMENTATION_GROUP, getName() + ".exceptions", 1);
- throw new CommandException(ErrorCode.E0607, ex);
+ throw new CommandException(ErrorCode.E0607, getName(), ex.getMessage(), ex);
}
finally {
FaultInjection.deactivate("org.apache.oozie.command.SkipCommitFaultInjection");
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java Mon Jan 7 22:10:44 2013
@@ -209,7 +209,7 @@ public class BundleStartXCommand extends
}
}
catch (JDOMException jex) {
- throw new CommandException(ErrorCode.E1301, jex);
+ throw new CommandException(ErrorCode.E1301, jex.getMessage(), jex);
}
// if there is no coordinator for this bundle, failed it.
@@ -275,7 +275,7 @@ public class BundleStartXCommand extends
updateBundleAction();
}
catch (JDOMException jex) {
- throw new CommandException(ErrorCode.E1301, jex);
+ throw new CommandException(ErrorCode.E1301, jex.getMessage(), jex);
}
catch (JPAExecutorException je) {
throw new CommandException(je);
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java Mon Jan 7 22:10:44 2013
@@ -253,11 +253,11 @@ public class BundleSubmitXCommand extend
}
catch (IllegalArgumentException iex) {
LOG.warn("IllegalArgumentException: ", iex);
- throw new CommandException(ErrorCode.E1310, iex);
+ throw new CommandException(ErrorCode.E1310, iex.getMessage(), iex);
}
catch (Exception ex) {
LOG.warn("Exception: ", ex);
- throw new CommandException(ErrorCode.E1310, ex);
+ throw new CommandException(ErrorCode.E1310, ex.getMessage(), ex);
}
}
@@ -509,7 +509,7 @@ public class BundleSubmitXCommand extend
}
}
catch (JDOMException jex) {
- throw new CommandException(ErrorCode.E1301, jex);
+ throw new CommandException(ErrorCode.E1301, jex.getMessage(), jex);
}
return null;
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java Mon Jan 7 22:10:44 2013
@@ -176,7 +176,10 @@ public class CoordActionCheckXCommand ex
if (coordAction.getStatus().equals(CoordinatorAction.Status.SUCCEEDED)
|| coordAction.getStatus().equals(CoordinatorAction.Status.FAILED)
|| coordAction.getStatus().equals(CoordinatorAction.Status.KILLED)) {
- throw new PreconditionException(ErrorCode.E1100);
+ throw new PreconditionException(ErrorCode.E1100, "The coord action [" + actionId + "] must not have status "
+ + CoordinatorAction.Status.SUCCEEDED.name() + ", " + CoordinatorAction.Status.FAILED.name()
+ + ", or " + CoordinatorAction.Status.KILLED.name() + " but has status [" + coordAction.getStatus().name()
+ + "]");
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java Mon Jan 7 22:10:44 2013
@@ -120,7 +120,7 @@ public class CoordActionMaterializeComma
}
catch (IOException ioe) {
log.warn("Configuration parse error. read from DB :" + job.getConf(), ioe);
- throw new CommandException(ErrorCode.E1005, ioe);
+ throw new CommandException(ErrorCode.E1005, ioe.getMessage(), ioe);
}
Instrumentation.Cron cron = new Instrumentation.Cron();
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java Mon Jan 7 22:10:44 2013
@@ -288,7 +288,8 @@ public class CoordActionStartXCommand ex
@Override
protected void verifyPrecondition() throws PreconditionException {
if (coordAction.getStatus() != CoordinatorAction.Status.SUBMITTED) {
- throw new PreconditionException(ErrorCode.E1100);
+ throw new PreconditionException(ErrorCode.E1100, "The coord action [" + actionId + "] must have status "
+ + CoordinatorAction.Status.SUBMITTED.name() + " but has status [" + coordAction.getStatus().name() + "]");
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java Mon Jan 7 22:10:44 2013
@@ -105,7 +105,8 @@ public class CoordActionTimeOutXCommand
@Override
protected void verifyPrecondition() throws CommandException, PreconditionException {
if (actionBean.getStatus() != CoordinatorAction.Status.WAITING) {
- throw new PreconditionException(ErrorCode.E1100);
+ throw new PreconditionException(ErrorCode.E1100, "The coord action must have status " + CoordinatorAction.Status.WAITING
+ + " but has status [" + actionBean.getStatus() + "]");
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java Mon Jan 7 22:10:44 2013
@@ -282,7 +282,7 @@ public class CoordMaterializeTransitionX
}
catch (IOException ioe) {
LOG.warn("Configuration parse error. read from DB :" + coordJob.getConf(), ioe);
- throw new CommandException(ErrorCode.E1005, ioe);
+ throw new CommandException(ErrorCode.E1005, ioe.getMessage(), ioe);
}
String jobXml = coordJob.getJobXml();
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordRerunXCommand.java Mon Jan 7 22:10:44 2013
@@ -185,7 +185,7 @@ public class CoordRerunXCommand extends
}
catch (IOException ioe) {
LOG.warn("Configuration parse error. read from DB :" + coordJob.getConf(), ioe);
- throw new CommandException(ErrorCode.E1005, ioe);
+ throw new CommandException(ErrorCode.E1005, ioe.getMessage(), ioe);
}
String jobXml = coordJob.getJobXml();
Element eJob = XmlUtils.parseXml(jobXml);
@@ -338,11 +338,11 @@ public class CoordRerunXCommand extends
}
catch (JDOMException jex) {
isError = true;
- throw new CommandException(ErrorCode.E0700, jex);
+ throw new CommandException(ErrorCode.E0700, jex.getMessage(), jex);
}
catch (Exception ex) {
isError = true;
- throw new CommandException(ErrorCode.E1018, ex);
+ throw new CommandException(ErrorCode.E1018, ex.getMessage(), ex);
}
finally{
if(isError){
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java Mon Jan 7 22:10:44 2013
@@ -289,12 +289,12 @@ public class CoordSubmitXCommand extends
catch (IllegalArgumentException iex) {
exceptionOccured = true;
LOG.warn("ERROR: ", iex);
- throw new CommandException(ErrorCode.E1003, iex);
+ throw new CommandException(ErrorCode.E1003, iex.getMessage(), iex);
}
catch (Exception ex) {
exceptionOccured = true;
LOG.warn("ERROR: ", ex);
- throw new CommandException(ErrorCode.E0803, ex);
+ throw new CommandException(ErrorCode.E0803, ex.getMessage(), ex);
}
finally {
if (exceptionOccured) {
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java Mon Jan 7 22:10:44 2013
@@ -91,7 +91,7 @@ public class CoordSuspendXCommand extend
}
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0603, ex);
+ throw new CommandException(ErrorCode.E0603, ex.getMessage(), ex);
}
LogUtils.setLogInfo(this.coordJob, logInfo);
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java Mon Jan 7 22:10:44 2013
@@ -126,7 +126,7 @@ public abstract class ActionXCommand<T>
SuspendXCommand.suspendJob(Services.get().get(JPAService.class), workflow, id, action.getId(), null);
}
catch (Exception e) {
- throw new CommandException(ErrorCode.E0727, e.getMessage());
+ throw new CommandException(ErrorCode.E0727, id, e.getMessage());
}
finally {
// update coordinator action
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/CompletedActionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/CompletedActionXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/CompletedActionXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/CompletedActionXCommand.java Mon Jan 7 22:10:44 2013
@@ -68,7 +68,7 @@ public class CompletedActionXCommand ext
}
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0603, ex);
+ throw new CommandException(ErrorCode.E0603, ex.getMessage(), ex);
}
LogUtils.setLogInfo(this.wfactionBean, logInfo);
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/DefinitionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/DefinitionXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/DefinitionXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/DefinitionXCommand.java Mon Jan 7 22:10:44 2013
@@ -75,7 +75,7 @@ public class DefinitionXCommand extends
return wfJob.getWorkflowInstance().getApp().getDefinition();
}
else {
- throw new CommandException(ErrorCode.E0604);
+ throw new CommandException(ErrorCode.E0604, "null");
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobXCommand.java Mon Jan 7 22:10:44 2013
@@ -71,7 +71,7 @@ public class JobXCommand extends Workflo
throw new CommandException(ex);
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0603, ex);
+ throw new CommandException(ErrorCode.E0603, ex.getMessage(), ex);
}
return this.workflow;
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java Mon Jan 7 22:10:44 2013
@@ -69,7 +69,7 @@ public class JobsXCommand extends Workfl
return this.workflows;
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0603, ex);
+ throw new CommandException(ErrorCode.E0603, ex.getMessage(), ex);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java Mon Jan 7 22:10:44 2013
@@ -113,6 +113,7 @@ public class ReRunXCommand extends Workf
LogUtils.setLogInfo(wfBean, logInfo);
WorkflowInstance oldWfInstance = this.wfBean.getWorkflowInstance();
WorkflowInstance newWfInstance;
+ String appPath = null;
WorkflowAppService wps = Services.get().get(WorkflowAppService.class);
try {
@@ -121,7 +122,8 @@ public class ReRunXCommand extends Workf
XConfiguration protoActionConf = wps.createProtoActionConf(conf, authToken, true);
WorkflowLib workflowLib = Services.get().get(WorkflowStoreService.class).getWorkflowLibWithNoDB();
- URI uri = new URI(conf.get(OozieClient.APP_PATH));
+ appPath = conf.get(OozieClient.APP_PATH);
+ URI uri = new URI(appPath);
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
FileSystem fs = has.createFileSystem(wfBean.getUser(), uri, fsConf);
@@ -161,13 +163,13 @@ public class ReRunXCommand extends Workf
throw new CommandException(ex);
}
catch (IOException ex) {
- throw new CommandException(ErrorCode.E0803, ex);
+ throw new CommandException(ErrorCode.E0803, ex.getMessage(), ex);
}
catch (HadoopAccessorException ex) {
throw new CommandException(ex);
}
catch (URISyntaxException ex) {
- throw new CommandException(ErrorCode.E0711, ex.getMessage(), ex);
+ throw new CommandException(ErrorCode.E0711, appPath, ex.getMessage(), ex);
}
for (int i = 0; i < actions.size(); i++) {
@@ -249,7 +251,7 @@ public class ReRunXCommand extends Workf
}
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0603, ex);
+ throw new CommandException(ErrorCode.E0603, ex.getMessage(), ex);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java Mon Jan 7 22:10:44 2013
@@ -144,10 +144,10 @@ public class ResumeXCommand extends Work
throw new CommandException(e);
}
catch (IOException e) {
- throw new CommandException(ErrorCode.E0902, e);
+ throw new CommandException(ErrorCode.E0902, e.getMessage(), e);
}
catch (URISyntaxException e) {
- throw new CommandException(ErrorCode.E0902, e);
+ throw new CommandException(ErrorCode.E0902, e.getMessage(), e);
}
finally {
// update coordinator action
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java Mon Jan 7 22:10:44 2013
@@ -387,7 +387,7 @@ public class SignalXCommand extends Work
}
}
catch (Exception e) {
- throw new CommandException(ErrorCode.E1007, "workflow:Actions " + jobId, e);
+ throw new CommandException(ErrorCode.E1007, "workflow:Actions " + jobId, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpXCommand.java Mon Jan 7 22:10:44 2013
@@ -165,7 +165,7 @@ public abstract class SubmitHttpXCommand
throw new CommandException(ex);
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0803, ex);
+ throw new CommandException(ErrorCode.E0803, ex.getMessage(), ex);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java Mon Jan 7 22:10:44 2013
@@ -230,7 +230,7 @@ public class SubmitXCommand extends Work
throw new CommandException(ex);
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0803, ex);
+ throw new CommandException(ErrorCode.E0803, ex.getMessage(), ex);
}
}
@@ -266,7 +266,7 @@ public class SubmitXCommand extends Work
}
catch (Exception e) {
e.printStackTrace();
- throw new CommandException(ErrorCode.E1007, "workflow " + id, e);
+ throw new CommandException(ErrorCode.E1007, "workflow " + id, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java Mon Jan 7 22:10:44 2013
@@ -154,7 +154,7 @@ public class SuspendXCommand extends Wor
}
}
catch (Exception ex) {
- throw new CommandException(ErrorCode.E0603, ex);
+ throw new CommandException(ErrorCode.E0603, ex.getMessage(), ex);
}
LogUtils.setLogInfo(this.wfJobBean, logInfo);
}
@@ -166,7 +166,7 @@ public class SuspendXCommand extends Wor
protected void eagerVerifyPrecondition() throws CommandException, PreconditionException {
super.eagerVerifyPrecondition();
if (this.wfJobBean.getStatus() != WorkflowJob.Status.RUNNING) {
- throw new PreconditionException(ErrorCode.E0727, this.wfJobBean.getStatus());
+ throw new PreconditionException(ErrorCode.E0727, this.wfJobBean.getId(), this.wfJobBean.getStatus());
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java Mon Jan 7 22:10:44 2013
@@ -70,7 +70,7 @@ public class WfEndXCommand extends Workf
}
catch (Exception e) {
LOG.error("Unable to delete WF temp dir of wf id :" + job.getId(), e);
- throw new CommandException(ErrorCode.E0819);
+ throw new CommandException(ErrorCode.E0819, job.getId(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordUtils.java Mon Jan 7 22:10:44 2013
@@ -104,7 +104,7 @@ public class CoordUtils {
}
}
catch (ParseException e) {
- throw new CommandException(ErrorCode.E0302, e);
+ throw new CommandException(ErrorCode.E0302, s.trim(), e);
}
catch (JPAExecutorException e) {
throw new CommandException(e);
@@ -146,17 +146,20 @@ public class CoordUtils {
}
int start;
int end;
+ //Get the starting and ending action numbers
try {
- //Get the starting and ending action numbers
start = Integer.parseInt(range[0].trim());
+ } catch (NumberFormatException ne) {
+ throw new CommandException(ErrorCode.E0302, "could not parse " + range[0].trim() + "into an integer", ne);
+ }
+ try {
end = Integer.parseInt(range[1].trim());
- if (start > end) {
- throw new CommandException(ErrorCode.E0302, "format is wrong for action's range '" + s
- + "', starting action number of the range should be less than ending action number, an example will be 1-4");
- }
+ } catch (NumberFormatException ne) {
+ throw new CommandException(ErrorCode.E0302, "could not parse " + range[1].trim() + "into an integer", ne);
}
- catch (NumberFormatException ne) {
- throw new CommandException(ErrorCode.E0302, ne);
+ if (start > end) {
+ throw new CommandException(ErrorCode.E0302, "format is wrong for action's range '" + s + "', starting action"
+ + "number of the range should be less than ending action number, an example will be 1-4");
}
// Add the actionIds
for (int i = start; i <= end; i++) {
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkDeleteForPurgeJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkDeleteForPurgeJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkDeleteForPurgeJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkDeleteForPurgeJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -106,7 +106,7 @@ public class BulkDeleteForPurgeJPAExecut
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return actionsDeleted;
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -93,7 +93,7 @@ public class BulkJPAExecutor implements
return bulk;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateDeleteJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateDeleteJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateDeleteJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateDeleteJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -127,7 +127,7 @@ public class BulkUpdateDeleteJPAExecutor
throw je;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStartJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStartJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStartJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStartJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -123,7 +123,7 @@ public class BulkUpdateInsertForCoordAct
return null;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStatusJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStatusJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStatusJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertForCoordActionStatusJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -118,7 +118,7 @@ public class BulkUpdateInsertForCoordAct
return null;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BulkUpdateInsertJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -95,7 +95,7 @@ public class BulkUpdateInsertJPAExecutor
return null;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionGetJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -66,7 +66,7 @@ public class BundleActionGetJPAExecutor
baBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
BundleActionBean bean = null;
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsCountForJobGetJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -50,7 +50,7 @@ public class BundleActionsCountForJobGet
return Integer.valueOf(count.intValue());
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetByLastModifiedTimeJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetByLastModifiedTimeJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetByLastModifiedTimeJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetByLastModifiedTimeJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -52,7 +52,7 @@ public class BundleActionsGetByLastModif
baBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return baBeans;
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -64,7 +64,7 @@ public class BundleActionsGetJPAExecutor
baBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return baBeans;
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetStatusPendingJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetStatusPendingJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetStatusPendingJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleActionsGetStatusPendingJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -70,7 +70,7 @@ public class BundleActionsGetStatusPendi
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return baBeans;
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetCoordinatorsJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -68,7 +68,7 @@ public class BundleJobGetCoordinatorsJPA
return coordJobBeans;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobGetJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -59,7 +59,7 @@ public class BundleJobGetJPAExecutor imp
bdBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
BundleJobBean bean = null;
if (bdBeans != null && bdBeans.size() > 0) {
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetForPurgeJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetForPurgeJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetForPurgeJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetForPurgeJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -63,7 +63,7 @@ public class BundleJobsGetForPurgeJPAExe
bundleJobs = jobQ.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return bundleJobs;
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetNeedStartJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetNeedStartJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetNeedStartJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetNeedStartJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -57,7 +57,7 @@ public class BundleJobsGetNeedStartJPAEx
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetPausedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetPausedJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetPausedJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetPausedJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -57,7 +57,7 @@ public class BundleJobsGetPausedJPAExecu
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetRunningOrPendingJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetRunningOrPendingJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetRunningOrPendingJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetRunningOrPendingJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -63,7 +63,7 @@ public class BundleJobsGetRunningOrPendi
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetUnpausedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetUnpausedJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetUnpausedJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsGetUnpausedJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -57,7 +57,7 @@ public class BundleJobsGetUnpausedJPAExe
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForCheckJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -62,7 +62,7 @@ public class CoordActionGetForCheckJPAEx
return caBean;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForExternalIdJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -67,7 +67,7 @@ public class CoordActionGetForExternalId
return caBean;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java?rev=1430055&r1=1430054&r2=1430055&view=diff
==============================================================================
--- oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java (original)
+++ oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForInfoJPAExecutor.java Mon Jan 7 22:10:44 2013
@@ -66,7 +66,7 @@ public class CoordActionGetForInfoJPAExe
actionObjects = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
if (actionObjects != null && actionObjects.size() > 0) {
@@ -84,7 +84,7 @@ public class CoordActionGetForInfoJPAExe
caBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
if (caBeans != null && caBeans.size() > 0) {