You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sn...@apache.org on 2019/08/16 06:52:41 UTC

[hadoop] branch branch-3.2 updated: YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal

This is an automated email from the ASF dual-hosted git repository.

snemeth pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 8fee380  YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal
8fee380 is described below

commit 8fee3808c5aa89cb96b4ef60a71ca6a2ce9055ad
Author: Szilard Nemeth <sn...@apache.org>
AuthorDate: Fri Aug 16 08:52:09 2019 +0200

    YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal
    
    (cherry picked from commit 2a05e0ff3b5ab3be8654e9e96c6556865ef26096)
---
 .../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 965734f..94a9700 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 @@ public class AppLogAggregatorImpl implements AppLogAggregator {
       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);
       }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org