From e8876c61401a1288dfc97f01fc6b64f25d40a84b Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Mon, 18 Mar 2019 15:06:33 +0530 Subject: [PATCH] YARN-8148. Update decimal values for queue capacities shown on queue status CLI. Signed-off-by: Prabhu Joseph --- .../java/org/apache/hadoop/yarn/client/cli/QueueCLI.java | 2 +- .../java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java index 2c3dfd0..3aa77b9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java @@ -128,7 +128,7 @@ private void printQueueInfo(PrintWriter writer, QueueInfo queueInfo) { writer.print("\tState : "); writer.println(queueInfo.getQueueState()); - DecimalFormat df = new DecimalFormat("#.0"); + DecimalFormat df = new DecimalFormat("#.00"); writer.print("\tCapacity : "); writer.println(df.format(queueInfo.getCapacity() * 100) + "%"); writer.print("\tCurrent Capacity : "); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java index 0c879ae..024e911 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java @@ -1724,9 +1724,9 @@ public void testGetQueueInfo() throws Exception { pw.println("Queue Information : "); pw.println("Queue Name : " + "queueA"); pw.println("\tState : " + "RUNNING"); - pw.println("\tCapacity : " + "40.0%"); - pw.println("\tCurrent Capacity : " + "50.0%"); - pw.println("\tMaximum Capacity : " + "80.0%"); + pw.println("\tCapacity : " + "40.00%"); + pw.println("\tCurrent Capacity : " + "50.00%"); + pw.println("\tMaximum Capacity : " + "80.00%"); pw.println("\tDefault Node Label expression : " + "GPU"); pw.println("\tAccessible Node Labels : " + "JDK_7,GPU"); pw.println("\tPreemption : " + "enabled"); @@ -1903,9 +1903,9 @@ public void testGetQueueInfoWithEmptyNodeLabel() throws Exception { pw.println("Queue Information : "); pw.println("Queue Name : " + "queueA"); pw.println("\tState : " + "RUNNING"); - pw.println("\tCapacity : " + "40.0%"); - pw.println("\tCurrent Capacity : " + "50.0%"); - pw.println("\tMaximum Capacity : " + "80.0%"); + pw.println("\tCapacity : " + "40.00%"); + pw.println("\tCurrent Capacity : " + "50.00%"); + pw.println("\tMaximum Capacity : " + "80.00%"); pw.println("\tDefault Node Label expression : " + NodeLabel.DEFAULT_NODE_LABEL_PARTITION); pw.println("\tAccessible Node Labels : "); -- 2.7.4 (Apple Git-66)