Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 91498 invoked from network); 12 Feb 2009 14:10:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Feb 2009 14:10:32 -0000 Received: (qmail 13746 invoked by uid 500); 12 Feb 2009 14:10:21 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 13707 invoked by uid 500); 12 Feb 2009 14:10:21 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 13684 invoked by uid 99); 12 Feb 2009 14:10:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Feb 2009 06:10:21 -0800 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; Thu, 12 Feb 2009 14:10:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B5A0B23889C1; Thu, 12 Feb 2009 14:09:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r743754 - in /hadoop/core/branches/branch-0.19: ./ CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobTracker.java src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java Date: Thu, 12 Feb 2009 14:09:57 -0000 To: core-commits@hadoop.apache.org From: yhemanth@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090212140957.B5A0B23889C1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: yhemanth Date: Thu Feb 12 14:09:56 2009 New Revision: 743754 URL: http://svn.apache.org/viewvc?rev=743754&view=rev Log: Merge -r 743744:743745 from trunk to branch 0.19 to fix HADOOP-5166. Modified: hadoop/core/branches/branch-0.19/ (props changed) hadoop/core/branches/branch-0.19/CHANGES.txt (contents, props changed) hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java Propchange: hadoop/core/branches/branch-0.19/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 12 14:09:56 2009 @@ -1 +1 @@ -/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,709040,709303,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,736426,738697,740077,741703,741762 +/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,709040,709303,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,736426,738697,740077,741703,741762,743745 Modified: hadoop/core/branches/branch-0.19/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=743754&r1=743753&r2=743754&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Feb 12 14:09:56 2009 @@ -99,6 +99,9 @@ HADOOP-4494. Allow libhdfs to append to files. (Pete Wyckoff via dhruba) + HADOOP-5166. Fix JobTracker restart to work when ACLs are configured + for the JobTracker. (Amar Kamat via yhemanth). + Release 0.19.0 - 2008-11-18 INCOMPATIBLE CHANGES Propchange: hadoop/core/branches/branch-0.19/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 12 14:09:56 2009 @@ -1,2 +1,2 @@ /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 -/hadoop/core/trunk/CHANGES.txt:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,708723,709040,709303,711717,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,735082,736426,738697,740077,741703,741762,743296 +/hadoop/core/trunk/CHANGES.txt:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,708723,709040,709303,711717,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,735082,736426,738697,740077,741703,741762,743296,743745 Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=743754&r1=743753&r2=743754&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original) +++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java Thu Feb 12 14:09:56 2009 @@ -2261,6 +2261,10 @@ } JobInProgress job = new JobInProgress(jobId, this, this.conf); + + // check for access + checkAccess(job, QueueManager.QueueOperation.SUBMIT_JOB); + return addJob(jobId, job); } @@ -2272,7 +2276,6 @@ private synchronized JobStatus addJob(JobID jobId, JobInProgress job) throws IOException { totalSubmissions++; - checkAccess(job, QueueManager.QueueOperation.SUBMIT_JOB); synchronized (jobs) { synchronized (taskScheduler) { Modified: hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java?rev=743754&r1=743753&r2=743754&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java (original) +++ hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java Thu Feb 12 14:09:56 2009 @@ -26,6 +26,7 @@ import org.apache.hadoop.mapred.SortValidator.RecordStatsChecker.NonSplitableSequenceFileInputFormat; import org.apache.hadoop.mapred.ThreadedMapBenchmark.RandomInputFormat; import org.apache.hadoop.mapred.lib.IdentityReducer; +import org.apache.hadoop.security.UserGroupInformation; import junit.framework.TestCase; import java.io.*; @@ -670,6 +671,10 @@ jtConf.set("mapred.jobtracker.job.history.buffer.size", "1024"); jtConf.setInt("mapred.tasktracker.reduce.tasks.maximum", 1); jtConf.setLong("mapred.tasktracker.expiry.interval", 25 * 1000); + jtConf.setBoolean("mapred.acls.enabled", true); + // get the user group info + UserGroupInformation ugi = UserGroupInformation.getCurrentUGI(); + jtConf.set("mapred.queue.default.acl-submit-job", ugi.getUserName()); mr = new MiniMRCluster(1, namenode, 1, null, null, jtConf);