Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C14CA200BE5 for ; Fri, 9 Dec 2016 16:51:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BFFF9160B31; Fri, 9 Dec 2016 15:51:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 13CB0160B2A for ; Fri, 9 Dec 2016 16:51:31 +0100 (CET) Received: (qmail 28144 invoked by uid 500); 9 Dec 2016 15:51:28 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 27572 invoked by uid 99); 9 Dec 2016 15:51:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2016 15:51:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A02EF0DCA; Fri, 9 Dec 2016 15:51:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asuresh@apache.org To: common-commits@hadoop.apache.org Date: Fri, 09 Dec 2016 15:51:32 -0000 Message-Id: <4e2fa85c57bb4cd292e2ea787d468225@git.apache.org> In-Reply-To: <4aa61b3f018c4f329da746a7d1ee6fc4@git.apache.org> References: <4aa61b3f018c4f329da746a7d1ee6fc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/33] hadoop git commit: MAPREDUCE-6571. JobEndNotification info logs are missing in AM container syslog (haibochen via rkanter) archived-at: Fri, 09 Dec 2016 15:51:32 -0000 MAPREDUCE-6571. JobEndNotification info logs are missing in AM container syslog (haibochen via rkanter) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b4a9970 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b4a9970 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b4a9970 Branch: refs/heads/YARN-5972 Commit: 6b4a9970f187ab399adf7469e494a530f08993b5 Parents: f53b481 Author: Robert Kanter Authored: Tue Dec 6 13:11:03 2016 -0800 Committer: Robert Kanter Committed: Tue Dec 6 13:11:03 2016 -0800 ---------------------------------------------------------------------- .../apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 11 ----------- .../org/apache/hadoop/mapreduce/v2/app/MRApp.java | 14 -------------- 2 files changed, 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b4a9970/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java index b383a02..78c8bdd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java @@ -151,7 +151,6 @@ import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.SystemClock; -import org.apache.log4j.LogManager; import com.google.common.annotations.VisibleForTesting; @@ -1277,14 +1276,9 @@ public class MRAppMaster extends CompositeService { } } - protected void shutdownTaskLog() { - TaskLog.syncLogsShutdown(logSyncer); - } - @Override public void stop() { super.stop(); - shutdownTaskLog(); } private boolean isRecoverySupported() throws IOException { @@ -1824,14 +1818,9 @@ public class MRAppMaster extends CompositeService { T call(Configuration conf) throws Exception; } - protected void shutdownLogManager() { - LogManager.shutdown(); - } - @Override protected void serviceStop() throws Exception { super.serviceStop(); - shutdownLogManager(); } public ClientService getClientService() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b4a9970/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java index 3472b1f..2d0b5ea 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java @@ -816,19 +816,5 @@ public class MRApp extends MRAppMaster { return token.decodeIdentifier(); } - @Override - protected void shutdownTaskLog() { - // Avoid closing the logging system during unit tests, - // otherwise subsequent MRApp instances in the same test - // will fail to log anything. - } - - @Override - protected void shutdownLogManager() { - // Avoid closing the logging system during unit tests, - // otherwise subsequent MRApp instances in the same test - // will fail to log anything. - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org