HDFS-6077. running slive with webhdfs on secure HA cluster fails with unkown host exception. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576076 13f79535-47bb-0310-9956-ffa450edef68

Author: Jing9

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -736,6 +736,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)

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

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