big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-7479. TestContainerManagerSecurity.testContainerManager[Simple] flaky in trunk (ajisakaa via rkanter)

Browse Source
This commit is contained in:
Robert Kanter 2018-01-16 10:16:42 -08:00
parent b202935353
commit 5ac109909a
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
View File

@ -30,12 +30,10 @@
import java.util.List; import java.util.List;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import com.google.common.base.Supplier;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.minikdc.KerberosSecurityTestcase; import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.security.token.SecretManager.InvalidToken;
import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.GenericTestUtils;
@ -52,7 +50,6 @@
import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.api.records.ContainerState; import org.apache.hadoop.yarn.api.records.ContainerState;
import org.apache.hadoop.yarn.api.records.ContainerStatus;
import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeId;
import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.Resource;
@ -409,9 +406,10 @@ private void testNMTokens(Configuration testConf) throws Exception {
} }
private void waitForContainerToFinishOnNM(ContainerId containerId) private void waitForContainerToFinishOnNM(ContainerId containerId)
throws TimeoutException, InterruptedException { throws InterruptedException {
Context nmContext = yarnCluster.getNodeManager(0).getNMContext(); Context nmContext = yarnCluster.getNodeManager(0).getNMContext();
int interval = 4 * 60; // Max time for container token to expire. // Max time for container token to expire.
final int timeout = 4 * 60 * 1000;
// If the container is null, then it has already completed and been removed // If the container is null, then it has already completed and been removed
// from the Context by asynchronous calls. // from the Context by asynchronous calls.
@ -420,14 +418,11 @@ private void waitForContainerToFinishOnNM(ContainerId containerId)
try { try {
LOG.info("Waiting for " + containerId + " to get to state " + LOG.info("Waiting for " + containerId + " to get to state " +
ContainerState.COMPLETE); ContainerState.COMPLETE);
GenericTestUtils.waitFor(new Supplier<Boolean>() { GenericTestUtils.waitFor(() -> ContainerState.COMPLETE.equals(
@Override waitContainer.cloneAndGetContainerStatus().getState()),
public Boolean get() { 500, timeout);
return ContainerState.COMPLETE.equals(
waitContainer.cloneAndGetContainerStatus().getState());
}
}, 10, interval);
} catch (TimeoutException te) { } catch (TimeoutException te) {
LOG.error("TimeoutException", te);
fail("Was waiting for " + containerId + " to get to state " + fail("Was waiting for " + containerId + " to get to state " +
ContainerState.COMPLETE + " but was in state " + ContainerState.COMPLETE + " but was in state " +
waitContainer.cloneAndGetContainerStatus().getState() + waitContainer.cloneAndGetContainerStatus().getState() +