big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-10143. YARN-10101 broke Yarn logs CLI. Contributed by Adam Antal

Browse Source
This commit is contained in:
Szilard Nemeth 2020-02-20 15:27:15 +01:00
parent ec7507162c
commit 4af2556b48
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java
View File

@ -621,8 +621,8 @@ public List<ContainerLogMeta> readAggregatedLogsMeta(
ApplicationId appId = logRequest.getAppId(); ApplicationId appId = logRequest.getAppId();
String appOwner = logRequest.getAppOwner(); String appOwner = logRequest.getAppOwner();
ApplicationAttemptId appAttemptId = logRequest.getAppAttemptId(); ApplicationAttemptId appAttemptId = logRequest.getAppAttemptId();
boolean getAllContainers = ((containerIdStr == null || boolean getAllContainers = (containerIdStr == null ||
containerIdStr.isEmpty()) && appAttemptId != null); containerIdStr.isEmpty());
String nodeIdStr = (nodeId == null || nodeId.isEmpty()) ? null String nodeIdStr = (nodeId == null || nodeId.isEmpty()) ? null
: LogAggregationUtils.getNodeString(nodeId); : LogAggregationUtils.getNodeString(nodeId);
RemoteIterator<FileStatus> nodeFiles = LogAggregationUtils RemoteIterator<FileStatus> nodeFiles = LogAggregationUtils
@ -667,7 +667,8 @@ public List<ContainerLogMeta> readAggregatedLogsMeta(
for (Entry<String, List<IndexedFileLogMeta>> log : logMeta for (Entry<String, List<IndexedFileLogMeta>> log : logMeta
.getLogMetas().entrySet()) { .getLogMetas().entrySet()) {
String currentContainerIdStr = log.getKey(); String currentContainerIdStr = log.getKey();
if (!belongsToAppAttempt(appAttemptId, currentContainerIdStr)) { if (appAttemptId != null &&
!belongsToAppAttempt(appAttemptId, currentContainerIdStr)) {
continue; continue;
} }
ContainerLogMeta meta = new ContainerLogMeta( ContainerLogMeta meta = new ContainerLogMeta(