You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ss...@apache.org on 2012/12/05 23:25:13 UTC
svn commit: r1417674 - in /hadoop/common/branches/branch-1.1: CHANGES.txt
src/test/org/apache/hadoop/mapred/TestMRServerPorts.java
Author: sseth
Date: Wed Dec 5 22:25:12 2012
New Revision: 1417674
URL: http://svn.apache.org/viewvc?rev=1417674&view=rev
Log:
merge MAPREDUCE-4696 from branch-1. Fixed a failing unit test - TestMRServerPorts. (Contributed by Gopal V)
Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1417674&r1=1417673&r2=1417674&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Wed Dec 5 22:25:12 2012
@@ -41,6 +41,9 @@ Release 1.1.2 - 2012.12.05
MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under
control. (Liyin Liang via vinodkv)
+ MAPREDUCE-4696. Fixed a failing unit test - TestMRServerPorts
+ (Gopal V via sseth)
+
Release 1.1.1 - 2012.11.18
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java?rev=1417674&r1=1417673&r2=1417674&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java (original)
+++ hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java Wed Dec 5 22:25:12 2012
@@ -18,6 +18,8 @@
package org.apache.hadoop.mapred;
import java.io.IOException;
+import java.util.Date;
+import java.text.SimpleDateFormat;
import junit.framework.TestCase;
import org.apache.hadoop.hdfs.TestHDFSServerPorts;
import org.apache.hadoop.hdfs.server.datanode.DataNode;
@@ -62,7 +64,8 @@ public class TestMRServerPorts extends T
conf.set("mapred.job.tracker.http.address", "0.0.0.0:0");
JobTracker jt = null;
try {
- jt = JobTracker.startTracker(conf);
+ String uniqid = new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
+ jt = JobTracker.startTracker(conf, uniqid, true);
runner.setJobTracker(jt);
runner.start();
conf.set("mapred.job.tracker", "localhost:" + jt.getTrackerPort());
@@ -90,7 +93,8 @@ public class TestMRServerPorts extends T
throws IOException, InterruptedException {
JobTracker jt = null;
try {
- jt = JobTracker.startTracker(conf);
+ String uniqid = new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
+ jt = JobTracker.startTracker(conf, uniqid, true);
} catch(IOException e) {
if (e instanceof java.net.BindException)
return false;