Repository: hadoop Updated Branches: refs/heads/branch-3.2 70d39c74d -> cdbca8b13
YARN-8861. executorLock is misleading in ContainerLaunch. Contributed by Chandni Singh (cherry picked from commit e787d65a08f5d5245d2313fc34f2dde518bfaa5b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cdbca8b1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cdbca8b1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cdbca8b1 Branch: refs/heads/branch-3.2 Commit: cdbca8b133f0d12d448470cde7af58262dbbd824 Parents: 70d39c7 Author: Jason Lowe <[email protected]> Authored: Thu Oct 11 10:54:57 2018 -0500 Committer: Jason Lowe <[email protected]> Committed: Thu Oct 11 10:58:48 2018 -0500 ---------------------------------------------------------------------- .../containermanager/launcher/ContainerLaunch.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdbca8b1/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 ---------------------------------------------------------------------- diff --git a/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 b/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 index 6776836..f198e83 100644 --- a/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 +++ b/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 @@ -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(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
