HDFS-1289. Datanode secure mode is broken. Contributed by Kan Zhang.

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

CHANGES.txt

@@ -131,6 +131,8 @@ Trunk (unreleased changes)
     HDFS-1045. In secure clusters, re-login is necessary for https 
     clients before opening connections. (jghoman)
 
+    HDFS-1289. Datanode secure mode is broken. (Kan Zhang via jghoman)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -248,11 +248,6 @@ public class DataNode extends Configured
            final DatanodeProtocol namenode) throws IOException {
     super(conf);
 
-    UserGroupInformation.setConfiguration(conf);
-    DFSUtil.login(conf, 
-        DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY,
-        DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY);
-    
     DataNode.setDataNode(this);
     
     try {
@@ -1398,6 +1393,10 @@ public class DataNode extends Configured
     Collection<URI> dataDirs = getStorageDirs(conf);
     dnThreadName = "DataNode: [" +
                     StringUtils.uriToString(dataDirs.toArray(new URI[0])) + "]";
+    UserGroupInformation.setConfiguration(conf);
+    DFSUtil.login(conf, 
+        DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY,
+        DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY);
     return makeInstance(dataDirs, conf);
   }