hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1154062 - in /hadoop/common/branches/MR-279/mapreduce: ./ dev-support/ mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/ yarn/
Date Fri, 05 Aug 2011 01:20:47 GMT
Author: mahadev
Date: Fri Aug  5 01:20:46 2011
New Revision: 1154062

URL: http://svn.apache.org/viewvc?rev=1154062&view=rev
Log:
Fix findbugs warnings in mr-client modules part 2 (mahadev)

Modified:
    hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
    hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml
    hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/LegacyTaskRuntimeEstimator.java
    hadoop/common/branches/MR-279/mapreduce/pom.xml
    hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml

Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1154062&r1=1154061&r2=1154062&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Fri Aug  5 01:20:46 2011
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
 
   MAPREDUCE-279
  
+    Fix findbugs warnings in mr-client modules part 2 (mahadev)
+ 
     Fix findbugs warnings in mr-client modules, part 1  (mahadev) 
   
     MAPREDUCE-2776. Fix some of the yarn findbug warnings. (siddharth 

Modified: hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml?rev=1154062&r1=1154061&r2=1154062&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/dev-support/findbugs-exclude.xml Fri Aug  5 01:20:46
2011
@@ -388,4 +388,57 @@
        <Field name="started" />
        <Bug pattern="IS2_INCONSISTENT_SYNC" />
     </Match>
+  
+   <!-- Yarn excludes -->
+  <Match>
+    <Class name="org.apache.hadoop.mapreduce.v2.app.job.impl.TaskAttemptImpl" />
+    <Method name="computeSlotMillis" />
+    <Bug pattern="DB_DUPLICATE_BRACHES" />
+  </Match>
+
+  <Match>
+    <Class name="org.apache.hadoop.mapreduce.v2.app.MRAppMaster$1" />
+    <Bug pattern="DM_EXIT" />
+  </Match>
+
+  <Match>
+    <Class name="org.apache.hadoop.mapred.LocalContainerLauncher$SubtaskRunner" />
+    <Bug pattern="DM_EXIT" />
+  </Match>
+  <Match>
+    <Class name="~org\.apache\.hadoop\.mapreduce\.v2\.app\.job\.impl\.TaskImpl.*" />
+    <Bug pattern="BC_UNCONFIRMED_CAST" />
+  </Match>
+
+  <Match>
+    <Class name="~org\.apache\.hadoop\.mapreduce\.v2\.app\.job\.impl\.JobImpl.*" />
+    <Bug pattern="BC_UNCONFIRMED_CAST" />
+  </Match>
+  <Match>
+    <Class name="~org\.apache\.hadoop\.mapreduce\.v2\.app\.job\.impl\.TaskAttemptImpl.*"
/>
+    <Bug pattern="BC_UNCONFIRMED_CAST" />
+  </Match>
+  <Match>
+    <Class name="~org\.apache\.hadoop\.mapreduce\.v2\.app\.recover\.RecoveryService" />
+    <Bug pattern="BC_UNCONFIRMED_CAST" />
+  </Match>
+
+  <Match>
+    <Class name="~org\.apache\.hadoop\.mapreduce\.v2\.app\.rm\.RMContainerAllocator" />
+    <Bug pattern="BC_UNCONFIRMED_CAST" />
+  </Match>
+
+  <Match>
+    <Class name="org.apache.hadoop.mapreduce.v2.app.job.impl.TaskAttemptImpl" />
+    <Method name="computeSlotMillis" />
+   <Bug pattern="DB_DUPLICATE_BRANCHES" />
+  </Match>
+
+   <Match>
+    <Package name="org.apache.hadoop.yarn.proto" />
+  </Match>
+  <Match>
+    <Class name="~org\.apache\.hadoop\.mapreduce\.v2\.proto.*" />
+  </Match>
+
  </FindBugsFilter>

Modified: hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/LegacyTaskRuntimeEstimator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/LegacyTaskRuntimeEstimator.java?rev=1154062&r1=1154061&r2=1154062&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/LegacyTaskRuntimeEstimator.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/LegacyTaskRuntimeEstimator.java
Fri Aug  5 01:20:46 2011
@@ -112,8 +112,9 @@ public class LegacyTaskRuntimeEstimator 
         estimate = (long) ((timestamp - start) / Math.max(0.0001, status.progress));
         varianceEstimate = (long) (estimate * status.progress / 10);
       }
-
-      estimateContainer.set(estimate);
+      if (estimateContainer != null) {
+        estimateContainer.set(estimate);
+      }
       estimateVarianceContainer.set(varianceEstimate);
     }
   }

Modified: hadoop/common/branches/MR-279/mapreduce/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/pom.xml?rev=1154062&r1=1154061&r2=1154062&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/pom.xml Fri Aug  5 01:20:46 2011
@@ -19,7 +19,7 @@
     <install.pom>${project.build.directory}/saner-pom.xml</install.pom>
     <install.file>${install.pom}</install.file>
     <fork.mode>once</fork.mode>
-    <mr.basedir>=${basedir}</mr.basedir>
+    <mr.basedir>${basedir}</mr.basedir>
   </properties>
 
   <repositories>

Modified: hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml?rev=1154062&r1=1154061&r2=1154062&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml Fri Aug  5 01:20:46 2011
@@ -348,16 +348,16 @@
           </execution>
         </executions>
       </plugin>
-	  <plugin>
+       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-		<configuration>
+         <configuration>
           <findbugsXmlOutput>true</findbugsXmlOutput>
           <xmlOutput>true</xmlOutput>
           <excludeFilterFile>${yarn.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
           <effort>Max</effort>
         </configuration>
-	  </plugin>
+      </plugin>
     </plugins>
   </build>
 



Mime
View raw message