Author: tucu
Date: Thu Apr 11 13:08:55 2013
New Revision: 1466872
URL: http://svn.apache.org/r1466872
Log:
MAPREDUCE-5098. Fix findbugs warnings in gridmix. (kkambatl via tucu)
Added:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/dev-support/
- copied from r1464209,
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/dev-support/
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/dev-support/findbugs-exclude.xml
- copied unchanged from r1464209,
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/dev-support/findbugs-exclude.xml
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml?rev=1466872&r1=1466871&r2=1466872&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml Thu Apr
11 13:08:55 2013
@@ -100,6 +100,16 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <xmlOutput>true</xmlOutput>
+
<excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+ <effort>Max</effort>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java?rev=1466872&r1=1466871&r2=1466872&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
Thu Apr 11 13:08:55 2013
@@ -86,9 +86,7 @@ class JobMonitor implements Gridmix.Comp
* Add a running job's status to the polling queue.
*/
public void add(JobStats job) throws InterruptedException {
- synchronized (runningJobs) {
runningJobs.put(job);
- }
}
/**
@@ -147,12 +145,10 @@ class JobMonitor implements Gridmix.Comp
boolean shutdown;
while (true) {
try {
- synchronized (runningJobs) {
- synchronized (mJobs) {
- graceful = JobMonitor.this.graceful;
- shutdown = JobMonitor.this.shutdown;
- runningJobs.drainTo(mJobs);
- }
+ synchronized (mJobs) {
+ graceful = JobMonitor.this.graceful;
+ shutdown = JobMonitor.this.shutdown;
+ runningJobs.drainTo(mJobs);
}
// shutdown conditions; either shutdown requested and all jobs
@@ -160,11 +156,9 @@ class JobMonitor implements Gridmix.Comp
// submitted jobs not in the monitored set
if (shutdown) {
if (!graceful) {
- synchronized (runningJobs) {
- while (!runningJobs.isEmpty()) {
- synchronized (mJobs) {
- runningJobs.drainTo(mJobs);
- }
+ while (!runningJobs.isEmpty()) {
+ synchronized (mJobs) {
+ runningJobs.drainTo(mJobs);
}
}
break;
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java?rev=1466872&r1=1466871&r2=1466872&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
Thu Apr 11 13:08:55 2013
@@ -84,7 +84,7 @@ public class SleepJob extends GridmixJob
String[] hosts) throws IOException {
super(conf, submissionMillis, jobdesc, outRoot, ugi, seq);
this.fakeLocations = numLocations;
- this.hosts = hosts;
+ this.hosts = hosts.clone();
this.selector = (fakeLocations > 0)? new Selector(hosts.length, (float)
fakeLocations
/ hosts.length, rand.get()) : null;
this.mapTasksOnly = conf.getBoolean(SLEEPJOB_MAPTASK_ONLY, false);
@@ -289,9 +289,9 @@ public class SleepJob extends GridmixJob
this.id = id;
this.sleepDuration = sleepDuration;
nSpec = reduceDurations.length;
- this.reduceDurations = reduceDurations;
+ this.reduceDurations = reduceDurations.clone();
this.nMaps = nMaps;
- this.locations = locations;
+ this.locations = locations.clone();
}
@Override
@@ -349,7 +349,7 @@ public class SleepJob extends GridmixJob
@Override
public String[] getLocations() {
- return locations;
+ return locations.clone();
}
}
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java?rev=1466872&r1=1466871&r2=1466872&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
Thu Apr 11 13:08:55 2013
@@ -93,7 +93,7 @@ implements ResourceUsageEmulatorPlugin {
private static final float DEFAULT_HEAP_LOAD_RATIO = 0.1F;
- public static int ONE_MB = 1024 * 1024;
+ public static final int ONE_MB = 1024 * 1024;
/**
* Defines the core heap usage emulation algorithm. This engine is expected
@@ -129,7 +129,8 @@ implements ResourceUsageEmulatorPlugin {
public static class DefaultHeapUsageEmulator
implements HeapUsageEmulatorCore {
// store the unit loads in a list
- protected static ArrayList<Object> heapSpace = new ArrayList<Object>();
+ protected static final ArrayList<Object> heapSpace =
+ new ArrayList<Object>();
/**
* Increase heap usage by current process by the given amount.
