MAPREDUCE-6571. JobEndNotification info logs are missing in AM container syslog (haibochen via rkanter)
(cherry picked from commit 6b4a9970f1
)
This commit is contained in:
parent
eb9e7820a9
commit
1585b4f7ce
|
@ -148,7 +148,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;
|
||||
|
||||
|
@ -1241,14 +1240,9 @@ public class MRAppMaster extends CompositeService {
|
|||
}
|
||||
}
|
||||
|
||||
protected void shutdownTaskLog() {
|
||||
TaskLog.syncLogsShutdown(logSyncer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop() {
|
||||
super.stop();
|
||||
shutdownTaskLog();
|
||||
}
|
||||
|
||||
private boolean isRecoverySupported() throws IOException {
|
||||
|
@ -1788,14 +1782,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() {
|
||||
|
|
|
@ -814,19 +814,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.
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue