Repository: hadoop Updated Branches: refs/heads/trunk 826715622 -> eac1d1894
MAPREDUCE-6418. MRApp should not shutdown LogManager during shutdown. Contributed by Chang Li Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eac1d189 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eac1d189 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eac1d189 Branch: refs/heads/trunk Commit: eac1d1894354e90d314087af8e7fb168ddef9a3d Parents: 8267156 Author: Jason Lowe <jl...@apache.org> Authored: Wed Jul 1 18:01:22 2015 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Jul 1 18:01:22 2015 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 14 +++++++++++--- .../org/apache/hadoop/mapreduce/v2/app/MRApp.java | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eac1d189/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index dd9da7e..2f80615 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -527,6 +527,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6420. Interrupted Exception in LocalContainerLauncher should be logged in warn/info level (Chang Li via jlowe) + MAPREDUCE-6418. MRApp should not shutdown LogManager during shutdown + (Chang Li via jlowe) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/eac1d189/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 0d3519b..f199ecb 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 @@ -1197,11 +1197,15 @@ public class MRAppMaster extends CompositeService { startJobs(); } } - + + protected void shutdownTaskLog() { + TaskLog.syncLogsShutdown(logSyncer); + } + @Override public void stop() { super.stop(); - TaskLog.syncLogsShutdown(logSyncer); + shutdownTaskLog(); } private boolean isRecoverySupported() throws IOException { @@ -1705,10 +1709,14 @@ public class MRAppMaster extends CompositeService { T call(Configuration conf) throws Exception; } + protected void shutdownLogManager() { + LogManager.shutdown(); + } + @Override protected void serviceStop() throws Exception { super.serviceStop(); - LogManager.shutdown(); + shutdownLogManager(); } public ClientService getClientService() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/eac1d189/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 4fe4c44..b51adf2 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 @@ -804,5 +804,20 @@ public class MRApp extends MRAppMaster { new Text(containerToken.getService())); 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. + } + }