Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A4769538 for ; Thu, 26 Jul 2012 13:34:59 +0000 (UTC) Received: (qmail 25369 invoked by uid 500); 26 Jul 2012 13:26:49 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 32583 invoked by uid 500); 26 Jul 2012 13:22:11 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 32803 invoked by uid 99); 26 Jul 2012 06:54:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2012 06:54:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2012 06:54:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3CAFB23888CD for ; Thu, 26 Jul 2012 06:53:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1365892 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java Date: Thu, 26 Jul 2012 06:53:28 -0000 To: common-commits@hadoop.apache.org From: atm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120726065328.3CAFB23888CD@eris.apache.org> Author: atm Date: Thu Jul 26 06:53:27 2012 New Revision: 1365892 URL: http://svn.apache.org/viewvc?rev=1365892&view=rev Log: HDFS-3727. When using SPNEGO, NN should not try to log in using KSSL principal. Contributed by Aaron T. Myers. Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1365892&r1=1365891&r2=1365892&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Thu Jul 26 06:53:27 2012 @@ -123,6 +123,9 @@ Release 1.2.0 - unreleased HDFS-2751. Backport: Datanode may incorrectly drop OS cache behind reads even for short reads. (Brandon Li via szetszwo) + HDFS-3727. When using SPNEGO, NN should not try to log in using KSSL + principal. (atm) + Release 1.1.0 - unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java?rev=1365892&r1=1365891&r2=1365892&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java (original) +++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/GetImageServlet.java Thu Jul 26 06:53:27 2012 @@ -122,7 +122,7 @@ public class GetImageServlet extends Htt return UserGroupInformation .loginUserFromKeytabAndReturnUGI( SecurityUtil.getServerPrincipal(conf - .get(DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY), NameNode + .get(DFS_NAMENODE_USER_NAME_KEY), NameNode .getAddress(conf).getHostName()), conf.get(DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY)); } @@ -161,15 +161,9 @@ public class GetImageServlet extends Htt } String[] validRequestors = { - SecurityUtil.getServerPrincipal(conf - .get(DFS_NAMENODE_KRB_HTTPS_USER_NAME_KEY), NameNode.getAddress( - conf).getHostName()), SecurityUtil.getServerPrincipal(conf.get(DFS_NAMENODE_USER_NAME_KEY), NameNode.getAddress(conf).getHostName()), SecurityUtil.getServerPrincipal(conf - .get(DFS_SECONDARY_NAMENODE_KRB_HTTPS_USER_NAME_KEY), - SecondaryNameNode.getHttpAddress(conf).getHostName()), - SecurityUtil.getServerPrincipal(conf .get(DFS_SECONDARY_NAMENODE_USER_NAME_KEY), SecondaryNameNode .getHttpAddress(conf).getHostName()) };