merge -r 1358200:1358201 from trunk. FIXES: MAPREDUCE-4387

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-07-06 13:39:41 +00:00
parent 5f6a138ca0
commit ca23ea7cf5
2 changed files with 10 additions and 0 deletions

View File

@ -516,6 +516,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

View File

@ -324,6 +324,13 @@ public class ResourceManager extends CompositeService implements Recoverable {
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