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

HDFS-5895. Merging change r1565440 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565442 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-02-06 21:20:59 +00:00
parent a0d87e3f0c
commit f6d5cce58a
2 changed files with 5 additions and 3 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

@ -56,6 +56,9 @@ Release 2.4.0 - UNRELEASED
HDFS-5881. Fix skip() of the short-circuit local reader(legacy). (kihwal) HDFS-5881. Fix skip() of the short-circuit local reader(legacy). (kihwal)
HDFS-5895. HDFS cacheadmin -listPools has exit_code of 1 when the command
returns 0 result. (Tassapol Athiapinya via cnauroth)
Release 2.3.0 - UNRELEASED Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java
View File

@ -962,9 +962,8 @@ public class CacheAdmin extends Configured implements Tool {
if (numResults > 0) { if (numResults > 0) {
System.out.print(listing); System.out.print(listing);
} }
// If there are no results, we return 1 (failure exit code); // If list pools succeed, we return 0 (success exit code)
// otherwise we return 0 (success exit code). return 0;
return (numResults == 0) ? 1 : 0;
} }
} }