big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-6517. Fix warnings from Spotbugs in hadoop-yarn-common. Contributed by Weiwei Yang

Browse Source
This commit is contained in:
Naganarasimha 2017-05-01 16:31:16 +05:30
parent f378621546
commit 4b5bd73ac5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
View File

@ -310,6 +310,10 @@ public String getUser() {
} }
private Set<File> getPendingLogFilesToUpload(File containerLogDir) { private Set<File> getPendingLogFilesToUpload(File containerLogDir) {
if(containerLogDir == null ||
containerLogDir.listFiles() == null) {
return new HashSet<>(0);
}
Set<File> candidates = Set<File> candidates =
new HashSet<File>(Arrays.asList(containerLogDir.listFiles())); new HashSet<File>(Arrays.asList(containerLogDir.listFiles()));
for (File logFile : candidates) { for (File logFile : candidates) {

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java
View File

@ -481,12 +481,14 @@ private static String getValidPID(String pid) {
* Get the list of all processes in the system. * Get the list of all processes in the system.
*/ */
private List<String> getProcessList() { private List<String> getProcessList() {
String[] processDirs = (new File(procfsDir)).list();
List<String> processList = new ArrayList<String>(); List<String> processList = new ArrayList<String>();
String[] processDirs = (new File(procfsDir)).list();
if (processDirs != null) {
for (String dir : processDirs) { for (String dir : processDirs) {
Matcher m = numberPattern.matcher(dir); Matcher m = numberPattern.matcher(dir);
if (!m.matches()) continue; if (!m.matches()) {
continue;
}
try { try {
if ((new File(procfsDir, dir)).isDirectory()) { if ((new File(procfsDir, dir)).isDirectory()) {
processList.add(dir); processList.add(dir);
@ -495,6 +497,7 @@ private List<String> getProcessList() {
// skip this process // skip this process
} }
} }
}
return processList; return processList;
} }