svn commit: r1531794 - in /hadoop/common/branches/branch-1: ./ src/hdfs/org/apache/hadoop/hdfs/server/datanode/ src/hdfs/org/apache/hadoop/hdfs/server/namenode/

[jing9]

Author: jing9
Date: Mon Oct 14 04:39:02 2013
New Revision: 1531794

URL: http://svn.apache.org/r1531794
Log:
HDFS-4794. Browsing filesystem via webui throws kerberos exception when NN 
service RPC is enabled in a secure cluster. Contribued by Benoy Antony.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
    
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
    
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1531794&r1=1531793&r2=1531794&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Oct 14 04:39:02 2013
@@ -154,6 +154,9 @@ Release 1.3.0 - unreleased
     MAPREDUCE-5512. TaskTracker hung after failed reconnect to the JobTracker.
     (ivanmi)
 
+    HDFS-4794. Browsing filesystem via webui throws kerberos exception when NN 
+    service RPC is enabled in a secure cluster. (Benoy Antony via jing9)
+
 Release 1.2.2 - unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1531794&r1=1531793&r2=1531794&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 Mon Oct 14 04:39:02 2013
@@ -221,6 +221,7 @@ public class DataNode extends Configured
   private HttpServer infoServer = null;
   DataNodeInstrumentation myMetrics;
   private static InetSocketAddress nameNodeAddr;
+  private static InetSocketAddress nameNodeRpcAddr;
   private InetSocketAddress selfAddr;
   private static DataNode datanodeObject = null;
   private Thread dataNodeThread = null;
@@ -476,6 +477,7 @@ public class DataNode extends Configured
                                        
DFSConfigKeys.DFS_DATANODE_SYNCONCLOSE_DEFAULT);
 
     DataNode.nameNodeAddr = nameNodeAddr;
+    DataNode.nameNodeRpcAddr = NameNode.getAddress(conf);
 
     //initialize periodic block scanner
     String reason = null;
@@ -711,6 +713,10 @@ public class DataNode extends Configured
     return nameNodeAddr;
   }
   
+  public InetSocketAddress getNameNodeRpcAddr() {
+    return nameNodeRpcAddr;
+  }
+  
   public InetSocketAddress getSelfAddr() {
     return selfAddr;
   }

Modified: 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java?rev=1531794&r1=1531793&r2=1531794&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/JspHelper.java
 Mon Oct 14 04:39:02 2013
@@ -83,7 +83,7 @@ public class JspHelper {
   public JspHelper() {
     fsn = FSNamesystem.getFSNamesystem();
     if (DataNode.getDataNode() != null) {
-      nameNodeAddr = DataNode.getDataNode().getNameNodeAddr();
+      nameNodeAddr = DataNode.getDataNode().getNameNodeRpcAddr();
     }
     else {
       nameNodeAddr = fsn.getDFSNameNodeAddress(); 

Modified: 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java?rev=1531794&r1=1531793&r2=1531794&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
 Mon Oct 14 04:39:02 2013
@@ -41,7 +41,7 @@ public class StreamFile extends DfsServl
   static DataNode datanode = null;
   static {
     if ((datanode = DataNode.getDataNode()) != null) {
-      nameNodeAddr = datanode.getNameNodeAddr();
+      nameNodeAddr = datanode.getNameNodeRpcAddr();
     }
   }