Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 4b5bd73ac5)
This commit is contained in:
Naganarasimha 2017-05-01 16:31:16 +05:30
parent 9b8940366e
commit 29370e7784
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

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

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

@ -493,18 +493,21 @@ public class ProcfsBasedProcessTree extends ResourceCalculatorProcessTree {
* Get the list of all processes in the system.
*/
private List<String> getProcessList() {
String[] processDirs = (new File(procfsDir)).list();
List<String> processList = new ArrayList<String>();
for (String dir : processDirs) {
Matcher m = numberPattern.matcher(dir);
if (!m.matches()) continue;
try {
if ((new File(procfsDir, dir)).isDirectory()) {
processList.add(dir);
String[] processDirs = (new File(procfsDir)).list();
if (processDirs != null) {
for (String dir : processDirs) {
Matcher m = numberPattern.matcher(dir);
if (!m.matches()) {
continue;
}
try {
if ((new File(procfsDir, dir)).isDirectory()) {
processList.add(dir);
}
} catch (SecurityException s) {
// skip this process
}
} catch (SecurityException s) {
// skip this process
}
}
return processList;