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 jl...@apache.org on 2016/08/25 14:47:17 UTC
hadoop git commit: YARN-5389. TestYarnClient#testReservationDelete
fails. Contributed by Sean Po
Repository: hadoop
Updated Branches:
refs/heads/trunk 52b25fe6a -> 3d86110a5
YARN-5389. TestYarnClient#testReservationDelete fails. Contributed by Sean Po
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3d86110a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d86110a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d86110a
Branch: refs/heads/trunk
Commit: 3d86110a5ccfdaff8671fb6ad8f67b4ab66f33da
Parents: 52b25fe
Author: Jason Lowe <jl...@apache.org>
Authored: Thu Aug 25 14:42:06 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Thu Aug 25 14:42:06 2016 +0000
----------------------------------------------------------------------
.../yarn/client/api/impl/TestYarnClient.java | 43 +++++++++-----------
1 file changed, 19 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d86110a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
index 360ff99..dd19acb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
@@ -41,6 +41,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.common.base.Supplier;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DataInputByteBuffer;
@@ -52,6 +53,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
+import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
@@ -1193,7 +1195,7 @@ public class TestYarnClient {
}
}
- private MiniYARNCluster setupMiniYARNCluster() {
+ private MiniYARNCluster setupMiniYARNCluster() throws Exception {
CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
ReservationSystemTestUtil.setupQueueConfiguration(conf);
conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
@@ -1205,23 +1207,15 @@ public class TestYarnClient {
cluster.init(conf);
cluster.start();
- int attempts;
- for (attempts = 10; attempts > 0; attempts--) {
- if (cluster.getResourceManager().getRMContext().getReservationSystem()
- .getPlan(ReservationSystemTestUtil.reservationQ).getTotalCapacity()
- .getMemorySize() > 6000) {
- break;
- }
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
+ GenericTestUtils.waitFor(new Supplier<Boolean>() {
+ @Override
+ public Boolean get() {
+ return cluster.getResourceManager().getRMContext()
+ .getReservationSystem()
+ .getPlan(ReservationSystemTestUtil.reservationQ)
+ .getTotalCapacity().getMemorySize() > 6000;
}
- }
- if (attempts <= 0) {
- Assert.fail("Exhausted attempts in checking if node capacity was "
- + "added to the plan");
- }
+ }, 10, 10000);
return cluster;
}
@@ -1253,7 +1247,7 @@ public class TestYarnClient {
}
@Test
- public void testCreateReservation() {
+ public void testCreateReservation() throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
@@ -1296,7 +1290,7 @@ public class TestYarnClient {
}
@Test
- public void testUpdateReservation() {
+ public void testUpdateReservation() throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
@@ -1338,7 +1332,7 @@ public class TestYarnClient {
}
@Test
- public void testListReservationsByReservationId() {
+ public void testListReservationsByReservationId() throws Exception{
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
@@ -1375,7 +1369,7 @@ public class TestYarnClient {
}
@Test
- public void testListReservationsByTimeInterval() {
+ public void testListReservationsByTimeInterval() throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
@@ -1440,7 +1434,7 @@ public class TestYarnClient {
}
@Test
- public void testListReservationsByInvalidTimeInterval() {
+ public void testListReservationsByInvalidTimeInterval() throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
@@ -1490,7 +1484,8 @@ public class TestYarnClient {
}
@Test
- public void testListReservationsByTimeIntervalContainingNoReservations() {
+ public void testListReservationsByTimeIntervalContainingNoReservations()
+ throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
@@ -1580,7 +1575,7 @@ public class TestYarnClient {
}
@Test
- public void testReservationDelete() {
+ public void testReservationDelete() throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster);
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org