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

HDFS-5111. Merge change r1515895 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515896 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2013-08-20 17:35:18 +00:00
parent 42d21469ef
commit b7567168db
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
View File

@ -79,7 +79,7 @@ class SnapshotCommands extends FsCommand {
protected void processArguments(LinkedList<PathData> items) protected void processArguments(LinkedList<PathData> items)
throws IOException { throws IOException {
super.processArguments(items); super.processArguments(items);
if (exitCode != 0) { // check for error collecting paths if (numErrors != 0) { // check for error collecting paths
return; return;
} }
assert(items.size() == 1); assert(items.size() == 1);
@ -119,7 +119,7 @@ class SnapshotCommands extends FsCommand {
protected void processArguments(LinkedList<PathData> items) protected void processArguments(LinkedList<PathData> items)
throws IOException { throws IOException {
super.processArguments(items); super.processArguments(items);
if (exitCode != 0) { // check for error collecting paths if (numErrors != 0) { // check for error collecting paths
return; return;
} }
assert (items.size() == 1); assert (items.size() == 1);
@ -160,7 +160,7 @@ class SnapshotCommands extends FsCommand {
protected void processArguments(LinkedList<PathData> items) protected void processArguments(LinkedList<PathData> items)
throws IOException { throws IOException {
super.processArguments(items); super.processArguments(items);
if (exitCode != 0) { // check for error collecting paths if (numErrors != 0) { // check for error collecting paths
return; return;
} }
Preconditions.checkArgument(items.size() == 1); Preconditions.checkArgument(items.size() == 1);

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

@ -93,6 +93,9 @@ Release 2.1.1-beta - UNRELEASED
HDFS-2933. Improve DataNode Web UI Index Page. (Vivek Ganesan via HDFS-2933. Improve DataNode Web UI Index Page. (Vivek Ganesan via
Arpit Agarwal) Arpit Agarwal)
HDFS-5111. Remove duplicated error message for snapshot commands when
processing invalid arguments. (jing9)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES