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 jl...@apache.org on 2015/07/01 20:02:33 UTC
hadoop git commit: MAPREDUCE-6418. MRApp should not shutdown
LogManager during shutdown. Contributed by Chang Li (cherry picked from
commit eac1d1894354e90d314087af8e7fb168ddef9a3d)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 f3195eda2 -> 8a4970e84
MAPREDUCE-6418. MRApp should not shutdown LogManager during shutdown. Contributed by Chang Li
(cherry picked from commit eac1d1894354e90d314087af8e7fb168ddef9a3d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8a4970e8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8a4970e8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8a4970e8
Branch: refs/heads/branch-2
Commit: 8a4970e8459fb0e2c4458234a9c6076c8bc1b9cc
Parents: f3195ed
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:02:17 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/8a4970e8/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 47998b9..7b21dd7 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -260,6 +260,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/8a4970e8/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 fb73eba..2dcb3c8 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
@@ -1178,11 +1178,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 {
@@ -1686,10 +1690,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/8a4970e8/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 14b4c2d..b1cec75 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
@@ -802,5 +802,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.
+ }
+
}