YARN-1597. Fixed Findbugs warnings on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1557958 ../YARN-321 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562217 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ff83e97655
commit
b786be0307
|
@ -81,6 +81,9 @@ Branch YARN-321: Generic ApplicationHistoryService
|
|||
YARN-1596. Fixed Javadoc warnings on branch YARN-321. (Vinod Kumar Vavilapalli
|
||||
via zjshen)
|
||||
|
||||
YARN-1597. Fixed Findbugs warnings on branch YARN-321. (Vinod Kumar Vavilapalli
|
||||
via zjshen)
|
||||
|
||||
Release 2.4.0 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -21,6 +21,7 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice;
|
|||
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 class ApplicationHistoryManagerImpl extends AbstractService implements
|
|||
Map<ApplicationId, ApplicationHistoryData> histData = historyStore
|
||||
.getAllApplications();
|
||||
HashMap<ApplicationId, ApplicationReport> applicationsReport = new HashMap<ApplicationId, ApplicationReport>();
|
||||
for (ApplicationId appId : histData.keySet()) {
|
||||
applicationsReport.put(appId, convertToApplicationReport(histData
|
||||
.get(appId)));
|
||||
for (Entry<ApplicationId, ApplicationHistoryData> entry : histData
|
||||
.entrySet()) {
|
||||
applicationsReport.put(entry.getKey(),
|
||||
convertToApplicationReport(entry.getValue()));
|
||||
}
|
||||
return applicationsReport;
|
||||
}
|
||||
|
@ -171,9 +173,10 @@ public class ApplicationHistoryManagerImpl extends AbstractService implements
|
|||
Map<ApplicationAttemptId, ApplicationAttemptHistoryData> histData = historyStore
|
||||
.getApplicationAttempts(appId);
|
||||
HashMap<ApplicationAttemptId, ApplicationAttemptReport> applicationAttemptsReport = new HashMap<ApplicationAttemptId, ApplicationAttemptReport>();
|
||||
for (ApplicationAttemptId appAttemptId : histData.keySet()) {
|
||||
applicationAttemptsReport.put(appAttemptId,
|
||||
convertToApplicationAttemptReport(histData.get(appAttemptId)));
|
||||
for (Entry<ApplicationAttemptId, ApplicationAttemptHistoryData> entry : histData
|
||||
.entrySet()) {
|
||||
applicationAttemptsReport.put(entry.getKey(),
|
||||
convertToApplicationAttemptReport(entry.getValue()));
|
||||
}
|
||||
return applicationAttemptsReport;
|
||||
}
|
||||
|
@ -201,9 +204,9 @@ public class ApplicationHistoryManagerImpl extends AbstractService implements
|
|||
Map<ContainerId, ContainerHistoryData> histData = historyStore
|
||||
.getContainers(appAttemptId);
|
||||
HashMap<ContainerId, ContainerReport> containersReport = new HashMap<ContainerId, ContainerReport>();
|
||||
for (ContainerId container : histData.keySet()) {
|
||||
containersReport.put(container, convertToContainerReport(histData
|
||||
.get(container)));
|
||||
for (Entry<ContainerId, ContainerHistoryData> entry : histData.entrySet()) {
|
||||
containersReport.put(entry.getKey(),
|
||||
convertToContainerReport(entry.getValue()));
|
||||
}
|
||||
return containersReport;
|
||||
}
|
||||
|
|
|
@ -739,7 +739,6 @@ public class FileSystemApplicationHistoryStore extends AbstractService
|
|||
}
|
||||
}
|
||||
|
||||
private FSDataInputStream fsdis;
|
||||
private TFile.Reader reader;
|
||||
private TFile.Reader.Scanner scanner;
|
||||
|
||||
|
@ -773,7 +772,7 @@ public class FileSystemApplicationHistoryStore extends AbstractService
|
|||
}
|
||||
|
||||
public void close() {
|
||||
IOUtils.cleanup(LOG, scanner, reader, fsdis);
|
||||
IOUtils.cleanup(LOG, scanner, reader);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -319,7 +319,7 @@ public class RMApplicationHistoryWriter extends CompositeService {
|
|||
// 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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue