Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D13B179F2 for ; Tue, 2 Jun 2015 10:57:20 +0000 (UTC) Received: (qmail 38233 invoked by uid 500); 2 Jun 2015 10:57:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 38159 invoked by uid 500); 2 Jun 2015 10:57:20 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 38150 invoked by uid 99); 2 Jun 2015 10:57:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 10:57:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04C74DFB3B; Tue, 2 Jun 2015 10:57:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vinayakumarb@apache.org To: common-commits@hadoop.apache.org Date: Tue, 02 Jun 2015 10:57:19 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hadoop git commit: HDFS-8256. '-storagepolicies , -blockId , -replicaDetails ' options are missed out in usage and from documentation (Contributed by J.Andreina) Repository: hadoop Updated Branches: refs/heads/branch-2 52ff1610c -> d1da842f8 refs/heads/trunk 990078b92 -> a2bd6217e HDFS-8256. '-storagepolicies , -blockId ,-replicaDetails ' options are missed out in usage and from documentation (Contributed by J.Andreina) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a2bd6217 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a2bd6217 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a2bd6217 Branch: refs/heads/trunk Commit: a2bd6217ebd68ae8cdd7814722659eebcf53004b Parents: 990078b Author: Vinayakumar B Authored: Tue Jun 2 16:07:18 2015 +0530 Committer: Vinayakumar B Committed: Tue Jun 2 16:07:18 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java | 9 +++++---- .../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2bd6217/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 1f7a36a..fa28a16 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -831,6 +831,9 @@ Release 2.8.0 - UNRELEASED HDFS-8490. Typo in trace enabled log in ExceptionHandler of WebHDFS. (Archana T via ozawa) + HDFS-8256. "-storagepolicies , -blockId ,-replicaDetails " options are missed + out in usage and from documentation (J.Andreina via vinayakumarb) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2bd6217/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java ---------------------------------------------------------------------- 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 67386ac..33033e7 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 @@ -78,8 +78,9 @@ public class DFSck extends Configured implements Tool { private static final String USAGE = "Usage: hdfs fsck " + "[-list-corruptfileblocks | " + "[-move | -delete | -openforwrite] " - + "[-files [-blocks [-locations | -racks]]]] " - + "[-includeSnapshots] [-showprogress]\n" + + "[-files [-blocks [-locations | -racks | -replicaDetails]]]] " + + "[-includeSnapshots] [-showprogress] " + + "[-storagepolicies] [-blockId ]\n" + "\t\tstart checking from this path\n" + "\t-move\tmove corrupted files to /lost+found\n" + "\t-delete\tdelete corrupted files\n" @@ -94,12 +95,12 @@ public class DFSck extends Configured implements Tool { + "\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-files -blocks -replicaDetails\tprint out each replica details \n" + "\t-storagepolicies\tprint out storage policy summary for the blocks\n" + "\t-showprogress\tshow progress in output. Default is OFF (no progress)\n" + "\t-blockId\tprint out which file this blockId belongs to, locations" + " (nodes, racks) of this block, and other diagnostics info" - + " (under replicated, corrupted or not, etc)\n" - + "\t-replicaDetails\tprint out each replica details \n\n" + + " (under replicated, corrupted or not, etc)\n\n" + "Please Note:\n" + "\t1. By default fsck ignores files opened for write, " + "use -openforwrite to report such files. They are usually " http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2bd6217/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md index 2ceff89..2121958 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md @@ -99,8 +99,9 @@ Usage: hdfs fsck [-list-corruptfileblocks | [-move | -delete | -openforwrite] - [-files [-blocks [-locations | -racks]]] + [-files [-blocks [-locations | -racks | -replicaDetails]]] [-includeSnapshots] [-showprogress] + [-storagepolicies] [-blockId ] | COMMAND\_OPTION | Description | |:---- |:---- | @@ -110,11 +111,14 @@ Usage: | `-files` `-blocks` | Print out the block report | | `-files` `-blocks` `-locations` | Print out locations for every block. | | `-files` `-blocks` `-racks` | Print out network topology for data-node locations. | +| `-files` `-blocks` `-replicaDetails` | Print out each replica details. | | `-includeSnapshots` | Include snapshot data if the given path indicates a snapshottable directory or there are snapshottable directories under it. | | `-list-corruptfileblocks` | Print out list of missing blocks and files they belong to. | | `-move` | Move corrupted files to /lost+found. | | `-openforwrite` | Print out files opened for write. | | `-showprogress` | Print out dots for progress in output. Default is OFF (no progress). | +| `-storagepolicies` | Print out storage policy summary for the blocks. | +| `-blockId` | Print out information about the block. | Runs the HDFS filesystem checking utility. See [fsck](./HdfsUserGuide.html#fsck) for more info.