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

YARN-5994. TestCapacityScheduler.testAMLimitUsage fails intermittently. Contributed by Eric Badger 

(cherry picked from commit 157a9f3104)
This commit is contained in:
Eric Payne 2017-04-14 10:53:09 -05:00
parent ecaedca5c4
commit d27f74d915
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
View File

@ -46,6 +46,7 @@ import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
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.LocalConfigurationProvider; import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.api.ApplicationMasterProtocol; import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest; import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
@ -150,6 +151,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@ -3159,7 +3161,7 @@ public class TestCapacityScheduler {
Assert.assertEquals(queueInfoB.getDefaultNodeLabelExpression(), "y"); Assert.assertEquals(queueInfoB.getDefaultNodeLabelExpression(), "y");
} }
@Test(timeout = 30000) @Test(timeout = 60000)
public void testAMLimitUsage() throws Exception { public void testAMLimitUsage() throws Exception {
CapacitySchedulerConfiguration config = CapacitySchedulerConfiguration config =
@ -3287,11 +3289,12 @@ public class TestCapacityScheduler {
private void verifyAMLimitForLeafQueue(CapacitySchedulerConfiguration config) private void verifyAMLimitForLeafQueue(CapacitySchedulerConfiguration config)
throws Exception { throws Exception {
MockRM rm = setUpMove(config); MockRM rm = setUpMove(config);
rm.registerNode("127.0.0.1:1234", 2 * GB); final int nodeMemory = 4 * GB;
rm.registerNode("127.0.0.1:1234", nodeMemory);
String queueName = "a1"; String queueName = "a1";
String userName = "user_0"; String userName = "user_0";
ResourceScheduler scheduler = rm.getRMContext().getScheduler(); final ResourceScheduler scheduler = rm.getRMContext().getScheduler();
LeafQueue queueA = LeafQueue queueA =
(LeafQueue) ((CapacityScheduler) scheduler).getQueue(queueName); (LeafQueue) ((CapacityScheduler) scheduler).getQueue(queueName);
Resource amResourceLimit = queueA.getAMResourceLimit(); Resource amResourceLimit = queueA.getAMResourceLimit();
@ -3303,6 +3306,14 @@ public class TestCapacityScheduler {
Resource.newInstance(amResourceLimit.getMemorySize() + 2048, Resource.newInstance(amResourceLimit.getMemorySize() + 2048,
amResourceLimit.getVirtualCores() + 1); amResourceLimit.getVirtualCores() + 1);
// Wait for the scheduler to be updated with new node capacity
GenericTestUtils.waitFor(new Supplier<Boolean>() {
@Override
public Boolean get() {
return scheduler.getMaximumResourceCapability().getMemorySize() == nodeMemory;
}
}, 100, 60 * 1000);
rm.submitApp(amResource1, "app-1", userName, null, queueName); rm.submitApp(amResource1, "app-1", userName, null, queueName);
rm.submitApp(amResource2, "app-2", userName, null, queueName); rm.submitApp(amResource2, "app-2", userName, null, queueName);