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-5085 Commit: 6b4a9970f187ab399adf7469e494a530f08993b5 Parents: f53b481 Author: Robert Kanter <rkan...@apache.org> Authored: Tue Dec 6 13:11:03 2016 -0800 Committer: Robert Kanter <rkan...@apache.org> 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
