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

Merge -c 1186554 from trunk to branch-0.23 to complete fix for MAPREDUCE-3188. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186555 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-19 23:00:07 +00:00
parent 2115478185
commit ffccd70d7a
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1652,6 +1652,8 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3179. Ensure failed tests exit with right error code. (Jonathan
Eagles via acmurthy)
MAPREDUCE-3188. Ensure correct shutdown in services. (todd via acmurthy)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

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

@ -91,14 +91,16 @@ public class AsyncDispatcher extends AbstractService implements Dispatcher {
@Override
public void stop() {
stopped = true;
eventHandlingThread.interrupt();
try {
eventHandlingThread.join();
} catch (InterruptedException ie) {
LOG.debug("Interruped Exception while stopping", ie);
if (eventHandlingThread != null) {
eventHandlingThread.interrupt();
try {
eventHandlingThread.join();
} catch (InterruptedException ie) {
LOG.debug("Interrupted Exception while stopping", ie);
}
}
//stop all the components
// stop all the components
super.stop();
}

8
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/service/AbstractService.java
View File

@ -63,8 +63,12 @@ public abstract class AbstractService implements Service {
@Override
public synchronized void stop() {
if (state == STATE.STOPPED) {
return;//already stopped
if (state == STATE.STOPPED ||
state == STATE.INITED ||
state == STATE.NOTINITED) {
// already stopped, or else it was never
// started (eg another service failing canceled startup)
return;
}
ensureCurrentState(STATE.STARTED);
changeState(STATE.STOPPED);

5
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/AbstractLivelinessMonitor.java
View File

@ -50,6 +50,7 @@ public abstract class AbstractLivelinessMonitor<O> extends AbstractService {
@Override
public void start() {
assert !stopped : "starting when already stopped";
checkerThread = new Thread(new PingChecker());
checkerThread.setName("Ping Checker");
checkerThread.start();
@ -59,7 +60,9 @@ public abstract class AbstractLivelinessMonitor<O> extends AbstractService {
@Override
public void stop() {
stopped = true;
checkerThread.interrupt();
if (checkerThread != null) {
checkerThread.interrupt();
}
super.stop();
}