From 866a984c1aa8063c9a296ff66c7404ffa7db1482 Mon Sep 17 00:00:00 2001 From: Adam Antal Date: Thu, 15 Aug 2019 17:52:26 +0200 Subject: [PATCH] YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk --- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index 77bec7237e0..245dc103e93 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -395,7 +395,7 @@ private void uploadLogsForContainers(boolean appFinished) if (logAggregationSucceedInThisCycle && deletionTask != null) { delService.delete(deletionTask); } - if (!diagnosticMessage.isEmpty()) { + if (diagnosticMessage != null && !diagnosticMessage.isEmpty()) { LOG.debug("Sending log aggregation report along with the " + "following diagnostic message:\"{}\"", diagnosticMessage); } -- 2.21.0