hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r765952 - in /hadoop/core/branches/branch-0.20: ./ src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/
Date Fri, 17 Apr 2009 11:26:33 GMT
Author: ddas
Date: Fri Apr 17 11:26:32 2009
New Revision: 765952

URL: http://svn.apache.org/viewvc?rev=765952&view=rev
Log:
Merge -r 765950:765951 from trunk onto 0.20 branch. Fixes HADOOP-5646.

Modified:
    hadoop/core/branches/branch-0.20/   (props changed)
    hadoop/core/branches/branch-0.20/CHANGES.txt   (contents, props changed)
    hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java
    hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java

Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 11:26:32 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=765952&r1=765951&r2=765952&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Fri Apr 17 11:26:32 2009
@@ -875,6 +875,9 @@
     HADOOP-5655. TestMRServerPorts fails on java.net.BindException. (Devaraj
     Das via hairong)
 
+    HADOOP-5646. Fixes a problem in TestQueueCapacities. 
+    (Vinod Kumar Vavilapalli via ddas)
+
 Release 0.19.2 - Unreleased
 
   BUG FIXES

Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 11:26:32 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951

Modified: hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java?rev=765952&r1=765951&r2=765952&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java
Fri Apr 17 11:26:32 2009
@@ -47,7 +47,6 @@
 
   static final Log LOG = LogFactory.getLog(ClusterWithCapacityScheduler.class);
   private MiniMRCluster mrCluster;
-  private MiniDFSCluster dfsCluster;
 
   private JobConf jobConf;
 
@@ -71,7 +70,7 @@
   protected void startCluster(Properties clusterProperties,
       Properties schedulerProperties)
       throws IOException {
-    startCluster(2, 2, clusterProperties, schedulerProperties);
+    startCluster(2, clusterProperties, schedulerProperties);
   }
 
   /**
@@ -81,12 +80,11 @@
    * user provided properties are missing (null/empty)
    * 
    * @param numTaskTrackers
-   * @param numDataNodes
    * @param clusterProperties
    * @param schedulerProperties
    * @throws IOException
    */
-  protected void startCluster(int numTaskTrackers, int numDataNodes,
+  protected void startCluster(int numTaskTrackers,
       Properties clusterProperties, Properties schedulerProperties)
       throws IOException {
     Thread.currentThread().setContextClassLoader(
@@ -99,7 +97,6 @@
         clusterConf.set(key, (String) clusterProperties.get(key));
       }
     }
-    dfsCluster = new MiniDFSCluster(clusterConf, numDataNodes, true, null);
 
     if (schedulerProperties != null) {
       setUpSchedulerConfigFile(schedulerProperties);
@@ -108,23 +105,22 @@
     clusterConf.set("mapred.jobtracker.taskScheduler",
         CapacityTaskScheduler.class.getName());
     mrCluster =
-        new MiniMRCluster(numTaskTrackers, dfsCluster.getFileSystem().getUri()
-            .toString(), 1, null, null, clusterConf);
+        new MiniMRCluster(numTaskTrackers, "file:///", 1, null, null,
+            clusterConf);
 
     this.jobConf = mrCluster.createJobConf(clusterConf);
   }
 
   private void setUpSchedulerConfigFile(Properties schedulerConfProps)
       throws IOException {
-    Configuration config = new Configuration(false);
-
-    LocalFileSystem fs = FileSystem.getLocal(config);
+    LocalFileSystem fs = FileSystem.getLocal(new Configuration());
 
     String myResourcePath = System.getProperty("test.build.data");
     Path schedulerConfigFilePath =
         new Path(myResourcePath, CapacitySchedulerConf.SCHEDULER_CONF_FILE);
     OutputStream out = fs.create(schedulerConfigFilePath);
 
+    Configuration config = new Configuration(false);
     for (Enumeration<?> e = schedulerConfProps.propertyNames(); e
         .hasMoreElements();) {
       String key = (String) e.nextElement();
@@ -141,9 +137,7 @@
   }
 
   private void cleanUpSchedulerConfigFile() throws IOException {
-    Configuration config = new Configuration(false);
-
-    LocalFileSystem fs = FileSystem.getLocal(config);
+    LocalFileSystem fs = FileSystem.getLocal(new Configuration());
 
     String myResourcePath = System.getProperty("test.build.data");
     Path schedulerConfigFilePath =
@@ -167,9 +161,6 @@
     if (mrCluster != null) {
       mrCluster.shutdown();
     }
-    if (dfsCluster != null) {
-      dfsCluster.shutdown();
-    }
   }
 
   /**
@@ -232,4 +223,4 @@
       return super.findResource(name);
     }
   }
-}
\ No newline at end of file
+}

Modified: hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java?rev=765952&r1=765951&r2=765952&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java
Fri Apr 17 11:26:32 2009
@@ -51,7 +51,7 @@
     clusterProps.put("mapred.tasktracker.reduce.tasks.maximum", String
         .valueOf(3));
     // cluster capacity 12 maps, 12 reduces
-    startCluster(4, 2, clusterProps, schedulerProps);
+    startCluster(4, clusterProps, schedulerProps);
 
     ControlledMapReduceJobRunner jobRunner =
         ControlledMapReduceJobRunner.getControlledMapReduceJobRunner(
@@ -126,7 +126,7 @@
     clusterProps.put("mapred.tasktracker.reduce.tasks.maximum", String
         .valueOf(0));
     // cluster capacity 12 maps, 0 reduces
-    startCluster(4, 2, clusterProps, schedulerProps);
+    startCluster(4, clusterProps, schedulerProps);
 
     singleQMultipleJobs1();
     singleQMultipleJobs2();
@@ -166,7 +166,7 @@
 
     // cluster capacity 10 maps, 10 reduces and 4 queues with capacities 1, 2,
     // 3, 4 respectively.
-    startCluster(5, 2, clusterProps, schedulerProps);
+    startCluster(5, clusterProps, schedulerProps);
 
     multipleQsWithOneQBeyondCapacity(queues);
     multipleQueuesWithinCapacities(queues);
@@ -437,4 +437,4 @@
       numTasks += 1;
     }
   }
-}
\ No newline at end of file
+}



Mime
View raw message