YARN-8438. TestContainer.testKillOnNew flaky on trunk. Contributed by Szilard Nemeth.

This commit is contained in:
Miklos Szegedi 2018-06-25 09:23:11 -07:00
parent 7a3c6e9c3c
commit 35ec9401e8

View File

@ -116,7 +116,7 @@ public class TestContainer {
final NodeManagerMetrics metrics = NodeManagerMetrics.create(); final NodeManagerMetrics metrics = NodeManagerMetrics.create();
final Configuration conf = new YarnConfiguration(); final Configuration conf = new YarnConfiguration();
final String FAKE_LOCALIZATION_ERROR = "Fake localization error"; final String FAKE_LOCALIZATION_ERROR = "Fake localization error";
/** /**
* Verify correct container request events sent to localizer. * Verify correct container request events sent to localizer.
*/ */
@ -591,9 +591,8 @@ public void testKillOnNew() throws Exception {
Assert.assertEquals(ContainerExitStatus.KILLED_BY_RESOURCEMANAGER, Assert.assertEquals(ContainerExitStatus.KILLED_BY_RESOURCEMANAGER,
containerMetrics.exitCode.value()); containerMetrics.exitCode.value());
Assert.assertTrue(containerMetrics.startTime.value() > 0); Assert.assertTrue(containerMetrics.startTime.value() > 0);
Assert.assertTrue( Assert.assertTrue(containerMetrics.finishTime.value() >=
containerMetrics.finishTime.value() > containerMetrics.startTime containerMetrics.startTime.value());
.value());
Assert.assertEquals(ContainerEventType.KILL_CONTAINER, Assert.assertEquals(ContainerEventType.KILL_CONTAINER,
wc.initStateToEvent.get(ContainerState.NEW)); wc.initStateToEvent.get(ContainerState.NEW));
Assert.assertEquals(ContainerState.DONE, Assert.assertEquals(ContainerState.DONE,
@ -1612,4 +1611,5 @@ public SlidingWindowRetryPolicy getRetryPolicy() {
return ((ContainerImpl)c).getRetryPolicy(); return ((ContainerImpl)c).getRetryPolicy();
} }
} }
} }