diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java index ad2f68ab8fd..50eda65e5ab 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java @@ -409,9 +409,9 @@ private void testNMTokens(Configuration testConf) throws Exception { } private void waitForContainerToFinishOnNM(ContainerId containerId) - throws TimeoutException, InterruptedException { + throws InterruptedException { Context nmContext = yarnCluster.getNodeManager(0).getNMContext(); - int interval = 4 * 60; // Max time for container token to expire. + final int timeout = 4 * 60 * 1000; // Max time for container token to expire. // If the container is null, then it has already completed and been removed // from the Context by asynchronous calls. @@ -420,14 +420,11 @@ private void waitForContainerToFinishOnNM(ContainerId containerId) try { LOG.info("Waiting for " + containerId + " to get to state " + ContainerState.COMPLETE); - GenericTestUtils.waitFor(new Supplier() { - @Override - public Boolean get() { - return ContainerState.COMPLETE.equals( - waitContainer.cloneAndGetContainerStatus().getState()); - } - }, 10, interval); + GenericTestUtils.waitFor(() -> ContainerState.COMPLETE.equals( + waitContainer.cloneAndGetContainerStatus().getState()), + 10, timeout); } catch (TimeoutException te) { + LOG.error("TimeoutException", te); fail("Was waiting for " + containerId + " to get to state " + ContainerState.COMPLETE + " but was in state " + waitContainer.cloneAndGetContainerStatus().getState() +