Repository: hadoop Updated Branches: refs/heads/branch-2.7 8f1739502 -> 0ee36fd51
YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ee36fd5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ee36fd5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ee36fd5 Branch: refs/heads/branch-2.7 Commit: 0ee36fd51190ed10022b8d4c9098f6fecc0679af Parents: 8f17395 Author: Eric Payne <epa...@apache.org> Authored: Mon May 16 21:12:26 2016 +0000 Committer: Eric Payne <epa...@apache.org> Committed: Mon May 16 21:12:26 2016 +0000 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/TestFifoScheduler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ee36fd5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java index 2327af4..a128d5f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java @@ -584,7 +584,8 @@ public class TestFifoScheduler { waitCount = 0; while (waitCount++ != 20) { report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId()); - if (report_nm1.getAvailableResource().getMemory() != 0) { + if (null != report_nm1 && + report_nm1.getAvailableResource().getMemory() != 0) { break; } LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried " --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
