Merge branch 'apache_forked_master' into apache_forked_oya
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3c2ede43 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3c2ede43 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3c2ede43 Branch: refs/heads/oya Commit: 3c2ede4321477a8b8c337e663a66acfd7e2f5a53 Parents: 85e6548 bf2802e Author: Peter Bacsko <[email protected]> Authored: Mon Jan 23 12:34:04 2017 +0100 Committer: Peter Bacsko <[email protected]> Committed: Mon Jan 23 12:34:04 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/oozie/cli/OozieCLI.java | 35 ++- .../org/apache/oozie/client/OozieClient.java | 39 ++- .../org/apache/oozie/client/rest/JsonTags.java | 2 +- .../apache/oozie/client/rest/RestConstants.java | 2 + .../main/java/org/apache/oozie/DagEngine.java | 17 ++ .../oozie/command/wf/ActionCheckXCommand.java | 2 +- .../oozie/command/wf/ActionEndXCommand.java | 2 +- .../oozie/command/wf/ActionStartXCommand.java | 9 +- .../apache/oozie/command/wf/ActionXCommand.java | 39 ++- .../wf/WorkflowActionRetryInfoXCommand.java | 115 ++++++++ .../apache/oozie/servlet/BaseJobServlet.java | 22 +- .../org/apache/oozie/servlet/V0JobServlet.java | 7 + .../org/apache/oozie/servlet/V1JobServlet.java | 8 +- .../org/apache/oozie/servlet/V2JobServlet.java | 20 +- .../java/org/apache/oozie/util/JobUtils.java | 10 + .../apache/oozie/ForTestingActionExecutor.java | 16 +- .../org/apache/oozie/client/TestOozieCLI.java | 15 ++ .../wf/TestWorkflowActionRetryInfoXCommand.java | 138 ++++++++++ .../oozie/servlet/MockDagEngineService.java | 6 +- core/src/test/resources/wf-ext-schema.xsd | 1 + docs/src/site/twiki/DG_CommandLineTool.twiki | 29 ++ docs/src/site/twiki/WebServicesAPI.twiki | 31 +++ release-log.txt | 1 + webapp/src/main/webapp/oozie-console.js | 270 ++++++++++++++++--- 24 files changed, 768 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/3c2ede43/client/src/main/java/org/apache/oozie/cli/OozieCLI.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/3c2ede43/core/src/main/java/org/apache/oozie/util/JobUtils.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/oozie/util/JobUtils.java index dae20e0,63f88ac..5d948d9 --- a/core/src/main/java/org/apache/oozie/util/JobUtils.java +++ b/core/src/main/java/org/apache/oozie/util/JobUtils.java @@@ -150,7 -153,27 +152,15 @@@ public class JobUtils // it fails with conf, therefore we pass defaultConf instead fs = file.getFileSystem(defaultConf); } - // Hadoop 0.20/1.x. - if (Services.get().get(HadoopAccessorService.class).getCachedConf().get("yarn.resourcemanager.webapp.address") == null) { - // Duplicate hadoop 1.x code to workaround MAPREDUCE-2361 in Hadoop 0.20 - // Refer OOZIE-1806. - String filepath = file.toUri().getPath(); - String classpath = conf.get("mapred.job.classpath.files"); - conf.set("mapred.job.classpath.files", - classpath == null ? filepath : classpath + System.getProperty("path.separator") + filepath); - URI uri = fs.makeQualified(file).toUri(); - DistributedCache.addCacheFile(uri, conf); - } - else { // Hadoop 2.x - DistributedCache.addFileToClassPath(file, conf, fs); - } + + DistributedCache.addFileToClassPath(file, conf, fs); } + + public static String getRetryKey(WorkflowActionBean wfAction, String key) { + return ActionXCommand.RETRY + wfAction.getUserRetryCount() + "." + key; + } + + public static String getRetryKey(String key, int retry) { + return ActionXCommand.RETRY + retry + "." + key; + } } http://git-wip-us.apache.org/repos/asf/oozie/blob/3c2ede43/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/3c2ede43/release-log.txt ----------------------------------------------------------------------
