Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 96085 invoked from network); 4 Mar 2011 04:00:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 04:00:09 -0000 Received: (qmail 64316 invoked by uid 500); 4 Mar 2011 04:00:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 64284 invoked by uid 500); 4 Mar 2011 04:00:08 -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 64271 invoked by uid 99); 4 Mar 2011 04:00:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:00:08 +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; Fri, 04 Mar 2011 04:00:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 60CA02388C1C; Fri, 4 Mar 2011 03:59:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077283 - /hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java Date: Fri, 04 Mar 2011 03:59:38 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304035938.60CA02388C1C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 03:59:38 2011 New Revision: 1077283 URL: http://svn.apache.org/viewvc?rev=1077283&view=rev Log: commit 1d06fd35b194b07d94194ab6ae493f5c8d4605d9 Author: Sharad Agarwal Date: Fri Mar 5 14:25:07 2010 +0530 patch from Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java?rev=1077283&r1=1077282&r2=1077283&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java Fri Mar 4 03:59:38 2011 @@ -123,14 +123,12 @@ public class JTClient extends MRDaemonCl public void verifyRunningJob(JobID jobId) throws Exception { } - private boolean checkJobValidityForProceeding(JobID jobId, JobInfo jobInfo) - throws IOException { - if (jobInfo != null) { - return true; - } else if (jobInfo == null && !getProxy().isJobRetired(jobId)) { + private JobInfo getJobInfo(JobID jobId) throws IOException { + JobInfo info = getProxy().getJobInfo(jobId); + if (info == null && !getProxy().isJobRetired(jobId)) { Assert.fail("Job id : " + jobId + " has never been submitted to JT"); } - return false; + return info; } /** @@ -166,16 +164,16 @@ public class JTClient extends MRDaemonCl org.apache.hadoop.mapred.JobID.downgrade(id)); } verifyJobDetails(id); - JobInfo jobInfo = getProxy().getJobInfo(id); - if(jobInfo == null && - !getProxy().isJobRetired(id)) { - Assert.fail("The passed job id : " + id + - " is not submitted to JT."); - } - while(!jobInfo.isHistoryFileCopied()) { - Thread.sleep(1000); - LOG.info(id+" waiting for history file to copied"); - jobInfo = getProxy().getJobInfo(id); + JobInfo jobInfo = getJobInfo(id); + if(jobInfo != null) { + while(!jobInfo.isHistoryFileCopied()) { + Thread.sleep(1000); + LOG.info(id+" waiting for history file to copied"); + jobInfo = getJobInfo(id); + if(jobInfo == null) { + break; + } + } } verifyJobHistory(id); } @@ -192,14 +190,17 @@ public class JTClient extends MRDaemonCl */ public void verifyJobDetails(JobID jobId) throws Exception { // wait till the setup is launched and finished. - JobInfo jobInfo = getProxy().getJobInfo(jobId); - if(!checkJobValidityForProceeding(jobId, jobInfo)){ + JobInfo jobInfo = getJobInfo(jobId); + if(jobInfo == null){ return; } LOG.info("waiting for the setup to be finished"); while (!jobInfo.isSetupFinished()) { Thread.sleep(2000); - jobInfo = getProxy().getJobInfo(jobId); + jobInfo = getJobInfo(jobId); + if(jobInfo == null) { + break; + } } // verify job id. assertTrue(jobId.toString().startsWith("job_")); @@ -208,11 +209,16 @@ public class JTClient extends MRDaemonCl verifyNumTasks(jobId); // should verify job progress. verifyJobProgress(jobId); - jobInfo = getProxy().getJobInfo(jobId); + jobInfo = getJobInfo(jobId); + if(jobInfo == null) { + return; + } if (jobInfo.getStatus().getRunState() == JobStatus.SUCCEEDED) { // verify if map/reduce progress reached 1. - jobInfo = getProxy().getJobInfo(jobId); - checkJobValidityForProceeding(jobId, jobInfo); + jobInfo = getJobInfo(jobId); + if (jobInfo == null) { + return; + } assertEquals(1.0, jobInfo.getStatus().mapProgress(), 0.001); assertEquals(1.0, jobInfo.getStatus().reduceProgress(), 0.001); // verify successful finish of tasks. @@ -220,8 +226,10 @@ public class JTClient extends MRDaemonCl } if (jobInfo.getStatus().isJobComplete()) { // verify if the cleanup is launched. - jobInfo = getProxy().getJobInfo(jobId); - checkJobValidityForProceeding(jobId, jobInfo); + jobInfo = getJobInfo(jobId); + if (jobInfo == null) { + return; + } assertTrue(jobInfo.isCleanupLaunched()); LOG.info("Verified launching of cleanup"); } @@ -229,9 +237,8 @@ public class JTClient extends MRDaemonCl public void verifyAllTasksSuccess(JobID jobId) throws IOException { - JobInfo jobInfo = getProxy().getJobInfo(jobId); - - if(!checkJobValidityForProceeding(jobId, jobInfo)){ + JobInfo jobInfo = getJobInfo(jobId); + if (jobInfo == null) { return; } @@ -259,8 +266,8 @@ public class JTClient extends MRDaemonCl public void verifyJobProgress(JobID jobId) throws IOException { JobInfo jobInfo; - jobInfo = getProxy().getJobInfo(jobId); - if(!checkJobValidityForProceeding(jobId, jobInfo)){ + jobInfo = getJobInfo(jobId); + if (jobInfo == null) { return; } assertTrue(jobInfo.getStatus().mapProgress() >= 0 && jobInfo.getStatus() @@ -275,8 +282,8 @@ public class JTClient extends MRDaemonCl public void verifyNumTasks(JobID jobId) throws IOException { JobInfo jobInfo; - jobInfo = getProxy().getJobInfo(jobId); - if(!checkJobValidityForProceeding(jobId, jobInfo)) { + jobInfo = getJobInfo(jobId); + if (jobInfo == null) { return; } assertEquals(jobInfo.numMaps(), (jobInfo.runningMaps() @@ -299,13 +306,9 @@ public class JTClient extends MRDaemonCl * @throws IOException */ public void verifyJobHistory(JobID jobId) throws IOException { - JobInfo info = getProxy().getJobInfo(jobId); + JobInfo info = getJobInfo(jobId); String url =""; - info = getProxy().getJobInfo(jobId); - if(info == null && !getProxy().isJobRetired(jobId)) { - Assert.fail("Job id : " + jobId + - " has never been submitted to JT"); - } else if(info == null) { + if(info == null) { LOG.info("Job has been retired from JT memory : " + jobId); url = getProxy().getJobHistoryLocationForRetiredJob(jobId); } else {