hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdoug...@apache.org
Subject svn commit: r925561 - in /hadoop/mapreduce/trunk: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java
Date Sat, 20 Mar 2010 07:25:12 GMT
Author: cdouglas
Date: Sat Mar 20 07:25:12 2010
New Revision: 925561

URL: http://svn.apache.org/viewvc?rev=925561&view=rev
Log:
MAPREDUCE-1420. Fix TestTTResourceReporting failure. Contributed by Scott Chen

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=925561&r1=925560&r2=925561&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Sat Mar 20 07:25:12 2010
@@ -480,6 +480,9 @@ Trunk (unreleased changes)
     MAPREDUCE-1497. Suppress spurious findbugs warning about IndexCache
     synchronization. (Amareshwari Sriramadasu via cdouglas)
 
+    MAPREDUCE-1420. Fix TestTTResourceReporting failure. (Scott Chen via
+    cdouglas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java?rev=925561&r1=925560&r2=925561&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java
(original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTTResourceReporting.java
Sat Mar 20 07:25:12 2010
@@ -120,11 +120,11 @@ public class TestTTResourceReporting ext
       float reportedCpuUsage = status.getResourceStatus().getCpuUsage();
 
       message =
-          "expected memory values : "
+          "expected values : "
               + "(totalVirtualMemoryOnTT, totalPhysicalMemoryOnTT, "
               + "availableVirtualMemoryOnTT, availablePhysicalMemoryOnTT, "
               + "mapSlotMemSize, reduceSlotMemorySize, cumulativeCpuTime, "
-              + "cpuFrequency, numProcessors) = ("
+              + "cpuFrequency, numProcessors, cpuUsage) = ("
               + totalVirtualMemoryOnTT + ", "
               + totalPhysicalMemoryOnTT + ","
               + availableVirtualMemoryOnTT + ", "
@@ -137,12 +137,12 @@ public class TestTTResourceReporting ext
               + cpuUsage
               +")";
       message +=
-          "\nreported memory values : "
+          "\nreported values : "
               + "(totalVirtualMemoryOnTT, totalPhysicalMemoryOnTT, "
               + "availableVirtualMemoryOnTT, availablePhysicalMemoryOnTT, "
               + "reportedMapSlotMemorySize, reportedReduceSlotMemorySize, "
               + "reportedCumulativeCpuTime, reportedCpuFrequency, "
-              + "reportedNumProcessors) = ("
+              + "reportedNumProcessors, cpuUsage) = ("
               + reportedTotalVirtualMemoryOnTT + ", "
               + reportedTotalPhysicalMemoryOnTT + ","
               + reportedAvailableVirtualMemoryOnTT + ", "
@@ -161,7 +161,6 @@ public class TestTTResourceReporting ext
           || totalPhysicalMemoryOnTT != reportedTotalPhysicalMemoryOnTT
           || mapSlotMemorySize != reportedMapSlotMemorySize
           || reduceSlotMemorySize != reportedReduceSlotMemorySize
-          || cpuFrequency != reportedCpuFrequency
           || numProcessors != reportedNumProcessors) {
         hasPassed = false;
       }
@@ -170,6 +169,7 @@ public class TestTTResourceReporting ext
       if (availableVirtualMemoryOnTT != reportedAvailableVirtualMemoryOnTT
           || availablePhysicalMemoryOnTT != reportedAvailablePhysicalMemoryOnTT
           || cumulativeCpuTime != reportedCumulativeCpuTime
+          || cpuFrequency != reportedCpuFrequency
           || cpuUsage != reportedCpuUsage) {
         hasDynamicValuePassed = false;
       }
@@ -260,10 +260,9 @@ public class TestTTResourceReporting ext
 
     JobConf conf = new JobConf();
     LinuxResourceCalculatorPlugin plugin = new LinuxResourceCalculatorPlugin();
-    // In this case, we only check these four fields because they are static
+    // In this case, we only check these three fields because they are static
     conf.setLong("totalVmemOnTT", plugin.getVirtualMemorySize());
     conf.setLong("totalPmemOnTT", plugin.getPhysicalMemorySize());
-    conf.setLong("cpuFrequency", plugin.getCpuFrequency());
     conf.setLong("numProcessors", plugin.getNumProcessors());
 
     try {



Mime
View raw message