Repository: oozie Updated Branches: refs/heads/master 488855a0f -> 87a6d0536
http://git-wip-us.apache.org/repos/asf/oozie/blob/87a6d053/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/hadoop/utils/HadoopShims.java ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/hadoop/utils/HadoopShims.java b/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/hadoop/utils/HadoopShims.java index acebd60..d7b4051 100644 --- a/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/hadoop/utils/HadoopShims.java +++ b/hadooplibs/hadoop-utils-3/src/main/java/org/apache/oozie/hadoop/utils/HadoopShims.java @@ -20,7 +20,9 @@ package org.apache.oozie.hadoop.utils; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; + import java.io.IOException; +import java.net.URI; public class HadoopShims { FileSystem fs; @@ -34,15 +36,33 @@ public class HadoopShims { } public Path getSymLinkTarget(Path p) throws IOException { - return fs.getFileLinkStatus(p).getSymlink(); + try { + //getSymlink doesn't work with fragment name, need to remove fragment before calling getSymlink + Path tempPath = new URI(p.toString()).getFragment() == null ? p : new Path(new URI(p.toString()).getPath()); + return fs.getFileLinkStatus(tempPath).getSymlink(); + } + catch (java.net.URISyntaxException e) { + throw new IOException(e); + } } public boolean isSymlink(Path p) throws IOException { - return fs.getFileLinkStatus(p).isSymlink(); + try { + //isSymlink doesn't work with fragment name, need to remove fragment before checking for symlink + Path tempPath = new URI(p.toString()).getFragment() == null ? p : new Path(new URI(p.toString()).getPath()); + return fs.getFileLinkStatus(tempPath).isSymlink(); + } + catch (java.net.URISyntaxException e) { + throw new IOException(e); + } } public void createSymlink(Path target, Path link, boolean createParent) throws IOException { fs.createSymlink(target, link, createParent); } + public boolean isYARN() { + return true; + } + } http://git-wip-us.apache.org/repos/asf/oozie/blob/87a6d053/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 4d6d8bd..8cfe13a 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OZIE-2068 Configuration as part of sharelib (puru) OOZIE-2121 CoordinatorFunctionalSpec 4.4.1.1 swap Value and First Occurrence line 4 in example table (apivovarov via ryota) OOZIE-1894 Better error reporting to user (puru) OOZIE-2120 Many JPAExecutor names are wrong (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/87a6d053/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java ---------------------------------------------------------------------- diff --git a/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java b/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java index a76014c..829d979 100644 --- a/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java +++ b/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java @@ -122,9 +122,9 @@ public class TestOozieSharelibCLI extends XTestCase { // test files in new folder assertEquals(9, fs.getFileStatus(new Path(sharelibService.getLatestLibPath(getDistPath(), - ShareLibService.SHARED_LIB_PREFIX), "file1")).getLen()); + ShareLibService.SHARE_LIB_PREFIX), "file1")).getLen()); assertEquals(10, fs.getFileStatus(new Path(sharelibService.getLatestLibPath(getDistPath(), - ShareLibService.SHARED_LIB_PREFIX), "file2")).getLen()); + ShareLibService.SHARE_LIB_PREFIX), "file2")).getLen()); }
