YARN-6517. Fix warnings from Spotbugs in hadoop-yarn-common. Contributed by Weiwei Yang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4b5bd73a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4b5bd73a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4b5bd73a Branch: refs/heads/HDFS-10467 Commit: 4b5bd73ac53f7de4899b5b70078249ad20216048 Parents: f378621 Author: Naganarasimha <naganarasimha...@apache.org> Authored: Mon May 1 16:31:16 2017 +0530 Committer: Naganarasimha <naganarasimha...@apache.org> Committed: Mon May 1 16:31:16 2017 +0530 ---------------------------------------------------------------------- .../logaggregation/AggregatedLogFormat.java | 4 ++++ .../yarn/util/ProcfsBasedProcessTree.java | 23 +++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b5bd73a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java index 0aa318c..e5cb255 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java @@ -310,6 +310,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) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b5bd73a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java index d54611e..7f81c5b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java @@ -481,18 +481,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; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org