Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 3666 invoked from network); 14 Jul 2010 18:46:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Jul 2010 18:46:44 -0000 Received: (qmail 72433 invoked by uid 500); 14 Jul 2010 18:46:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 72409 invoked by uid 500); 14 Jul 2010 18:46:43 -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 72402 invoked by uid 99); 14 Jul 2010 18:46:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jul 2010 18:46:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 14 Jul 2010 18:46:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8C5B7238897A; Wed, 14 Jul 2010 18:45:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964131 - in /hadoop/common/branches/branch-0.21: ./ CHANGES.txt src/contrib/ec2/ src/docs/ src/java/ src/test/core/ src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java Date: Wed, 14 Jul 2010 18:45:47 -0000 To: common-commits@hadoop.apache.org From: cos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100714184547.8C5B7238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cos Date: Wed Jul 14 18:45:46 2010 New Revision: 964131 URL: http://svn.apache.org/viewvc?rev=964131&view=rev Log: HADOOP-6838. svn merge -c 964130 from trunk Modified: hadoop/common/branches/branch-0.21/ (props changed) hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.21/src/contrib/ec2/ (props changed) hadoop/common/branches/branch-0.21/src/docs/ (props changed) hadoop/common/branches/branch-0.21/src/java/ (props changed) hadoop/common/branches/branch-0.21/src/test/core/ (props changed) hadoop/common/branches/branch-0.21/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java Propchange: hadoop/common/branches/branch-0.21/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 18:45:46 2010 @@ -1,2 +1,2 @@ -/hadoop/common/trunk:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914 +/hadoop/common/trunk:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130 /hadoop/core/branches/branch-0.19/core:713112 Modified: hadoop/common/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=964131&r1=964130&r2=964131&view=diff ============================================================================== --- hadoop/common/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.21/CHANGES.txt Wed Jul 14 18:45:46 2010 @@ -908,6 +908,9 @@ Release 0.21.0 - 2010-07-01 BUG FIXES + HADOOP-6839. [Herriot] Implement a functionality for getting the user list + for creating proxy users. (Vinay Thota via cos) + HADOOP-6819. [Herriot] Shell command for getting the new exceptions in the logs returning exitcode 1 after executing successfully. (Vinay Thota via cos) Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 18:45:46 2010 @@ -1,4 +1,4 @@ -/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504,955438,961559,962914 +/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504,955438,961559,962914,964130 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 18:45:46 2010 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914 +/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112 /hadoop/core/trunk/src/contrib/ec2:776175-784663 Propchange: hadoop/common/branches/branch-0.21/src/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 18:45:46 2010 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914 +/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/branch-0.21/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 18:45:46 2010 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914 +/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130 /hadoop/core/branches/branch-0.19/core/src/java:713112 /hadoop/core/trunk/src/core:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.21/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 18:45:46 2010 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914 +/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278 Modified: hadoop/common/branches/branch-0.21/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java?rev=964131&r1=964130&r2=964131&view=diff ============================================================================== --- hadoop/common/branches/branch-0.21/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java (original) +++ hadoop/common/branches/branch-0.21/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java Wed Jul 14 18:45:46 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.test.system; import java.io.IOException; import java.io.File; import java.io.FileOutputStream; +import java.io.FileInputStream; +import java.io.DataInputStream; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -48,6 +50,8 @@ public abstract class AbstractDaemonClus private String newConfDir = null; private static final String CONF_HADOOP_LOCAL_DIR = "test.system.hdrc.hadoop.local.confdir"; + private static final String CONF_HADOOP_MULTI_USER_LIST = + "test.system.hdrc.multi-user.list.path"; private final static Object waitLock = new Object(); /** @@ -296,6 +300,30 @@ public abstract class AbstractDaemonClus } } } + + /** + * Get the multi users list. + * @return ArrayList - users list as a array list. + * @throws IOException - if an I/O error occurs. + */ + public ArrayList getHadoopMultiUsersList() throws + IOException { + String hadoopUserListPath = conf.get(CONF_HADOOP_MULTI_USER_LIST); + if (hadoopUserListPath == null || hadoopUserListPath.isEmpty()) { + LOG.error("Proxy user list path has not been passed for " + + CONF_HADOOP_MULTI_USER_LIST); + throw new IllegalArgumentException( + "Proxy user list hasn't been provided."); + } + File fileObj = new File(hadoopUserListPath); + DataInputStream disObj = new DataInputStream(new FileInputStream(fileObj)); + ArrayList usersList = new ArrayList(); + String strLine = null; + while((strLine = disObj.readLine()) != null){ + usersList.add(strLine.substring(0,strLine.indexOf(','))); + } + return usersList; + } /** * It's a local folder where the config file stores temporarily