From eb0c6d2ee7e53f3ee0fb768f14d60d3e87ba3a1d Mon Sep 17 00:00:00 2001
From: Jian He <jianhe@apache.org>
Date: Tue, 5 May 2015 11:33:47 -0700
Subject: [PATCH] YARN-3343. Increased
 TestCapacitySchedulerNodeLabelUpdate#testNodeUpdate timeout. Contributed by
 Rohith Sharmaks (cherry picked from commit
 e4c3b52c896291012f869ebc0a21e85e643fadd1)

---
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../capacity/TestCapacitySchedulerNodeLabelUpdate.java         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3193681bbd6..b6e3b863766 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
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 c5439d83389..e60e4966628 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"));