Repository: hadoop Updated Branches: refs/heads/branch-2 50a5d0b62 -> eb0c6d2ee
YARN-3343. Increased TestCapacitySchedulerNodeLabelUpdate#testNodeUpdate timeout. Contributed by Rohith Sharmaks (cherry picked from commit e4c3b52c896291012f869ebc0a21e85e643fadd1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb0c6d2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb0c6d2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb0c6d2e Branch: refs/heads/branch-2 Commit: eb0c6d2ee7e53f3ee0fb768f14d60d3e87ba3a1d Parents: 50a5d0b Author: Jian He <jia...@apache.org> Authored: Tue May 5 11:33:47 2015 -0700 Committer: Jian He <jia...@apache.org> Committed: Tue May 5 11:34:11 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../scheduler/capacity/TestCapacitySchedulerNodeLabelUpdate.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0c6d2e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3193681..b6e3b86 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -268,6 +268,9 @@ Release 2.8.0 - UNRELEASED YARN-2123. Progress bars in Web UI always at 100% due to non-US locale. (Akira AJISAKA via xgong) + YARN-3343. Increased TestCapacitySchedulerNodeLabelUpdate#testNodeUpdate + timeout. (Rohith Sharmaks via jianhe) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb0c6d2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNodeLabelUpdate.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/scheduler/capacity/TestCapacitySchedulerNodeLabelUpdate.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNodeLabelUpdate.java index c5439d8..e60e496 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNodeLabelUpdate.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerNodeLabelUpdate.java @@ -95,7 +95,7 @@ public class TestCapacitySchedulerNodeLabelUpdate { .getMemory()); } - @Test (timeout = 30000) + @Test (timeout = 60000) public void testNodeUpdate() throws Exception { // set node -> label mgr.addToCluserNodeLabelsWithDefaultExclusivity(ImmutableSet.of("x", "y", "z"));
