From 35ec9401e829bfa10994790659a26b0babacae35 Mon Sep 17 00:00:00 2001 From: Miklos Szegedi Date: Mon, 25 Jun 2018 09:23:11 -0700 Subject: [PATCH] YARN-8438. TestContainer.testKillOnNew flaky on trunk. Contributed by Szilard Nemeth. --- .../containermanager/container/TestContainer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java index 1a263eea19..edf26d46dd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java @@ -116,7 +116,7 @@ public class TestContainer { final NodeManagerMetrics metrics = NodeManagerMetrics.create(); final Configuration conf = new YarnConfiguration(); final String FAKE_LOCALIZATION_ERROR = "Fake localization error"; - + /** * Verify correct container request events sent to localizer. */ @@ -591,9 +591,8 @@ public class TestContainer { Assert.assertEquals(ContainerExitStatus.KILLED_BY_RESOURCEMANAGER, containerMetrics.exitCode.value()); Assert.assertTrue(containerMetrics.startTime.value() > 0); - Assert.assertTrue( - containerMetrics.finishTime.value() > containerMetrics.startTime - .value()); + Assert.assertTrue(containerMetrics.finishTime.value() >= + containerMetrics.startTime.value()); Assert.assertEquals(ContainerEventType.KILL_CONTAINER, wc.initStateToEvent.get(ContainerState.NEW)); Assert.assertEquals(ContainerState.DONE, @@ -1612,4 +1611,5 @@ public class TestContainer { return ((ContainerImpl)c).getRetryPolicy(); } } + }