address review comments
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 @@
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.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 @@
+ "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 @@
* @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 @@
}
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 @@
.filter(line -> {
for (LoggerSource logger : loggers) {
if (line.contains(logger.getLoggerName()) && filter
- .apply(line)) {
+ .test(line)) {
return true;
}
}
