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 354C89712 for ; Tue, 27 Sep 2011 22:08:55 +0000 (UTC) Received: (qmail 50256 invoked by uid 500); 27 Sep 2011 22:08:55 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 50222 invoked by uid 500); 27 Sep 2011 22:08:54 -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 50215 invoked by uid 99); 27 Sep 2011 22:08:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Sep 2011 22:08:54 +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; Tue, 27 Sep 2011 22:08:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D2DB23888FE for ; Tue, 27 Sep 2011 22:08:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1176641 - in /hadoop/common/branches/branch-0.20-security: ./ CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java src/mapred/ Date: Tue, 27 Sep 2011 22:08:29 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110927220829.9D2DB23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: suresh Date: Tue Sep 27 22:08:28 2011 New Revision: 1176641 URL: http://svn.apache.org/viewvc?rev=1176641&view=rev Log: Merging change r1176638 for HDFS-2373 from 0.20.205 Modified: hadoop/common/branches/branch-0.20-security/ (props changed) hadoop/common/branches/branch-0.20-security/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java hadoop/common/branches/branch-0.20-security/src/mapred/ (props changed) Propchange: hadoop/common/branches/branch-0.20-security/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 22:08:28 2011 @@ -2,6 +2,6 @@ /hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413 -/hadoop/common/branches/branch-0.20-security-205:1176042,1176248 +/hadoop/common/branches/branch-0.20-security-205:1176042,1176248,1176638 /hadoop/core/branches/branch-0.19:713112 /hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1176641&r1=1176640&r2=1176641&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Tue Sep 27 22:08:28 2011 @@ -254,6 +254,9 @@ Release 0.20.205.0 - unreleased HDFS-2375. Fix TestFileAppend4 failure. (suresh) + HDFS-2373. Commands using webhdfs and hftp print unnecessary debug + info on the console with security enabled. (Arpit Gupta via suresh) + IMPROVEMENTS MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf) Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 22:08:28 2011 @@ -2,7 +2,7 @@ /hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741 -/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1176042,1176248 +/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1176042,1176248,1176638 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 /hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java?rev=1176641&r1=1176640&r2=1176641&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java (original) +++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java Tue Sep 27 22:08:28 2011 @@ -129,29 +129,37 @@ public class DelegationTokenFetcher { for(Token token: readTokens(tokenFile, conf)) { if (token.isManaged()) { token.cancel(conf); - System.out.println("Cancelled token for " + token.getService()); + if(LOG.isDebugEnabled()) { + LOG.debug("Cancelled token for " + token.getService()); + } } } } else if (renew) { for(Token token: readTokens(tokenFile, conf)) { if (token.isManaged()) { token.renew(conf); - System.out.println("Renewed token for " + token.getService()); + if(LOG.isDebugEnabled()) { + LOG.debug("Renewed token for " + token.getService()); + } } } } else { if (webUrl != null) { getDTfromRemote(webUrl, null). writeTokenStorageFile(tokenFile, conf); - System.out.println("Fetched token via http for " + webUrl); + if(LOG.isDebugEnabled()) { + LOG.debug("Fetched token via http for " + webUrl); + } } else { FileSystem fs = FileSystem.get(conf); Token token = fs.getDelegationToken(ugi.getShortUserName()); Credentials cred = new Credentials(); cred.addToken(token.getService(), token); cred.writeTokenStorageFile(tokenFile, conf); - System.out.println("Fetched token for " + fs.getUri() + " into " + + if(LOG.isDebugEnabled()) { + LOG.debug("Fetched token for " + fs.getUri() + " into " + tokenFile); + } } } return null; @@ -176,7 +184,9 @@ public class DelegationTokenFetcher { } else { url.append(nnAddr).append(GetDelegationTokenServlet.PATH_SPEC); } - System.out.println("Retrieving token from: " + url); + if(LOG.isDebugEnabled()) { + LOG.debug("Retrieving token from: " + url); + } URL remoteURL = new URL(url.toString()); SecurityUtil.fetchServiceTicket(remoteURL); URLConnection connection = remoteURL.openConnection(); Propchange: hadoop/common/branches/branch-0.20-security/src/mapred/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 22:08:28 2011 @@ -2,7 +2,7 @@ /hadoop/common/branches/branch-0.20-append/src/mapred:955380,955398,955448,956329 /hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115 /hadoop/common/branches/branch-0.20-security-204/src/mapred:1128390 -/hadoop/common/branches/branch-0.20-security-205/src/mapred:1176042,1176248 +/hadoop/common/branches/branch-0.20-security-205/src/mapred:1176042,1176248,1176638 /hadoop/core/branches/branch-0.19/src/mapred:713112 /hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 /hadoop/mapreduce/trunk/src/java:808650