Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-6077. Merge change r1576076 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576077 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2014-03-10 20:50:40 +00:00
parent 8a3978b18a
commit 9fcbd9413f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -341,6 +341,9 @@ Release 2.4.0 - UNRELEASED
HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9) 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 BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
View File

@ -1114,4 +1114,10 @@ public class WebHdfsFileSystem extends FileSystem
InetSocketAddress[] r = new InetSocketAddress[ret.size()]; InetSocketAddress[] r = new InetSocketAddress[ret.size()];
return ret.toArray(r); return ret.toArray(r);
} }
@Override
public String getCanonicalServiceName() {
return tokenServiceName == null ? super.getCanonicalServiceName()
: tokenServiceName.toString();
}
} }