Author: jing9 Date: Mon Mar 10 20:50:40 2014 New Revision: 1576077 URL: http://svn.apache.org/r1576077 Log: HDFS-6077. Merge change r1576076 from trunk.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1576077&r1=1576076&r2=1576077&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Mar 10 20:50:40 2014 @@ -341,6 +341,9 @@ Release 2.4.0 - UNRELEASED HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9) + HDFS-6077. Running slive with webhdfs on secure HA cluster fails with unkown + host exception. (jing9) + BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java?rev=1576077&r1=1576076&r2=1576077&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java Mon Mar 10 20:50:40 2014 @@ -1114,4 +1114,10 @@ public class WebHdfsFileSystem extends F InetSocketAddress[] r = new InetSocketAddress[ret.size()]; return ret.toArray(r); } + + @Override + public String getCanonicalServiceName() { + return tokenServiceName == null ? super.getCanonicalServiceName() + : tokenServiceName.toString(); + } }