svn commit: r1077583 - in /hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred: TestDistributedCacheModifiedFile.java TestDistributedCachePrivateFile.java TestDistributedCacheUnModifiedFile.java

[omalley]

Author: omalley
Date: Fri Mar  4 04:31:37 2011
New Revision: 1077583

URL: http://svn.apache.org/viewvc?rev=1077583&view=rev
Log:
commit a39cb61f9226909f13270569e8b31f31596fd34b
Author: Iyappan Srinivasan <iyapp...@yahoo-inc.com>
Date:   Fri Jul 23 06:36:26 2010 +0000

    MAPREDUCE-1934 
https://issues.apache.org/jira/secure/attachment/12449227/DistributedCacheTiming.patch

Modified:
    
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java
    
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java
    
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java?rev=1077583&r1=1077582&r2=1077583&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java
 Fri Mar  4 04:31:37 2011
@@ -98,10 +98,12 @@ public class TestDistributedCacheModifie
     //Stopping all TTs
     for (TTClient tt : tts) {
       tt.kill();
+      tt.waitForTTStop();
     }
     //Starting all TTs
     for (TTClient tt : tts) {
       tt.start();
+      tt.waitForTTStart();
     }
     //Waiting for 5 seconds to make sure tasktrackers are ready 
     Thread.sleep(5000);
@@ -116,10 +118,12 @@ public class TestDistributedCacheModifie
     //Stopping all TTs
     for (TTClient tt : tts) {
       tt.kill();
+      tt.waitForTTStop();
     }
     //Starting all TTs
     for (TTClient tt : tts) {
       tt.start();
+      tt.waitForTTStart();
     }
   }
 

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java?rev=1077583&r1=1077582&r2=1077583&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java
 Fri Mar  4 04:31:37 2011
@@ -85,10 +85,12 @@ public class TestDistributedCachePrivate
     //Stopping all TTs
     for (TTClient tt : tts) {
       tt.kill();
+      tt.waitForTTStop();
     }
     //Starting all TTs
     for (TTClient tt : tts) {
       tt.start();
+      tt.waitForTTStart();
     }
 
     String input = "This will be the content of\n" + "distributed cache\n";
@@ -106,10 +108,12 @@ public class TestDistributedCachePrivate
     //Stopping all TTs
     for (TTClient tt : tts) {
       tt.kill();
+      tt.waitForTTStop();
     }
     //Starting all TTs
     for (TTClient tt : tts) {
       tt.start();
+      tt.waitForTTStart();
     }
   }
 

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java?rev=1077583&r1=1077582&r2=1077583&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java
 Fri Mar  4 04:31:37 2011
@@ -97,10 +97,12 @@ public class TestDistributedCacheUnModif
     //Stopping all TTs
     for (TTClient tt : tts) {
       tt.kill();
+      tt.waitForTTStop();
     }
     //Starting all TTs
     for (TTClient tt : tts) {
       tt.start();
+      tt.waitForTTStart();
     }
    
     //Waiting for 5 seconds to make sure tasktrackers are ready
@@ -121,10 +123,12 @@ public class TestDistributedCacheUnModif
     //Stopping all TTs
     for (TTClient tt : tts) {
       tt.kill();
+      tt.waitForTTStop();
     }
     //Starting all TTs
     for (TTClient tt : tts) {
       tt.start();
+      tt.waitForTTStart();
     }
   }