Author: tgraves
Date: Fri Jul 6 13:38:11 2012
New Revision: 1358201
URL: http://svn.apache.org/viewvc?rev=1358201&view=rev
Log:
MAPREDUCE-4387. RM gets fatal error and exits during TestRM (Kihwal Lee via
tgraves)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1358201&r1=1358200&r2=1358201&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Jul 6
13:38:11 2012
@@ -640,6 +640,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4384. Race conditions in IndexCache (Kihwal Lee via tgraves)
+ MAPREDUCE-4387. RM gets fatal error and exits during TestRM
+ (Kihwal Lee via tgraves)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1358201&r1=1358200&r2=1358201&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
Fri Jul 6 13:38:11 2012
@@ -324,6 +324,13 @@ public class ResourceManager extends Com
try {
scheduler.handle(event);
} catch (Throwable t) {
+ // An error occurred, but we are shutting down anyway.
+ // If it was an InterruptedException, the very act of
+ // shutdown could have caused it and is probably harmless.
+ if (stopped) {
+ LOG.warn("Exception during shutdown: ", t);
+ break;
+ }
LOG.fatal("Error in handling event type " + event.getType()
+ " to the scheduler", t);
if (shouldExitOnError
