big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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