Repository: oozie Updated Branches: refs/heads/master 6aa847617 -> d04b24329
OOZIE-2246 CoordinatorInputCheckCommand does not behave properly when har file is one of data dependency and doesn't exist Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d04b2432 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d04b2432 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d04b2432 Branch: refs/heads/master Commit: d04b243294021fa10d6bccc50e7151d0e7aefba6 Parents: 6aa8476 Author: Purshotam Shah <[email protected]> Authored: Thu Mar 3 09:56:09 2016 -0800 Committer: Purshotam Shah <[email protected]> Committed: Thu Mar 3 09:56:09 2016 -0800 ---------------------------------------------------------------------- .../org/apache/oozie/dependency/FSURIHandler.java | 9 +++++++++ .../coord/TestCoordActionInputCheckXCommand.java | 16 ++++++++++++++++ release-log.txt | 1 + 3 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/d04b2432/core/src/main/java/org/apache/oozie/dependency/FSURIHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/dependency/FSURIHandler.java b/core/src/main/java/org/apache/oozie/dependency/FSURIHandler.java index 65d85b8..2cfcbab 100644 --- a/core/src/main/java/org/apache/oozie/dependency/FSURIHandler.java +++ b/core/src/main/java/org/apache/oozie/dependency/FSURIHandler.java @@ -100,6 +100,15 @@ public class FSURIHandler implements URIHandler { FileSystem fs = getFileSystem(uri, conf, user); return fs.exists(getNormalizedPath(uri)); } + catch (HadoopAccessorException e) { + if (ErrorCode.E0902.equals(e.getErrorCode()) && e.getMessage() != null + && e.getMessage().indexOf("Invalid path for the Har Filesystem. No index file") != -1) { + return false; + } + else { + throw e; + } + } catch (IOException e) { throw new HadoopAccessorException(ErrorCode.E0902, e); } http://git-wip-us.apache.org/repos/asf/oozie/blob/d04b2432/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java index c27a40a..16bf288 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java @@ -1017,4 +1017,20 @@ public class TestCoordActionInputCheckXCommand extends XDataTestCase { throw new Exception("Action ID " + actionId + " was not stored properly in db"); } } + + public void testHarFileInputCheck() throws Exception { + CoordinatorJobBean job = addRecordToCoordJobTableForWaiting("coord-job-for-action-input-check.xml", + CoordinatorJob.Status.RUNNING, false, true); + String pathName = createTestCaseSubDir("2009/01/29".split("/")); + CoordJobQueryExecutor.getInstance().executeUpdate(CoordJobQueryExecutor.CoordJobQuery.UPDATE_COORD_JOB, job); + String missingDeps = "file://" + pathName + CoordELFunctions.INSTANCE_SEPARATOR + + "har:///dirx/archive.har/data"; + String actionId1 = addInitRecords(missingDeps, null, TZ, job, 1); + new CoordActionInputCheckXCommand(actionId1, job.getId()).call(); + CoordinatorActionBean coordAction = CoordActionQueryExecutor.getInstance() + .get(CoordActionQuery.GET_COORD_ACTION, actionId1); + // the directory (2009/01/29) exists and successfully removed from + // missing dependency of the coord action + assertEquals(coordAction.getMissingDependencies(), "har:///dirx/archive.har/data"); + } } http://git-wip-us.apache.org/repos/asf/oozie/blob/d04b2432/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 501d807..a48754d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2246 CoordinatorInputCheckCommand does not behave properly when har file is one of data dependency and doesn't exist (satishsaley via puru) OOZIE-2446 Job does not fail during submission if non existent credential is specified (satishsaley via puru) OOZIE-2283 Documentation should not say that System.exit is not allowed in Java Action (eeeva via rkanter) OOZIE-2400 Workflow xml configuration parser cannot deal with namespace prefix (lars_francke via rkanter)
