HDFS-8686. WebHdfsFileSystem#getXAttr(Path p, final String name) doesn't work if namespace is in capitals (Contributed by kanaka kumar avvaru)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc92d3e6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc92d3e6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc92d3e6 Branch: refs/heads/HADOOP-12111 Commit: fc92d3e6515a391847cb6170244b3d911712d96a Parents: 233cab8 Author: Vinayakumar B <[email protected]> Authored: Mon Jul 6 16:09:24 2015 +0530 Committer: Vinayakumar B <[email protected]> Committed: Mon Jul 6 16:09:24 2015 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/web/JsonUtilClient.java | 14 ++++++++++++++ .../org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/namenode/FSXAttrBaseTest.java | 5 ++++- .../TestOfflineImageViewerForXAttr.java | 3 +++ 5 files changed, 25 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc92d3e6/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java index e025e31..713836c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/JsonUtilClient.java @@ -413,6 +413,20 @@ class JsonUtilClient { return null; } + /** Expecting only single XAttr in the map. return its value */ + static byte[] getXAttr(final Map<?, ?> json) throws IOException { + if (json == null) { + return null; + } + + Map<String, byte[]> xAttrs = toXAttrs(json); + if (xAttrs != null && !xAttrs.values().isEmpty()) { + return xAttrs.values().iterator().next(); + } + + return null; + } + static Map<String, byte[]> toXAttrs(final Map<?, ?> json) throws IOException { if (json == null) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc92d3e6/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index 2650dca..b661d07 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -963,7 +963,7 @@ public class WebHdfsFileSystem extends FileSystem new XAttrEncodingParam(XAttrCodec.HEX)) { @Override byte[] decodeResponse(Map<?, ?> json) throws IOException { - return JsonUtilClient.getXAttr(json, name); + return JsonUtilClient.getXAttr(json); } }.run(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc92d3e6/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 4f184fb..9edc2af 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1005,6 +1005,9 @@ Release 2.8.0 - UNRELEASED HDFS-8577. Avoid retrying to recover lease on a file which does not exist (J.Andreina via vinayakumarb) + HDFS-8686. WebHdfsFileSystem#getXAttr(Path p, final String name) doesn't + work if namespace is in capitals (kanaka kumar avvaru via vinayakumarb) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc92d3e6/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSXAttrBaseTest.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSXAttrBaseTest.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSXAttrBaseTest.java index e21e34c..eb9053c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSXAttrBaseTest.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSXAttrBaseTest.java @@ -395,7 +395,10 @@ public class FSXAttrBaseTest { FileSystem.mkdirs(fs, path, FsPermission.createImmutable((short)0750)); fs.setXAttr(path, name1, value1, EnumSet.of(XAttrSetFlag.CREATE)); fs.setXAttr(path, name2, value2, EnumSet.of(XAttrSetFlag.CREATE)); - + + final byte[] theValue = fs.getXAttr(path, "USER.a2"); + Assert.assertArrayEquals(value2, theValue); + /* An XAttr that was requested does not exist. */ try { final byte[] value = fs.getXAttr(path, name3); http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc92d3e6/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewerForXAttr.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewerForXAttr.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewerForXAttr.java index 3f23f64..6c82101 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewerForXAttr.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewerForXAttr.java @@ -231,6 +231,9 @@ public class TestOfflineImageViewerForXAttr { "user.attr1")); assertEquals("value1", value); + value = new String(webhdfs.getXAttr(new Path("/dir1"), "USER.attr1")); + assertEquals("value1", value); + Map<String, byte[]> contentMap = webhdfs.getXAttrs(new Path("/dir1"), names);
