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 ar...@apache.org on 2013/10/29 22:05:16 UTC
svn commit: r1536890 - in
/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java:
./ org/apache/hadoop/ha/HAAdmin.java
Author: arp
Date: Tue Oct 29 21:05:15 2013
New Revision: 1536890
URL: http://svn.apache.org/r1536890
Log:
Merging r1536573 through r1536889 from trunk to branch HDFS-2832
Modified:
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
Propchange: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1535792-1536571,1536573-1536889
Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java?rev=1536890&r1=1536889&r2=1536890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java Tue Oct 29 21:05:15 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;