You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by vi...@apache.org on 2014/01/24 02:15:02 UTC
svn commit: r1560867 - in
/hadoop/common/branches/YARN-321/hadoop-mapreduce-project: ./ CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
pom.xml
Author: vinodkv
Date: Fri Jan 24 01:14:59 2014
New Revision: 1560867
URL: http://svn.apache.org/r1560867
Log:
YARN-321. Forwarding YARN-321 branch to latest trunk.
Modified:
hadoop/common/branches/YARN-321/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/YARN-321/hadoop-mapreduce-project/CHANGES.txt (contents, props changed)
hadoop/common/branches/YARN-321/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
hadoop/common/branches/YARN-321/hadoop-mapreduce-project/pom.xml
Propchange: hadoop/common/branches/YARN-321/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1560467-1560866
Modified: hadoop/common/branches/YARN-321/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-mapreduce-project/CHANGES.txt?rev=1560867&r1=1560866&r2=1560867&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/YARN-321/hadoop-mapreduce-project/CHANGES.txt Fri Jan 24 01:14:59 2014
@@ -288,6 +288,9 @@ Release 2.4.0 - UNRELEASED
MAPREDUCE-5693. Restore MRv1 behavior for log flush (Gera Shegalov via
jlowe)
+ MAPREDUCE-5723. MR AM container log can be truncated or empty.
+ (Mohammad Kamrul Islam via kasha)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/YARN-321/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1560467-1560866
Modified: hadoop/common/branches/YARN-321/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1560867&r1=1560866&r2=1560867&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java (original)
+++ hadoop/common/branches/YARN-321/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java Fri Jan 24 01:14:59 2014
@@ -121,6 +121,7 @@ import org.apache.hadoop.service.Abstrac
import org.apache.hadoop.service.CompositeService;
import org.apache.hadoop.service.Service;
import org.apache.hadoop.service.ServiceOperations;
+import org.apache.hadoop.util.ExitUtil;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringInterner;
@@ -1405,9 +1406,7 @@ public class MRAppMaster extends Composi
initAndStartAppMaster(appMaster, conf, jobUserName);
} catch (Throwable t) {
LOG.fatal("Error starting MRAppMaster", t);
- System.exit(1);
- } finally {
- LogManager.shutdown();
+ ExitUtil.terminate(1, t);
}
}
@@ -1483,4 +1482,11 @@ public class MRAppMaster extends Composi
}
});
}
+
+ @Override
+ protected void serviceStop() throws Exception {
+ super.serviceStop();
+ LogManager.shutdown();
+ }
+
}
Modified: hadoop/common/branches/YARN-321/hadoop-mapreduce-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/YARN-321/hadoop-mapreduce-project/pom.xml?rev=1560867&r1=1560866&r2=1560867&view=diff
==============================================================================
--- hadoop/common/branches/YARN-321/hadoop-mapreduce-project/pom.xml (original)
+++ hadoop/common/branches/YARN-321/hadoop-mapreduce-project/pom.xml Fri Jan 24 01:14:59 2014
@@ -29,7 +29,6 @@
<url>http://hadoop.apache.org/mapreduce/</url>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.logs>true</test.logs>
<test.timeout>600000</test.timeout>
<fork.mode>once</fork.mode>