YARN-5834. TestNodeStatusUpdater.testNMRMConnectionConf compares nodemanager wait time to the incorrect value. (Chang Li via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a984195 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a984195 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a984195 Branch: refs/heads/YARN-4752 Commit: 3a98419532687e4362ffc26abbc1264232820db7 Parents: 89354f0 Author: Karthik Kambatla <ka...@cloudera.com> Authored: Thu Nov 10 14:08:51 2016 -0800 Committer: Karthik Kambatla <ka...@cloudera.com> Committed: Thu Nov 10 14:08:51 2016 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a984195/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.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/TestNodeStatusUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java index 977cb76..59a4563 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java @@ -1524,13 +1524,13 @@ public class TestNodeStatusUpdater { long t = System.currentTimeMillis(); long duration = t - waitStartTime; boolean waitTimeValid = (duration >= nmRmConnectionWaitMs) && - (duration < (connectionWaitMs + delta)); + (duration < (nmRmConnectionWaitMs + delta)); if(!waitTimeValid) { // throw exception if NM doesn't retry long enough throw new Exception("NM should have tried re-connecting to RM during " + - "period of at least " + connectionWaitMs + " ms, but " + - "stopped retrying within " + (connectionWaitMs + delta) + + "period of at least " + nmRmConnectionWaitMs + " ms, but " + + "stopped retrying within " + (nmRmConnectionWaitMs + delta) + " ms: " + e, e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
