From e2beaf79767a5c31710724ddbbfdf37bd84a1b42 Mon Sep 17 00:00:00 2001 From: Siddharth Seth Date: Fri, 17 Feb 2012 01:03:00 +0000 Subject: [PATCH] merge MAPREDUCE-3856 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245277 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 4 +++ .../hadoop/mapred/ClientServiceDelegate.java | 4 +-- .../hadoop/mapreduce/v2/TestMRJobs.java | 31 +++++++++++++++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c013ffc19fc..78f5ac4227a 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -26,6 +26,10 @@ Release 0.23.2 - UNRELEASED MAPREDUCE-3864. Fix cluster setup docs for correct SecondaryNameNode HTTPS parameters. (todd) + MAPREDUCE-3856. Instances of RunningJob class givs incorrect job tracking + urls when mutiple jobs are submitted from same client jvm. (Eric Payne via + sseth) + Release 0.23.1 - 2012-02-08 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java index b308c1a074c..39e32515d14 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java @@ -81,8 +81,7 @@ public class ClientServiceDelegate { private static final Log LOG = LogFactory.getLog(ClientServiceDelegate.class); // Caches for per-user NotRunningJobs - private static HashMap> notRunningJobs = - new HashMap>(); + private HashMap> notRunningJobs; private final Configuration conf; private final JobID jobId; @@ -108,6 +107,7 @@ public class ClientServiceDelegate { this.jobId = jobId; this.historyServerProxy = historyServerProxy; this.appId = TypeConverter.toYarn(jobId).getAppId(); + notRunningJobs = new HashMap>(); } // Get the instance of the NotRunningJob corresponding to the specified diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java index 562e865410d..59b8689b20d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java @@ -148,10 +148,15 @@ public class TestMRJobs { job.addFileToClassPath(APP_JAR); // The AppMaster jar itself. job.setJarByClass(SleepJob.class); job.setMaxMapAttempts(1); // speed up failures - job.waitForCompletion(true); + job.submit(); + String trackingUrl = job.getTrackingURL(); + String jobId = job.getJobID().toString(); boolean succeeded = job.waitForCompletion(true); Assert.assertTrue(succeeded); Assert.assertEquals(JobStatus.State.SUCCEEDED, job.getJobState()); + Assert.assertTrue("Tracking URL was " + trackingUrl + + " but didn't Match Job ID " + jobId , + trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/")); verifySleepJobCounters(job); verifyTaskProgress(job); @@ -209,9 +214,15 @@ public class TestMRJobs { job.addFileToClassPath(APP_JAR); // The AppMaster jar itself. job.setJarByClass(RandomTextWriterJob.class); job.setMaxMapAttempts(1); // speed up failures + job.submit(); + String trackingUrl = job.getTrackingURL(); + String jobId = job.getJobID().toString(); boolean succeeded = job.waitForCompletion(true); Assert.assertTrue(succeeded); Assert.assertEquals(JobStatus.State.SUCCEEDED, job.getJobState()); + Assert.assertTrue("Tracking URL was " + trackingUrl + + " but didn't Match Job ID " + jobId , + trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/")); // Make sure there are three files in the output-dir @@ -316,9 +327,14 @@ public class TestMRJobs { new Path(mrCluster.getTestWorkDir().getAbsolutePath(), "failmapper-output")); job.addFileToClassPath(APP_JAR); // The AppMaster jar itself. + job.submit(); + String trackingUrl = job.getTrackingURL(); + String jobId = job.getJobID().toString(); boolean succeeded = job.waitForCompletion(true); Assert.assertFalse(succeeded); - + Assert.assertTrue("Tracking URL was " + trackingUrl + + " but didn't Match Job ID " + jobId , + trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/")); return job; } @@ -360,8 +376,14 @@ public class TestMRJobs { // //Job with reduces // Job job = sleepJob.createJob(3, 2, 10000, 1, 10000, 1); job.addFileToClassPath(APP_JAR); // The AppMaster jar itself. + job.submit(); + String trackingUrl = job.getTrackingURL(); + String jobId = job.getJobID().toString(); job.waitForCompletion(true); Assert.assertEquals(JobStatus.State.SUCCEEDED, job.getJobState()); + Assert.assertTrue("Tracking URL was " + trackingUrl + + " but didn't Match Job ID " + jobId , + trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/")); return null; } }); @@ -444,7 +466,12 @@ public class TestMRJobs { job.setMaxMapAttempts(1); // speed up failures job.submit(); + String trackingUrl = job.getTrackingURL(); + String jobId = job.getJobID().toString(); Assert.assertTrue(job.waitForCompletion(false)); + Assert.assertTrue("Tracking URL was " + trackingUrl + + " but didn't Match Job ID " + jobId , + trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/")); } private Path createTempFile(String filename, String contents)