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

YARN-8861. executorLock is misleading in ContainerLaunch. Contributed by Chandni Singh

This commit is contained in:
Jason Lowe 2018-10-11 10:54:57 -05:00
parent ee816f1fd7
commit e787d65a08
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
View File

@ -135,7 +135,7 @@ public class ContainerLaunch implements Callable<Integer> {
protected final LocalDirsHandlerService dirsHandler;
private final Lock containerExecLock = new ReentrantLock();
private final Lock launchLock = new ReentrantLock();
public ContainerLaunch(Context context, Configuration configuration,
Dispatcher dispatcher, ContainerExecutor exec, Application app,
@ -485,11 +485,11 @@ public class ContainerLaunch implements Callable<Integer> {
throws IOException, ConfigurationException {
int launchPrep = prepareForLaunch(ctx);
if (launchPrep == 0) {
containerExecLock.lock();
launchLock.lock();
try {
return exec.launchContainer(ctx);
} finally {
containerExecLock.unlock();
launchLock.unlock();
}
}
return launchPrep;
@ -499,18 +499,18 @@ public class ContainerLaunch implements Callable<Integer> {
throws IOException, ConfigurationException {
int launchPrep = prepareForLaunch(ctx);
if (launchPrep == 0) {
containerExecLock.lock();
launchLock.lock();
try {
return exec.relaunchContainer(ctx);
} finally {
containerExecLock.unlock();
launchLock.unlock();
}
}
return launchPrep;
}
void reapContainer() throws IOException {
containerExecLock.lock();
launchLock.lock();
try {
// Reap the container
boolean result = exec.reapContainer(
@ -524,7 +524,7 @@ public class ContainerLaunch implements Callable<Integer> {
}
cleanupContainerFiles(getContainerWorkDir());
} finally {
containerExecLock.unlock();
launchLock.unlock();
}
}