You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mg...@apache.org on 2017/10/24 07:00:17 UTC
ambari git commit: AMBARI-22281. Avoid Log Feeder NPEs for logs of
services not present on the node, but present on the cluster (mgergely)
Repository: ambari
Updated Branches:
refs/heads/trunk 2ee64af51 -> baa1fe6e6
AMBARI-22281. Avoid Log Feeder NPEs for logs of services not present on the node, but present on the cluster (mgergely)
Change-Id: I43b565e521e9334523b5648a99cdfbad9f110b73
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/baa1fe6e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/baa1fe6e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/baa1fe6e
Branch: refs/heads/trunk
Commit: baa1fe6e6cb2368627a4968ddc55106640df3aef
Parents: 2ee64af
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Tue Oct 24 09:00:09 2017 +0200
Committer: Miklos Gergely <mg...@hortonworks.com>
Committed: Tue Oct 24 09:00:09 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/ambari/logfeeder/input/InputFile.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/baa1fe6e/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java
index e24a7aa..c35c831 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java
@@ -56,7 +56,9 @@ public class InputFile extends AbstractInputFile {
private File[] getActualFiles(String searchPath) {
File searchFile = new File(searchPath);
- if (searchFile.isFile()) {
+ if (!searchFile.getParentFile().exists()) {
+ return new File[0];
+ } else if (searchFile.isFile()) {
return new File[]{searchFile};
} else {
FileFilter fileFilter = new WildcardFileFilter(searchFile.getName());