From 729de3e6b6ae1fcfe1c6bec7102d758ad489df47 Mon Sep 17 00:00:00 2001
From: Rohith Sharma K S <rohithsharmaks@apache.org>
Date: Tue, 13 Sep 2016 15:23:24 +0530
Subject: [PATCH] YARN-5631. Missing refreshClusterMaxPriority usage in rmadmin
 help message. Contributed by Kai Sasaki.

---
 .../org/apache/hadoop/yarn/client/cli/RMAdminCLI.java  |  1 +
 .../apache/hadoop/yarn/client/cli/TestRMAdminCLI.java  | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
index fcb9b749e24..7a898a12a38 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
@@ -249,6 +249,7 @@ public class RMAdminCLI extends HAAdmin {
         " [-replaceLabelsOnNode <\"node1[:port]=label1,label2" +
         " node2[:port]=label1\">]" +
         " [-directlyAccessNodeLabelStore]" +
+        " [-refreshClusterMaxPriority]" +
         " [-updateNodeResource [NodeID] [MemSize] [vCores]" +
         " ([OvercommitTimeout])");
     if (isHAEnabled) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
index 60c7eac00d1..bea6e39e1dd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
@@ -471,9 +471,9 @@ public class TestRMAdminCLI {
               "[-removeFromClusterNodeLabels <label1,label2,label3>] " +
               "[-replaceLabelsOnNode " +
               "<\"node1[:port]=label1,label2 node2[:port]=label1\">] " +
-              "[-directlyAccessNodeLabelStore] [-updateNodeResource " +
-              "[NodeID] [MemSize] [vCores] ([OvercommitTimeout]) " +
-              "[-help [cmd]]"));
+              "[-directlyAccessNodeLabelStore] [-refreshClusterMaxPriority] " +
+              "[-updateNodeResource [NodeID] [MemSize] [vCores] " +
+              "([OvercommitTimeout]) [-help [cmd]]"));
       assertTrue(dataOut
           .toString()
           .contains(
@@ -565,7 +565,9 @@ public class TestRMAdminCLI {
                   + "label2(exclusive=false),label3\">]"
               + " [-removeFromClusterNodeLabels <label1,label2,label3>] [-replaceLabelsOnNode "
               + "<\"node1[:port]=label1,label2 node2[:port]=label1\">] [-directlyAccessNodeLabelStore] "
-              + "[-updateNodeResource [NodeID] [MemSize] [vCores] ([OvercommitTimeout]) "
+              + "[-refreshClusterMaxPriority] "
+              + "[-updateNodeResource [NodeID] [MemSize] [vCores] "
+              + "([OvercommitTimeout]) "
               + "[-transitionToActive [--forceactive] <serviceId>] "
               + "[-transitionToStandby <serviceId>] "
               + "[-getServiceState <serviceId>] [-checkHealth <serviceId>] [-help [cmd]]";