Repository: hadoop Updated Branches: refs/heads/branch-2 d064d5dbb -> f4c8dc478
YARN-5834. TestNodeStatusUpdater.testNMRMConnectionConf compares nodemanager wait time to the incorrect value. (Chang Li via kasha) (cherry picked from commit 3a98419532687e4362ffc26abbc1264232820db7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f4c8dc47 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4c8dc47 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4c8dc47 Branch: refs/heads/branch-2 Commit: f4c8dc4783e95cf299efdf79c00499b62e3a5670 Parents: d064d5d Author: Karthik Kambatla <[email protected]> Authored: Thu Nov 10 14:08:51 2016 -0800 Committer: Karthik Kambatla <[email protected]> Committed: Thu Nov 10 14:09:33 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/f4c8dc47/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 bc205b9..d76aa35 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 @@ -1523,13 +1523,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: [email protected] For additional commands, e-mail: [email protected]
