Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-6503. Merge r1601958 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601959 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Haohui Mai 2014-06-11 17:14:35 +00:00
parent 705c23e718
commit c6ed9ac1d8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -345,6 +345,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6364. Incorrect check for unknown datanode in Balancer. (Benoy HDFS-6364. Incorrect check for unknown datanode in Balancer. (Benoy
Antony via Arpit Agarwal) Antony via Arpit Agarwal)
HDFS-6503. Fix typo of DFSAdmin restoreFailedStorage.
(Zesheng Wu via wheat9)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
View File

@ -575,7 +575,7 @@ public class DFSAdmin extends FsShell {
* @exception IOException * @exception IOException
* @see org.apache.hadoop.hdfs.protocol.ClientProtocol#restoreFailedStorage(String arg) * @see org.apache.hadoop.hdfs.protocol.ClientProtocol#restoreFailedStorage(String arg)
*/ */
public int restoreFaileStorage(String arg) throws IOException { public int restoreFailedStorage(String arg) throws IOException {
int exitCode = -1; int exitCode = -1;
if(!arg.equals("check") && !arg.equals("true") && !arg.equals("false")) { if(!arg.equals("check") && !arg.equals("true") && !arg.equals("false")) {
@ -1362,7 +1362,7 @@ public class DFSAdmin extends FsShell {
} else if ("-rollEdits".equals(cmd)) { } else if ("-rollEdits".equals(cmd)) {
exitCode = rollEdits(); exitCode = rollEdits();
} else if ("-restoreFailedStorage".equals(cmd)) { } else if ("-restoreFailedStorage".equals(cmd)) {
exitCode = restoreFaileStorage(argv[i]); exitCode = restoreFailedStorage(argv[i]);
} else if ("-refreshNodes".equals(cmd)) { } else if ("-refreshNodes".equals(cmd)) {
exitCode = refreshNodes(); exitCode = refreshNodes();
} else if ("-finalizeUpgrade".equals(cmd)) { } else if ("-finalizeUpgrade".equals(cmd)) {