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 su...@apache.org on 2012/08/15 03:03:12 UTC
svn commit: r1373185 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:
main/java/org/apache/hadoop/ha/HAAdmin.java
main/java/org/apache/hadoop/ha/ZKFailoverController.java
test/java/org/apache/hadoop/ha/TestHAAdmin.java
Author: suresh
Date: Wed Aug 15 01:03:11 2012
New Revision: 1373185
URL: http://svn.apache.org/viewvc?rev=1373185&view=rev
Log:
HDFS-3723. Merging change r1373173 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.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=1373185&r1=1373184&r2=1373185&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 Wed Aug 15 01:03:11 2012
@@ -88,7 +88,7 @@ public abstract class HAAdmin extends Co
/** Output stream for errors, for use in tests */
protected PrintStream errOut = System.err;
- PrintStream out = System.out;
+ protected PrintStream out = System.out;
private RequestSource requestSource = RequestSource.REQUEST_BY_USER;
protected abstract HAServiceTarget resolveTarget(String string);
@@ -439,7 +439,10 @@ public abstract class HAAdmin extends Co
}
private int help(String[] argv) {
- if (argv.length != 2) {
+ if (argv.length == 1) { // only -help
+ printUsage(out);
+ return 0;
+ } else if (argv.length != 2) {
printUsage(errOut, "-help");
return -1;
}
@@ -454,7 +457,7 @@ public abstract class HAAdmin extends Co
return -1;
}
- errOut.println(cmd + " [" + usageInfo.args + "]: " + usageInfo.help);
+ out.println(cmd + " [" + usageInfo.args + "]: " + usageInfo.help);
return 0;
}
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java?rev=1373185&r1=1373184&r2=1373185&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java Wed Aug 15 01:03:11 2012
@@ -80,6 +80,8 @@ public abstract class ZKFailoverControll
ZK_AUTH_KEY
};
+ protected static final String USAGE =
+ "Usage: java zkfc [ -formatZK [-force] [-nonInteractive] ]";
/** Unable to format the parent znode in ZK */
static final int ERR_CODE_FORMAT_DENIED = 2;
@@ -248,8 +250,7 @@ public abstract class ZKFailoverControll
}
private void printUsage() {
- System.err.println("Usage: " + this.getClass().getSimpleName() +
- " [-formatZK [-force | -nonInteractive]]");
+ System.err.println(USAGE + "\n");
}
private int formatZK(boolean force, boolean interactive)
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java?rev=1373185&r1=1373184&r2=1373185&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestHAAdmin.java Wed Aug 15 01:03:11 2012
@@ -40,7 +40,9 @@ public class TestHAAdmin {
private HAAdmin tool;
private ByteArrayOutputStream errOutBytes = new ByteArrayOutputStream();
+ private ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
private String errOutput;
+ private String output;
@Before
public void setup() throws IOException {
@@ -53,12 +55,14 @@ public class TestHAAdmin {
};
tool.setConf(new Configuration());
tool.errOut = new PrintStream(errOutBytes);
+ tool.out = new PrintStream(outBytes);
}
private void assertOutputContains(String string) {
- if (!errOutput.contains(string)) {
- fail("Expected output to contain '" + string + "' but was:\n" +
- errOutput);
+ if (!errOutput.contains(string) && !output.contains(string)) {
+ fail("Expected output to contain '" + string +
+ "' but err_output was:\n" + errOutput +
+ "\n and output was: \n" + output);
}
}
@@ -88,17 +92,19 @@ public class TestHAAdmin {
@Test
public void testHelp() throws Exception {
- assertEquals(-1, runTool("-help"));
+ assertEquals(0, runTool("-help"));
assertEquals(0, runTool("-help", "transitionToActive"));
assertOutputContains("Transitions the service into Active");
}
private Object runTool(String ... args) throws Exception {
errOutBytes.reset();
+ outBytes.reset();
LOG.info("Running: HAAdmin " + Joiner.on(" ").join(args));
int ret = tool.run(args);
errOutput = new String(errOutBytes.toByteArray(), Charsets.UTF_8);
- LOG.info("Output:\n" + errOutput);
+ output = new String(outBytes.toByteArray(), Charsets.UTF_8);
+ LOG.info("Err_output:\n" + errOutput + "\nOutput:\n" + output);
return ret;
}
}