HDFS-7808. Remove obsolete -ns options in in DFSHAAdmin.java. Contributed by Arshad Mohammad.
This commit is contained in:
parent
b1b1e05e18
commit
3605928bd0
|
@ -682,6 +682,9 @@ Release 2.7.0 - UNRELEASED
|
|||
HDFS-6662. WebHDFS cannot open a file if its path contains "%".
|
||||
(Gerson Carlos via wheat9)
|
||||
|
||||
HDFS-7808. Remove obsolete -ns options in in DFSHAAdmin.java.
|
||||
(Arshad Mohammad via wheat9)
|
||||
|
||||
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
|
||||
|
||||
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
package org.apache.hadoop.hdfs.tools;
|
||||
|
||||
import java.io.PrintStream;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
|
@ -98,25 +97,6 @@ public class DFSHAAdmin extends HAAdmin {
|
|||
printUsage(errOut);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
String cmd = argv[i++];
|
||||
|
||||
if ("-ns".equals(cmd)) {
|
||||
if (i == argv.length) {
|
||||
errOut.println("Missing nameservice ID");
|
||||
printUsage(errOut);
|
||||
return -1;
|
||||
}
|
||||
nameserviceId = argv[i++];
|
||||
if (i >= argv.length) {
|
||||
errOut.println("Missing command");
|
||||
printUsage(errOut);
|
||||
return -1;
|
||||
}
|
||||
argv = Arrays.copyOfRange(argv, i, argv.length);
|
||||
}
|
||||
|
||||
return super.runCmd(argv);
|
||||
}
|
||||
|
||||
|
|
|
@ -146,17 +146,6 @@ public class TestDFSHAAdmin {
|
|||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNameserviceOption() throws Exception {
|
||||
assertEquals(-1, runTool("-ns"));
|
||||
assertOutputContains("Missing nameservice ID");
|
||||
assertEquals(-1, runTool("-ns", "ns1"));
|
||||
assertOutputContains("Missing command");
|
||||
// "ns1" isn't defined but we check this lazily and help doesn't use the ns
|
||||
assertEquals(0, runTool("-ns", "ns1", "-help", "transitionToActive"));
|
||||
assertOutputContains("Transitions the service into Active");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNamenodeResolution() throws Exception {
|
||||
Mockito.doReturn(STANDBY_READY_RESULT).when(mockProtocol).getServiceStatus();
|
||||
|
@ -278,15 +267,6 @@ public class TestDFSHAAdmin {
|
|||
assertEquals(0, runTool("-failover", "nn1", "nn2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailoverWithFencerAndNameservice() throws Exception {
|
||||
Mockito.doReturn(STANDBY_READY_RESULT).when(mockProtocol).getServiceStatus();
|
||||
HdfsConfiguration conf = getHAConf();
|
||||
conf.set(DFSConfigKeys.DFS_HA_FENCE_METHODS_KEY, getFencerTrueCommand());
|
||||
tool.setConf(conf);
|
||||
assertEquals(0, runTool("-ns", "ns1", "-failover", "nn1", "nn2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailoverWithFencerConfiguredAndForce() throws Exception {
|
||||
Mockito.doReturn(STANDBY_READY_RESULT).when(mockProtocol).getServiceStatus();
|
||||
|
|
|
@ -156,9 +156,6 @@ public class TestDFSHAAdminMiniCluster {
|
|||
assertEquals(0, runTool("-transitionToActive", "nn1"));
|
||||
assertEquals(0, runTool("-failover", "nn1", "nn2"));
|
||||
|
||||
// Test failover with fencer and nameservice
|
||||
assertEquals(0, runTool("-ns", "minidfs-ns", "-failover", "nn2", "nn1"));
|
||||
|
||||
// Fencer has not run yet, since none of the above required fencing
|
||||
assertEquals("", Files.toString(tmpFile, Charsets.UTF_8));
|
||||
|
||||
|
|
Loading…
Reference in New Issue