commit 80ff45ff434bea84e0556c1037bb414202bba98f Author: Vinod Kumar Vavilapalli Date: Mon Jan 13 12:34:24 2014 -0800 FindBugs warnings. diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java index 6ac8ed9..2a97ff0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,9 +95,10 @@ public ContainerReport getAMContainer(ApplicationAttemptId appAttemptId) Map histData = historyStore .getAllApplications(); HashMap applicationsReport = new HashMap(); - for (ApplicationId appId : histData.keySet()) { - applicationsReport.put(appId, convertToApplicationReport(histData - .get(appId))); + for (Entry entry : histData + .entrySet()) { + applicationsReport.put(entry.getKey(), + convertToApplicationReport(entry.getValue())); } return applicationsReport; } @@ -171,9 +173,10 @@ public ApplicationAttemptReport getApplicationAttempt( Map histData = historyStore .getApplicationAttempts(appId); HashMap applicationAttemptsReport = new HashMap(); - for (ApplicationAttemptId appAttemptId : histData.keySet()) { - applicationAttemptsReport.put(appAttemptId, - convertToApplicationAttemptReport(histData.get(appAttemptId))); + for (Entry entry : histData + .entrySet()) { + applicationAttemptsReport.put(entry.getKey(), + convertToApplicationAttemptReport(entry.getValue())); } return applicationAttemptsReport; } @@ -201,9 +204,9 @@ private ContainerReport convertToContainerReport( Map histData = historyStore .getContainers(appAttemptId); HashMap containersReport = new HashMap(); - for (ContainerId container : histData.keySet()) { - containersReport.put(container, convertToContainerReport(histData - .get(container))); + for (Entry entry : histData.entrySet()) { + containersReport.put(entry.getKey(), + convertToContainerReport(entry.getValue())); } return containersReport; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java index b4d97f3..afc24d7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java @@ -739,7 +739,6 @@ public Entry(HistoryDataKey key, byte[] value) { } } - private FSDataInputStream fsdis; private TFile.Reader reader; private TFile.Reader.Scanner scanner; @@ -773,7 +772,7 @@ public void reset() throws IOException { } public void close() { - IOUtils.cleanup(LOG, scanner, reader, fsdis); + IOUtils.cleanup(LOG, scanner, reader); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java index 354fcc4..fa17e20 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java @@ -319,7 +319,7 @@ public void handle(Event event) { // dispatcher, such that all the writing events of one application will // be handled by one thread, the scheduled order of the these events // will be preserved - int index = Math.abs(event.hashCode()) % dispatchers.size(); + int index = (event.hashCode() & Integer.MAX_VALUE) % dispatchers.size(); dispatchers.get(index).getEventHandler().handle(event); }