svn commit: r1346681 - in /hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/java/org/apache/hadoop/hdfs/server/journalservice/

[szetszwo]

Author: szetszwo
Date: Wed Jun  6 00:12:42 2012
New Revision: 1346681

URL: http://svn.apache.org/viewvc?rev=1346681&view=rev
Log:
HDFS-3511. Update GetJournalEditServlet and JournalHttpServer for the api 
changes in SecurityUtil.  Contributed by Brandon Li

Modified:
    
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3092.txt
    
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/GetJournalEditServlet.java
    
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/JournalHttpServer.java

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3092.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3092.txt?rev=1346681&r1=1346680&r2=1346681&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3092.txt
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3092.txt
 Wed Jun  6 00:12:42 2012
@@ -37,3 +37,6 @@ HDFS-3092 branch changes
 
     HDFS-3388. GetJournalEditServlet should close output stream only if the
     stream is used.  (Brandon Li via szetszwo)
+
+    HDFS-3511. Update GetJournalEditServlet and JournalHttpServer for the api
+    changes in SecurityUtil.  (Brandon Li via szetszwo)

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/GetJournalEditServlet.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/GetJournalEditServlet.java?rev=1346681&r1=1346680&r2=1346681&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/GetJournalEditServlet.java
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/GetJournalEditServlet.java
 Wed Jun  6 00:12:42 2012
@@ -63,9 +63,6 @@ public class GetJournalEditServlet exten
     }
 
     String[] validRequestors = {
-        SecurityUtil.getServerPrincipal(
-            conf.get(DFSConfigKeys.DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY),
-            NameNode.getAddress(conf).getHostName()),
         SecurityUtil.getServerPrincipal(conf
             .get(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY), NameNode
             .getAddress(conf).getHostName()),

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/JournalHttpServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/JournalHttpServer.java?rev=1346681&r1=1346680&r2=1346681&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/JournalHttpServer.java
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/journalservice/JournalHttpServer.java
 Wed Jun  6 00:12:42 2012
@@ -18,8 +18,6 @@
 package org.apache.hadoop.hdfs.server.journalservice;
 
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_ADMIN;
-import static 
org.apache.hadoop.hdfs.DFSConfigKeys.DFS_JOURNAL_HTTPS_PORT_DEFAULT;
-import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_JOURNAL_HTTPS_PORT_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_JOURNAL_KEYTAB_FILE_KEY;
 import static 
org.apache.hadoop.hdfs.DFSConfigKeys.DFS_JOURNAL_KRB_HTTPS_USER_NAME_KEY;
 
@@ -37,9 +35,7 @@ import org.apache.hadoop.hdfs.server.com
 import org.apache.hadoop.hdfs.server.namenode.TransferFsImage;
 import org.apache.hadoop.hdfs.server.protocol.RemoteEditLog;
 import org.apache.hadoop.hdfs.server.protocol.RemoteEditLogManifest;
-
 import org.apache.hadoop.http.HttpServer;
-import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authorize.AccessControlList;
@@ -91,14 +87,7 @@ public class JournalHttpServer {
                   .get(DFS_ADMIN, " ")));
 
           if (UserGroupInformation.isSecurityEnabled()) {
-            SecurityUtil.initKrb5CipherSuites();
-            InetSocketAddress secInfoSocAddr = NetUtils
-                .createSocketAddr(infoBindAddress
-                    + ":"
-                    + conf.getInt(DFS_JOURNAL_HTTPS_PORT_KEY,
-                        DFS_JOURNAL_HTTPS_PORT_DEFAULT));
-            httpsPort = secInfoSocAddr.getPort();
-            httpServer.addSslListener(secInfoSocAddr, conf, false, true);
+            // TODO: implementation 
           }
           httpServer.setAttribute(JOURNAL_ATTRIBUTE_KEY, localJournal);
           httpServer.setAttribute(JspHelper.CURRENT_CONF, conf);