Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6571. JobEndNotification info logs are missing in AM container syslog (haibochen via rkanter) 

(cherry picked from commit 6b4a9970f1)
This commit is contained in:
Robert Kanter 2016-12-06 13:11:03 -08:00
parent eb9e7820a9
commit 1585b4f7ce
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
View File

@ -148,7 +148,6 @@ import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager; import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager;
import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.Clock;
import org.apache.hadoop.yarn.util.SystemClock; import org.apache.hadoop.yarn.util.SystemClock;
import org.apache.log4j.LogManager;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@ -1241,14 +1240,9 @@ public class MRAppMaster extends CompositeService {
} }
} }
protected void shutdownTaskLog() {
TaskLog.syncLogsShutdown(logSyncer);
}
@Override @Override
public void stop() { public void stop() {
super.stop(); super.stop();
shutdownTaskLog();
} }
private boolean isRecoverySupported() throws IOException { private boolean isRecoverySupported() throws IOException {
@ -1788,14 +1782,9 @@ public class MRAppMaster extends CompositeService {
T call(Configuration conf) throws Exception; T call(Configuration conf) throws Exception;
} }
protected void shutdownLogManager() {
LogManager.shutdown();
}
@Override @Override
protected void serviceStop() throws Exception { protected void serviceStop() throws Exception {
super.serviceStop(); super.serviceStop();
shutdownLogManager();
} }
public ClientService getClientService() { public ClientService getClientService() {

14
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
View File

@ -814,19 +814,5 @@ public class MRApp extends MRAppMaster {
return token.decodeIdentifier(); 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.
}
} }