Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "YARN-5389. TestYarnClient#testReservationDelete fails. Contributed by Sean Po" 

This reverts commit 782aeabcd5.
This commit is contained in:
Jason Lowe 2016-08-25 14:59:20 +00:00
parent 782aeabcd5
commit 6de262cdc4
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java
View File

@ -41,7 +41,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.google.common.base.Supplier;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DataInputByteBuffer; import org.apache.hadoop.io.DataInputByteBuffer;
@ -53,7 +52,6 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod; import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier; 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.ApplicationClientProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest; import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse; import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
@ -1195,7 +1193,7 @@ public class TestYarnClient {
} }
} }
private MiniYARNCluster setupMiniYARNCluster() throws Exception { private MiniYARNCluster setupMiniYARNCluster() {
CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
ReservationSystemTestUtil.setupQueueConfiguration(conf); ReservationSystemTestUtil.setupQueueConfiguration(conf);
conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
@ -1207,15 +1205,23 @@ public class TestYarnClient {
cluster.init(conf); cluster.init(conf);
cluster.start(); cluster.start();
GenericTestUtils.waitFor(new Supplier<Boolean>() { int attempts;
@Override for (attempts = 10; attempts > 0; attempts--) {
public Boolean get() { if (cluster.getResourceManager().getRMContext().getReservationSystem()
return cluster.getResourceManager().getRMContext() .getPlan(ReservationSystemTestUtil.reservationQ).getTotalCapacity()
.getReservationSystem() .getMemorySize() > 6000) {
.getPlan(ReservationSystemTestUtil.reservationQ) break;
.getTotalCapacity().getMemorySize() > 6000;
} }
}, 10, 10000); try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
if (attempts <= 0) {
Assert.fail("Exhausted attempts in checking if node capacity was "
+ "added to the plan");
}
return cluster; return cluster;
} }
@ -1247,7 +1253,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testCreateReservation() throws Exception { public void testCreateReservation() {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {
@ -1290,7 +1296,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testUpdateReservation() throws Exception { public void testUpdateReservation() {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {
@ -1332,7 +1338,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testListReservationsByReservationId() throws Exception{ public void testListReservationsByReservationId() {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {
@ -1369,7 +1375,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testListReservationsByTimeInterval() throws Exception { public void testListReservationsByTimeInterval() {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {
@ -1434,7 +1440,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testListReservationsByInvalidTimeInterval() throws Exception { public void testListReservationsByInvalidTimeInterval() {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {
@ -1484,8 +1490,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testListReservationsByTimeIntervalContainingNoReservations() public void testListReservationsByTimeIntervalContainingNoReservations() {
throws Exception {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {
@ -1575,7 +1580,7 @@ public class TestYarnClient {
} }
@Test @Test
public void testReservationDelete() throws Exception { public void testReservationDelete() {
MiniYARNCluster cluster = setupMiniYARNCluster(); MiniYARNCluster cluster = setupMiniYARNCluster();
YarnClient client = setupYarnClient(cluster); YarnClient client = setupYarnClient(cluster);
try { try {