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

YARN-1591. Fixed AsyncDispatcher to handle interrupts on shutdown in a sane manner and thus fix failure of TestResourceTrackerService. Contributed by Tsuyoshi Ozawa. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1578628 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2014-03-17 22:17:43 +00:00
parent 6a89e57b8d
commit 81a456e638
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/CHANGES.txt
View File

@ -501,6 +501,10 @@ Release 2.4.0 - UNRELEASED
YARN-1206. Fixed AM container log to show on NM web page after application YARN-1206. Fixed AM container log to show on NM web page after application
finishes if log-aggregation is disabled. (Rohith Sharmaks via jianhe) finishes if log-aggregation is disabled. (Rohith Sharmaks via jianhe)
YARN-1591. Fixed AsyncDispatcher to handle interrupts on shutdown in a sane
manner and thus fix failure of TestResourceTrackerService. (Tsuyoshi Ozawa
via vinodkv)
Release 2.3.1 - UNRELEASED Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java
View File

@ -174,12 +174,13 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher {
} else { } else {
throw new Exception("No handler for registered for " + type); throw new Exception("No handler for registered for " + type);
} }
} } catch (Throwable t) {
catch (Throwable t) {
//TODO Maybe log the state of the queue //TODO Maybe log the state of the queue
LOG.fatal("Error in dispatcher thread", t); LOG.fatal("Error in dispatcher thread", t);
// If serviceStop is called, we should exit this thread gracefully.
if (exitOnDispatchException if (exitOnDispatchException
&& (ShutdownHookManager.get().isShutdownInProgress()) == false) { && (ShutdownHookManager.get().isShutdownInProgress()) == false
&& stopped == false) {
LOG.info("Exiting, bbye.."); LOG.info("Exiting, bbye..");
System.exit(-1); System.exit(-1);
} }

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
View File

@ -630,7 +630,7 @@ public class ResourceManager extends CompositeService implements Recoverable {
} }
this.eventQueue.put(event); this.eventQueue.put(event);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new YarnRuntimeException(e); LOG.info("Interrupted. Trying to exit gracefully.");
} }
} }
} }

14
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java
View File

@ -30,6 +30,8 @@ import org.junit.Assert;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationId;
@ -63,7 +65,7 @@ public class TestResourceTrackerService {
private final static File TEMP_DIR = new File(System.getProperty( private final static File TEMP_DIR = new File(System.getProperty(
"test.build.data", "/tmp"), "decommision"); "test.build.data", "/tmp"), "decommision");
private File hostFile = new File(TEMP_DIR + File.separator + "hostFile.txt"); private final File hostFile = new File(TEMP_DIR + File.separator + "hostFile.txt");
private MockRM rm; private MockRM rm;
/** /**
@ -468,7 +470,7 @@ public class TestResourceTrackerService {
@Test @Test
public void testNodeRegistrationWithContainers() throws Exception { public void testNodeRegistrationWithContainers() throws Exception {
MockRM rm = new MockRM(); rm = new MockRM();
rm.init(new YarnConfiguration()); rm.init(new YarnConfiguration());
rm.start(); rm.start();
RMApp app = rm.submitApp(1024); RMApp app = rm.submitApp(1024);
@ -491,7 +493,7 @@ public class TestResourceTrackerService {
@Test @Test
public void testReconnectNode() throws Exception { public void testReconnectNode() throws Exception {
final DrainDispatcher dispatcher = new DrainDispatcher(); final DrainDispatcher dispatcher = new DrainDispatcher();
MockRM rm = new MockRM() { rm = new MockRM() {
@Override @Override
protected EventHandler<SchedulerEvent> createSchedulerEventDispatcher() { protected EventHandler<SchedulerEvent> createSchedulerEventDispatcher() {
return new SchedulerEventDispatcher(this.scheduler) { return new SchedulerEventDispatcher(this.scheduler) {
@ -593,9 +595,15 @@ public class TestResourceTrackerService {
if (hostFile != null && hostFile.exists()) { if (hostFile != null && hostFile.exists()) {
hostFile.delete(); hostFile.delete();
} }
ClusterMetrics.destroy(); ClusterMetrics.destroy();
if (rm != null) { if (rm != null) {
rm.stop(); rm.stop();
} }
MetricsSystem ms = DefaultMetricsSystem.instance();
if (ms.getSource("ClusterMetrics") != null) {
DefaultMetricsSystem.shutdown();
}
} }
} }