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 ka...@apache.org on 2016/11/11 00:10:45 UTC
[18/50] [abbrv] hadoop git commit: YARN-5377. Fix
TestQueuingContainerManager.testKillMultipleOpportunisticContainers.
(Konstantinos Karanasos via asuresh)
YARN-5377. Fix TestQueuingContainerManager.testKillMultipleOpportunisticContainers. (Konstantinos Karanasos via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f38a6d03
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f38a6d03
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f38a6d03
Branch: refs/heads/YARN-4752
Commit: f38a6d03a11ca6de93a225563ddf55ec99d5063c
Parents: 3fff158
Author: Arun Suresh <as...@apache.org>
Authored: Mon Nov 7 22:10:03 2016 -0800
Committer: Arun Suresh <as...@apache.org>
Committed: Mon Nov 7 22:10:03 2016 -0800
----------------------------------------------------------------------
.../BaseContainerManagerTest.java | 38 +++++++++++++-------
.../queuing/TestQueuingContainerManager.java | 6 ++--
2 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f38a6d03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
index d359c3d..6dd1ac7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
@@ -284,15 +284,17 @@ public abstract class BaseContainerManagerTest {
.build());
}
- public static void waitForContainerState(ContainerManagementProtocol containerManager,
- ContainerId containerID, ContainerState finalState)
+ public static void waitForContainerState(
+ ContainerManagementProtocol containerManager, ContainerId containerID,
+ ContainerState finalState)
throws InterruptedException, YarnException, IOException {
waitForContainerState(containerManager, containerID, finalState, 20);
}
- public static void waitForContainerState(ContainerManagementProtocol containerManager,
- ContainerId containerID, ContainerState finalState, int timeOutMax)
- throws InterruptedException, YarnException, IOException {
+ public static void waitForContainerState(
+ ContainerManagementProtocol containerManager, ContainerId containerID,
+ ContainerState finalState, int timeOutMax)
+ throws InterruptedException, YarnException, IOException {
List<ContainerId> list = new ArrayList<ContainerId>();
list.add(containerID);
GetContainerStatusesRequest request =
@@ -314,8 +316,9 @@ public abstract class BaseContainerManagerTest {
finalState, containerStatus.getState());
}
- static void waitForApplicationState(ContainerManagerImpl containerManager,
- ApplicationId appID, ApplicationState finalState)
+ public static void waitForApplicationState(
+ ContainerManagerImpl containerManager, ApplicationId appID,
+ ApplicationState finalState)
throws InterruptedException {
// Wait for app-finish
Application app =
@@ -344,7 +347,16 @@ public abstract class BaseContainerManagerTest {
public static void waitForNMContainerState(ContainerManagerImpl
containerManager, ContainerId containerID,
org.apache.hadoop.yarn.server.nodemanager.containermanager
- .container.ContainerState finalState, int timeOutMax)
+ .container.ContainerState finalState, int timeOutMax)
+ throws InterruptedException, YarnException, IOException {
+ waitForNMContainerState(containerManager, containerID,
+ Arrays.asList(finalState), timeOutMax);
+ }
+
+ public static void waitForNMContainerState(ContainerManagerImpl
+ containerManager, ContainerId containerID,
+ List<org.apache.hadoop.yarn.server.nodemanager.containermanager
+ .container.ContainerState> finalStates, int timeOutMax)
throws InterruptedException, YarnException, IOException {
Container container = null;
org.apache.hadoop.yarn.server.nodemanager
@@ -358,15 +370,15 @@ public abstract class BaseContainerManagerTest {
currentState = container.getContainerState();
}
if (currentState != null) {
- LOG.info("Waiting for NM container to get into state " + finalState
- + ". Current state is " + currentState);
+ LOG.info("Waiting for NM container to get into one of the following " +
+ "states: " + finalStates + ". Current state is " + currentState);
}
timeoutSecs += 2;
- } while (!currentState.equals(finalState)
+ } while (!finalStates.contains(currentState)
&& timeoutSecs++ < timeOutMax);
LOG.info("Container state is " + currentState);
- Assert.assertEquals("ContainerState is not correct (timedout)",
- finalState, currentState);
+ Assert.assertTrue("ContainerState is not correct (timedout)",
+ finalStates.contains(currentState));
}
public static Token createContainerToken(ContainerId cId, long rmIdentifier,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f38a6d03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/TestQueuingContainerManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/TestQueuingContainerManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/TestQueuingContainerManager.java
index caebef7..7f06afa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/TestQueuingContainerManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/TestQueuingContainerManager.java
@@ -467,8 +467,10 @@ public class TestQueuingContainerManager extends BaseContainerManagerTest {
StartContainersRequest.newInstance(list);
containerManager.startContainers(allRequests);
- BaseContainerManagerTest.waitForNMContainerState(containerManager,
- createContainerId(0), ContainerState.DONE, 40);
+ BaseContainerManagerTest.waitForNMContainerState(
+ containerManager, createContainerId(0),
+ Arrays.asList(ContainerState.DONE,
+ ContainerState.CONTAINER_CLEANEDUP_AFTER_KILL), 40);
Thread.sleep(5000);
// Get container statuses. Container 0 should be killed, container 1
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org