You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sj...@apache.org on 2016/09/13 23:46:49 UTC
hadoop git commit: YARN-4794. Deadlock in NMClientImpl. Contributed
by Jian He.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 3b39721f3 -> d42af00ca
YARN-4794. Deadlock in NMClientImpl. Contributed by Jian He.
(cherry picked from commit 3afdac6e2c5b98cf1b5e3069ae722a06f645d58d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d42af00c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d42af00c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d42af00c
Branch: refs/heads/branch-2.6
Commit: d42af00cad5c721fa4f87dd1acb9b4b8ddf09bea
Parents: 3b39721
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Wed Apr 13 11:13:42 2016 +0530
Committer: Sangjin Lee <sj...@apache.org>
Committed: Tue Sep 13 16:46:27 2016 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 ++
.../yarn/client/api/impl/NMClientImpl.java | 36 +++++---------------
2 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d42af00c/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 789251a..3c776c1 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -60,6 +60,8 @@ Release 2.6.5 - UNRELEASED
YARN-4573. Fix test failure in TestRMAppTransitions#testAppRunningKill and
testAppKilledKilled. (Takashi Ohnishi via rohithsharmaks)
+ YARN-4794. Deadlock in NMClientImpl (Jian He via Rohith Sharma K S)
+
Release 2.6.4 - 2016-02-11
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d42af00c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/NMClientImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/NMClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/NMClientImpl.java
index 3518f35..d611b3f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/NMClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/NMClientImpl.java
@@ -147,8 +147,7 @@ public class NMClientImpl extends NMClient {
private ContainerState state;
- public StartedContainer(ContainerId containerId, NodeId nodeId,
- Token containerToken) {
+ public StartedContainer(ContainerId containerId, NodeId nodeId) {
this.containerId = containerId;
this.nodeId = nodeId;
state = ContainerState.NEW;
@@ -170,8 +169,6 @@ public class NMClientImpl extends NMClient {
throw RPCUtil.getRemoteException("Container "
+ startedContainer.containerId.toString() + " is already started");
}
- startedContainers
- .put(startedContainer.getContainerId(), startedContainer);
}
@Override
@@ -181,7 +178,8 @@ public class NMClientImpl extends NMClient {
// Do synchronization on StartedContainer to prevent race condition
// between startContainer and stopContainer only when startContainer is
// in progress for a given container.
- StartedContainer startingContainer = createStartedContainer(container);
+ StartedContainer startingContainer =
+ new StartedContainer(container.getId(), container.getNodeId());
synchronized (startingContainer) {
addStartingContainer(startingContainer);
@@ -212,15 +210,16 @@ public class NMClientImpl extends NMClient {
} catch (YarnException e) {
startingContainer.state = ContainerState.COMPLETE;
// Remove the started container if it failed to start
- removeStartedContainer(startingContainer);
+ startedContainers.remove(startingContainer.containerId);
throw e;
} catch (IOException e) {
startingContainer.state = ContainerState.COMPLETE;
- removeStartedContainer(startingContainer);
+ // Remove the started container if it failed to start
+ startedContainers.remove(startingContainer.containerId);
throw e;
} catch (Throwable t) {
startingContainer.state = ContainerState.COMPLETE;
- removeStartedContainer(startingContainer);
+ startedContainers.remove(startingContainer.containerId);
throw RPCUtil.getRemoteException(t);
} finally {
if (proxy != null) {
@@ -234,7 +233,7 @@ public class NMClientImpl extends NMClient {
@Override
public void stopContainer(ContainerId containerId, NodeId nodeId)
throws YarnException, IOException {
- StartedContainer startedContainer = getStartedContainer(containerId);
+ StartedContainer startedContainer = startedContainers.get(containerId);
// Only allow one request of stopping the container to move forward
// When entering the block, check whether the precursor has already stopped
@@ -247,7 +246,7 @@ public class NMClientImpl extends NMClient {
stopContainerInternal(containerId, nodeId);
// Only after successful
startedContainer.state = ContainerState.COMPLETE;
- removeStartedContainer(startedContainer);
+ startedContainers.remove(startedContainer.containerId);
}
} else {
stopContainerInternal(containerId, nodeId);
@@ -304,23 +303,6 @@ public class NMClientImpl extends NMClient {
}
}
}
-
- protected synchronized StartedContainer createStartedContainer(
- Container container) throws YarnException, IOException {
- StartedContainer startedContainer = new StartedContainer(container.getId(),
- container.getNodeId(), container.getContainerToken());
- return startedContainer;
- }
-
- protected synchronized void
- removeStartedContainer(StartedContainer container) {
- startedContainers.remove(container.containerId);
- }
-
- protected synchronized StartedContainer getStartedContainer(
- ContainerId containerId) {
- return startedContainers.get(containerId);
- }
public AtomicBoolean getCleanupRunningContainers() {
return cleanupRunningContainers;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org