You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2015/03/25 15:55:21 UTC
[51/51] [abbrv] hadoop git commit: YARN-3397. yarn rmadmin should
skip -failover. (J.Andreina via kasha)
YARN-3397. yarn rmadmin should skip -failover. (J.Andreina via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c906a1de
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c906a1de
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c906a1de
Branch: refs/heads/YARN-2139
Commit: c906a1de7280dabd9d9d8b6aeaa060898e6d17b6
Parents: e556198
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Mar 25 07:42:27 2015 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Mar 25 07:42:27 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 ++
.../hadoop/yarn/client/cli/RMAdminCLI.java | 5 +++--
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 19 +++++++++----------
3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c906a1de/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 42b4662..905b414 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -79,6 +79,8 @@ Release 2.8.0 - UNRELEASED
YARN-2868. FairScheduler: Metric for latency to allocate first container
for an application. (Ray Chiang via kasha)
+ YARN-3397. yarn rmadmin should skip -failover. (J.Andreina via kasha)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c906a1de/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
----------------------------------------------------------------------
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 4642add..420eeb0 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
@@ -134,7 +134,8 @@ public class RMAdminCLI extends HAAdmin {
private static void appendHAUsage(final StringBuilder usageBuilder) {
for (Map.Entry<String,UsageInfo> cmdEntry : USAGE.entrySet()) {
- if (cmdEntry.getKey().equals("-help")) {
+ if (cmdEntry.getKey().equals("-help")
+ || cmdEntry.getKey().equals("-failover")) {
continue;
}
UsageInfo usageInfo = cmdEntry.getValue();
@@ -225,7 +226,7 @@ public class RMAdminCLI extends HAAdmin {
}
if (isHAEnabled) {
for (String cmdKey : USAGE.keySet()) {
- if (!cmdKey.equals("-help")) {
+ if (!cmdKey.equals("-help") && !cmdKey.equals("-failover")) {
buildHelpMsg(cmdKey, helpBuilder);
helpBuilder.append("\n");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c906a1de/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
----------------------------------------------------------------------
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 c22494c..6067110 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
@@ -364,16 +364,15 @@ public class TestRMAdminCLI {
assertEquals(0, rmAdminCLIWithHAEnabled.run(args));
oldOutPrintStream.println(dataOut);
String expectedHelpMsg =
- "yarn rmadmin [-refreshQueues] [-refreshNodes] [-refreshSuper" +
- "UserGroupsConfiguration] [-refreshUserToGroupsMappings] " +
- "[-refreshAdminAcls] [-refreshServiceAcl] [-getGroup" +
- " [username]] [[-addToClusterNodeLabels [label1,label2,label3]]" +
- " [-removeFromClusterNodeLabels [label1,label2,label3]] [-replaceLabelsOnNode " +
- "[node1[:port]=label1,label2 node2[:port]=label1] [-directlyAccessNodeLabelStore]] " +
- "[-transitionToActive [--forceactive] <serviceId>] " +
- "[-transitionToStandby <serviceId>] [-failover" +
- " [--forcefence] [--forceactive] <serviceId> <serviceId>] " +
- "[-getServiceState <serviceId>] [-checkHealth <serviceId>] [-help [cmd]]";
+ "yarn rmadmin [-refreshQueues] [-refreshNodes] [-refreshSuper"
+ + "UserGroupsConfiguration] [-refreshUserToGroupsMappings] "
+ + "[-refreshAdminAcls] [-refreshServiceAcl] [-getGroup"
+ + " [username]] [[-addToClusterNodeLabels [label1,label2,label3]]"
+ + " [-removeFromClusterNodeLabels [label1,label2,label3]] [-replaceLabelsOnNode "
+ + "[node1[:port]=label1,label2 node2[:port]=label1] [-directlyAccessNodeLabelStore]] "
+ + "[-transitionToActive [--forceactive] <serviceId>] "
+ + "[-transitionToStandby <serviceId>] "
+ + "[-getServiceState <serviceId>] [-checkHealth <serviceId>] [-help [cmd]]";
String actualHelpMsg = dataOut.toString();
assertTrue(String.format("Help messages: %n " + actualHelpMsg + " %n doesn't include expected " +
"messages: %n" + expectedHelpMsg), actualHelpMsg.contains(expectedHelpMsg