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 bi...@apache.org on 2013/10/29 22:21:07 UTC
svn commit: r1536899 -
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
Author: bikas
Date: Tue Oct 29 21:21:06 2013
New Revision: 1536899
URL: http://svn.apache.org/r1536899
Log:
Merge r1536888 from trunk to branch-2 for YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java?rev=1536899&r1=1536898&r2=1536899&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java Tue Oct 29 21:21:06 2013
@@ -63,7 +63,7 @@ public abstract class HAAdmin extends Co
private int rpcTimeoutForChecks = -1;
- private static Map<String, UsageInfo> USAGE =
+ protected final static Map<String, UsageInfo> USAGE =
ImmutableMap.<String, UsageInfo>builder()
.put("-transitionToActive",
new UsageInfo("<serviceId>", "Transitions the service into Active state"))
@@ -91,6 +91,14 @@ public abstract class HAAdmin extends Co
protected PrintStream out = System.out;
private RequestSource requestSource = RequestSource.REQUEST_BY_USER;
+ protected HAAdmin() {
+ super();
+ }
+
+ protected HAAdmin(Configuration conf) {
+ super(conf);
+ }
+
protected abstract HAServiceTarget resolveTarget(String string);
protected String getUsageString() {
@@ -461,9 +469,9 @@ public abstract class HAAdmin extends Co
return 0;
}
- private static class UsageInfo {
- private final String args;
- private final String help;
+ protected static class UsageInfo {
+ public final String args;
+ public final String help;
public UsageInfo(String args, String help) {
this.args = args;