Repository: hadoop Updated Branches: refs/heads/trunk 7a3c6e9c3 -> 35ec9401e
YARN-8438. TestContainer.testKillOnNew flaky on trunk. Contributed by Szilard Nemeth. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/35ec9401 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/35ec9401 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/35ec9401 Branch: refs/heads/trunk Commit: 35ec9401e829bfa10994790659a26b0babacae35 Parents: 7a3c6e9 Author: Miklos Szegedi <miklos.szeg...@cloudera.com> Authored: Mon Jun 25 09:23:11 2018 -0700 Committer: Miklos Szegedi <miklos.szeg...@cloudera.com> Committed: Mon Jun 25 15:47:54 2018 -0700 ---------------------------------------------------------------------- .../containermanager/container/TestContainer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/35ec9401/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 ---------------------------------------------------------------------- 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 1a263ee..edf26d4 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(); } } + } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
