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

MAPREDUCE-5723. MR AM container log can be truncated or empty. (Mohammad Kamrul Islam via kasha) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560592 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-01-23 06:06:45 +00:00
parent 1c602f7198
commit 122be11c14
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -288,6 +288,9 @@ Release 2.4.0 - UNRELEASED
MAPREDUCE-5693. Restore MRv1 behavior for log flush (Gera Shegalov via MAPREDUCE-5693. Restore MRv1 behavior for log flush (Gera Shegalov via
jlowe) jlowe)
MAPREDUCE-5723. MR AM container log can be truncated or empty.
(Mohammad Kamrul Islam via kasha)
Release 2.3.0 - UNRELEASED Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -121,6 +121,7 @@ import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.service.CompositeService; import org.apache.hadoop.service.CompositeService;
import org.apache.hadoop.service.Service; import org.apache.hadoop.service.Service;
import org.apache.hadoop.service.ServiceOperations; import org.apache.hadoop.service.ServiceOperations;
import org.apache.hadoop.util.ExitUtil;
import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.ShutdownHookManager; import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringInterner; import org.apache.hadoop.util.StringInterner;
@ -1405,9 +1406,7 @@ public class MRAppMaster extends CompositeService {
initAndStartAppMaster(appMaster, conf, jobUserName); initAndStartAppMaster(appMaster, conf, jobUserName);
} catch (Throwable t) { } catch (Throwable t) {
LOG.fatal("Error starting MRAppMaster", t); LOG.fatal("Error starting MRAppMaster", t);
System.exit(1); ExitUtil.terminate(1, t);
} finally {
LogManager.shutdown();
} }
} }
@ -1483,4 +1482,11 @@ public class MRAppMaster extends CompositeService {
} }
}); });
} }
@Override
protected void serviceStop() throws Exception {
super.serviceStop();
LogManager.shutdown();
}
} }