From 5f7749da0950f1003ffd27146b565b91437ab0a3 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Tue, 18 Feb 2020 10:28:12 +0100 Subject: [PATCH] YARN-10143. YARN-10101 broke Yarn logs CLI --- .../ifile/LogAggregationIndexedFileController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java index 02c319eed1c..e94a92a6e20 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java @@ -621,8 +621,8 @@ public boolean readAggregatedLogs(ContainerLogsRequest logRequest, ApplicationId appId = logRequest.getAppId(); String appOwner = logRequest.getAppOwner(); ApplicationAttemptId appAttemptId = logRequest.getAppAttemptId(); - boolean getAllContainers = ((containerIdStr == null || - containerIdStr.isEmpty()) && appAttemptId != null); + boolean getAllContainers = (containerIdStr == null || + containerIdStr.isEmpty()); String nodeIdStr = (nodeId == null || nodeId.isEmpty()) ? null : LogAggregationUtils.getNodeString(nodeId); RemoteIterator nodeFiles = LogAggregationUtils @@ -667,7 +667,8 @@ public boolean readAggregatedLogs(ContainerLogsRequest logRequest, for (Entry> log : logMeta .getLogMetas().entrySet()) { String currentContainerIdStr = log.getKey(); - if (!belongsToAppAttempt(appAttemptId, currentContainerIdStr)) { + if (appAttemptId != null && + !belongsToAppAttempt(appAttemptId, currentContainerIdStr)) { continue; } ContainerLogMeta meta = new ContainerLogMeta( -- 2.21.0