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 711A118376 for ; Tue, 12 May 2015 17:30:46 +0000 (UTC) Received: (qmail 20023 invoked by uid 500); 12 May 2015 17:30:46 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 19959 invoked by uid 500); 12 May 2015 17:30:46 -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 19946 invoked by uid 99); 12 May 2015 17:30:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 17:30:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04D1BE03C2; Tue, 12 May 2015 17:30:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wheat9@apache.org To: common-commits@hadoop.apache.org Message-Id: <9c6bcff09aed4442b23fa14c6043e8aa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out even in debug level. Contributed by Junping Du. Date: Tue, 12 May 2015 17:30:46 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 5fceebd69 -> 8011d4688 HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out even in debug level. Contributed by Junping Du. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8011d468 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8011d468 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8011d468 Branch: refs/heads/branch-2 Commit: 8011d4688fa77f123de14ad4e1722cda23536888 Parents: 5fceebd Author: Haohui Mai Authored: Tue May 12 10:30:32 2015 -0700 Committer: Haohui Mai Committed: Tue May 12 10:30:43 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java | 3 --- .../src/main/java/org/apache/hadoop/security/SaslRpcClient.java | 3 --- .../java/org/apache/hadoop/security/UserGroupInformation.java | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8011d468/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6aab352..fa90254 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -206,6 +206,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11947. test-patch should return early from determine-issue when run in jenkins mode. (Sean Busbey via aw) + HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out + even in debug level. (Junping Du via wheat9) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8011d468/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java index c80c022..fa25cac 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java @@ -1448,9 +1448,6 @@ public abstract class Server { } private void doSaslReply(Message message) throws IOException { - if (LOG.isDebugEnabled()) { - LOG.debug("Sending sasl message "+message); - } setupResponse(saslResponse, saslCall, RpcStatusProto.SUCCESS, null, new RpcResponseWrapper(message), null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/8011d468/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java index 4a1a397..7d3afa8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java @@ -385,9 +385,6 @@ public class SaslRpcClient { } RpcSaslProto saslMessage = RpcSaslProto.parseFrom(responseWrapper.getMessageBytes()); - if (LOG.isDebugEnabled()) { - LOG.debug("Received SASL message "+saslMessage); - } // handle sasl negotiation process RpcSaslProto.Builder response = null; switch (saslMessage.getState()) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/8011d468/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 65e4166..527ec2d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -853,9 +853,6 @@ public class UserGroupInformation { .getPrivateCredentials(KerberosTicket.class); for (KerberosTicket ticket : tickets) { if (SecurityUtil.isOriginalTGT(ticket)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Found tgt " + ticket); - } return ticket; } }