From 4c66a8d19b7d503095ad27aeed39d62238b9cb47 Mon Sep 17 00:00:00 2001
From: Ray Chiang <rchiang@apache.org>
Date: Tue, 14 Mar 2017 14:37:18 -0700
Subject: [PATCH] YARN-6331. Fix flakiness in TestFairScheduler#testDumpState.
 (Yufei Gu via rchiang)

---
 .../resourcemanager/scheduler/fair/TestFairScheduler.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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/fair/TestFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
index 537d3d0d39..baf74346fe 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
@@ -5201,6 +5201,7 @@ public void testDumpState() throws IOException {
     FSParentQueue parent =
         scheduler.getQueueManager().getParentQueue("parent", false);
     parent.setMaxShare(resource);
+    parent.updateDemand();
 
     String parentQueueString = "{Name: root.parent,"
         + " Weight: <memory weight=1.0, cpu weight=1.0>,"
@@ -5210,7 +5211,7 @@ public void testDumpState() throws IOException {
         + " MaxShare: <memory:4096, vCores:4>,"
         + " MinShare: <memory:0, vCores:0>,"
         + " ResourceUsage: <memory:4096, vCores:4>,"
-        + " Demand: <memory:0, vCores:0>,"
+        + " Demand: <memory:4096, vCores:4>,"
         + " MaxAMShare: 0.5,"
         + " Runnable: 0}";