YARN-10143. YARN-10101 broke Yarn logs CLI. Contributed by Adam Antal
This commit is contained in:
parent
ec7507162c
commit
4af2556b48
|
@ -621,8 +621,8 @@ public class LogAggregationIndexedFileController
|
|||
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<FileStatus> nodeFiles = LogAggregationUtils
|
||||
|
@ -667,7 +667,8 @@ public class LogAggregationIndexedFileController
|
|||
for (Entry<String, List<IndexedFileLogMeta>> log : logMeta
|
||||
.getLogMetas().entrySet()) {
|
||||
String currentContainerIdStr = log.getKey();
|
||||
if (!belongsToAppAttempt(appAttemptId, currentContainerIdStr)) {
|
||||
if (appAttemptId != null &&
|
||||
!belongsToAppAttempt(appAttemptId, currentContainerIdStr)) {
|
||||
continue;
|
||||
}
|
||||
ContainerLogMeta meta = new ContainerLogMeta(
|
||||
|
|
Loading…
Reference in New Issue