This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-2071 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 62c055869d5180b75aea6350b2a2caa35caed26d Author: Márton Elek <e...@apache.org> AuthorDate: Mon Oct 7 12:45:26 2019 +0200 address review comments --- .../org/apache/hadoop/ozone/insight/BaseInsightPoint.java | 4 ++-- .../java/org/apache/hadoop/ozone/insight/LogSubcommand.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/BaseInsightPoint.java b/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/BaseInsightPoint.java index 1cc4deb..02a0596 100644 --- a/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/BaseInsightPoint.java +++ b/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/BaseInsightPoint.java @@ -195,9 +195,9 @@ public abstract class BaseInsightPoint implements InsightPoint { for (Entry<String, String> entry : filters.entrySet()) { if (!logLine.matches( String.format(".*\\[%s=%s\\].*", entry.getKey(), entry.getValue()))) { - result = result & false; + return false; } } - return result; + return true; } } diff --git a/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/LogSubcommand.java b/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/LogSubcommand.java index 0a06fe7..c0fd59d 100644 --- a/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/LogSubcommand.java +++ b/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/LogSubcommand.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; -import java.util.function.Function; +import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -61,8 +61,8 @@ public class LogSubcommand extends BaseInsightSubCommand + "show more information / detailed message") private boolean verbose; - @CommandLine.Option(names = "-f", description = "Enable verbose mode to " - + "show more information / detailed message") + @CommandLine.Option(names = "-f", description = "Define filters to scope " + + "the output (eg. -f datanode=_1234_datanode_id)") private Map<String, String> filters; @Override @@ -102,7 +102,7 @@ public class LogSubcommand extends BaseInsightSubCommand * @param filter any additional filter */ private void streamLog(OzoneConfiguration conf, Set<Component> sources, - List<LoggerSource> relatedLoggers, Function<String, Boolean> filter) { + List<LoggerSource> relatedLoggers, Predicate<String> filter) { List<Thread> loggers = new ArrayList<>(); for (Component sourceComponent : sources) { loggers.add(new Thread( @@ -121,7 +121,7 @@ public class LogSubcommand extends BaseInsightSubCommand } private void streamLog(OzoneConfiguration conf, Component logComponent, - List<LoggerSource> loggers, Function<String, Boolean> filter) { + List<LoggerSource> loggers, Predicate<String> filter) { HttpClient client = HttpClientBuilder.create().build(); HttpGet get = new HttpGet(getHost(conf, logComponent) + "/logstream"); @@ -134,7 +134,7 @@ public class LogSubcommand extends BaseInsightSubCommand .filter(line -> { for (LoggerSource logger : loggers) { if (line.contains(logger.getLoggerName()) && filter - .apply(line)) { + .test(line)) { return true; } } --------------------------------------------------------------------- To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org