hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r510622 - in /lucene/hadoop/trunk: CHANGES.txt src/test/hadoop-site.xml src/test/org/apache/hadoop/dfs/MiniDFSCluster.java src/test/org/apache/hadoop/ipc/TestRPC.java src/test/org/apache/hadoop/mapred/MiniMRCluster.java
Date Thu, 22 Feb 2007 18:50:10 GMT
Author: cutting
Date: Thu Feb 22 10:50:09 2007
New Revision: 510622

URL: http://svn.apache.org/viewvc?view=rev&rev=510622
Log:
HADOOP-1030.  In unit tests, unify setting of ipc.client.timeout.  Also increase the value
used from one to two seconds.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/test/hadoop-site.xml
    lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
    lucene/hadoop/trunk/src/test/org/apache/hadoop/ipc/TestRPC.java
    lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=510622&r1=510621&r2=510622
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Feb 22 10:50:09 2007
@@ -105,6 +105,10 @@
 31. HADOOP-564.  Replace uses of "dfs://" URIs with the more standard
     "hdfs://".  (Wendy Chien via cutting)
 
+32. HADOOP-1030.  In unit tests, unify setting of ipc.client.timeout.
+    Also increase the value used from one to two seconds, in hopes of
+    making tests complete more reliably.  (cutting)
+
 
 Release 0.11.2 - 2007-02-16
 

Modified: lucene/hadoop/trunk/src/test/hadoop-site.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/hadoop-site.xml?view=diff&rev=510622&r1=510621&r2=510622
==============================================================================
--- lucene/hadoop/trunk/src/test/hadoop-site.xml (original)
+++ lucene/hadoop/trunk/src/test/hadoop-site.xml Thu Feb 22 10:50:09 2007
@@ -15,6 +15,12 @@
 </property>
 
 <property>
+  <name>ipc.client.timeout</name>
+  <value>2000</value>
+  <description>Decreased value to speed unit tests.</description>
+</property>
+
+<property>
   <name>test.fs.s3.name</name>
   <value>s3:///</value>
   <description>The name of the s3 file system for testing.</description>

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java?view=diff&rev=510622&r1=510621&r2=510622
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java Thu Feb 22 10:50:09
2007
@@ -215,9 +215,6 @@
         new File(base_dir, "name2").getPath());
     conf.setInt("dfs.replication", Math.min(3, nDatanodes));
     conf.setInt("dfs.safemode.extension", 0);
-    // this timeout seems to control the minimum time for the test, so
-    // decrease it considerably.
-    conf.setInt("ipc.client.timeout", 1000);
 
     // Loops until we find ports that work or we give up because 
     // too many tries have failed.

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/ipc/TestRPC.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/ipc/TestRPC.java?view=diff&rev=510622&r1=510621&r2=510622
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/ipc/TestRPC.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/ipc/TestRPC.java Thu Feb 22 10:50:09 2007
@@ -44,11 +44,6 @@
   
   private static Configuration conf = new Configuration();
 
-  // quiet during testing, since output ends up on console
-  static {
-    conf.setInt("ipc.client.timeout", 5000);
-  }
-
   public TestRPC(String name) { super(name); }
 	
   public interface TestProtocol extends VersionedProtocol {

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?view=diff&rev=510622&r1=510621&r2=510622
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Thu Feb 22 10:50:09
2007
@@ -213,9 +213,6 @@
       result.set("fs.default.name", namenode);
       result.set("mapred.job.tracker", "localhost:"+jobTrackerPort);
       result.set("mapred.job.tracker.info.port", jobTrackerInfoPort);
-      // this timeout controls the minimum time for the test, so
-      // set it down at 1 seconds.
-      result.setInt("ipc.client.timeout", 1000);
       // for debugging have all task output sent to the test output
       JobClient.setTaskOutputFilter(result, JobClient.TaskStatusFilter.ALL);
       return result;



Mime
View raw message