From 49fecbd4026ec7b8309cd28740239f536d73d388 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Wed, 11 Jun 2014 17:12:46 +0000 Subject: [PATCH] HDFS-6503. Fix typo of DFSAdmin restoreFailedStorage. Contributed by Zesheng Wu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601958 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8714d15787b..67c3e692139 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -669,6 +669,9 @@ Release 2.5.0 - UNRELEASED HDFS-6364. Incorrect check for unknown datanode in Balancer. (Benoy Antony via Arpit Agarwal) + HDFS-6503. Fix typo of DFSAdmin restoreFailedStorage. + (Zesheng Wu via wheat9) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index cc5bbcf3772..6c67b12772f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -575,7 +575,7 @@ public class DFSAdmin extends FsShell { * @exception IOException * @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; if(!arg.equals("check") && !arg.equals("true") && !arg.equals("false")) { @@ -1362,7 +1362,7 @@ public class DFSAdmin extends FsShell { } else if ("-rollEdits".equals(cmd)) { exitCode = rollEdits(); } else if ("-restoreFailedStorage".equals(cmd)) { - exitCode = restoreFaileStorage(argv[i]); + exitCode = restoreFailedStorage(argv[i]); } else if ("-refreshNodes".equals(cmd)) { exitCode = refreshNodes(); } else if ("-finalizeUpgrade".equals(cmd)) {