From a56f57b421bedb019f51a6afa5a4c6e895c39e83 Mon Sep 17 00:00:00 2001
From: Uma Maheswara Rao G <umamahesh@apache.org>
Date: Fri, 8 May 2015 14:00:45 +0530
Subject: [PATCH] HDFS-8108. Fsck should provide the info on mandatory option
 to be used along with -blocks ,-locations and -racks. Contributed by
 J.Andreina.

(cherry picked from commit 4b00ae5c113a9a8bd2a300f6d88897b932eeb94f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                | 3 +++
 .../src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java  | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index f43c0afa5ec..41157b7d261 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -345,6 +345,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-8222. Remove usage of "dfsadmin -upgradeProgress" from document which
     is no longer supported. (J.Andreina via aajisaka)
 
+    HDFS-8108. Fsck should provide the info on mandatory option to be used along with "-blocks ,
+    -locations and -racks" (J.Andreina via umamahesh)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
index fa20b097976..5c07535aca7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
@@ -89,9 +89,10 @@ public class DFSck extends Configured implements Tool {
       + "snapshottable directories under it\n"
       + "\t-list-corruptfileblocks\tprint out list of missing "
       + "blocks and files they belong to\n"
-      + "\t-blocks\tprint out block report\n"
-      + "\t-locations\tprint out locations for every block\n"
-      + "\t-racks\tprint out network topology for data-node locations\n"
+      + "\t-files -blocks\tprint out block report\n"
+      + "\t-files -blocks -locations\tprint out locations for every block\n"
+      + "\t-files -blocks -racks" 
+      + "\tprint out network topology for data-node locations\n"
       + "\t-storagepolicies\tprint out storage policy summary for the blocks\n\n"
       + "\t-blockId\tprint out which file this blockId belongs to, locations"
       + " (nodes, racks) of this block, and other diagnostics info"