svn commit: r1390009 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java

[acmurthy]

Author: acmurthy
Date: Tue Sep 25 17:26:18 2012
New Revision: 1390009

URL: http://svn.apache.org/viewvc?rev=1390009&view=rev
Log:
Merge -c 1374095 from branch-1 to branch-1.1 to fix MAPREDUCE-4558. Disable 
TestJobTrackerSafeMode.

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt
    
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.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=1390009&r1=1390008&r2=1390009&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Tue Sep 25 17:26:18 2012
@@ -368,6 +368,8 @@ Release 1.1.0 - 2012.09.16
     MAPREDUCE-3837. Job tracker is not able to recover job in case of crash
     and after that no user can submit job. (Mayank Bansal via tomwhite)
 
+    MAPREDUCE-4558. Disable TestJobTrackerSafeMode (sseth)
+
 Release 1.0.4 - Unreleased
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java?rev=1390009&r1=1390008&r2=1390009&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java
 (original)
+++ 
hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java
 Tue Sep 25 17:26:18 2012
@@ -35,6 +35,7 @@ import org.junit.*;
  * join back.
  */
 
+@Ignore
 public class TestJobTrackerSafeMode extends TestCase {
   final Path testDir = 
     new Path(System.getProperty("test.build.data", "/tmp"), "jt-safemode");
@@ -197,7 +198,7 @@ public class TestJobTrackerSafeMode exte
 
   private boolean checkTrackers(JobTracker jobtracker, Set<String> present, 
                                 Set<String> absent) {
-    while (jobtracker.getClusterStatus(true).getActiveTrackerNames().size() != 
2) {
+    while (jobtracker.getClusterStatus(true).getActiveTrackerNames().size() != 
3) {
       LOG.info("Waiting for Initialize all Task Trackers");
       UtilsForTests.waitFor(1000);
     }