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 5387417B86 for ; Sun, 28 Sep 2014 04:30:54 +0000 (UTC) Received: (qmail 31924 invoked by uid 500); 28 Sep 2014 04:30:54 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 31852 invoked by uid 500); 28 Sep 2014 04:30:54 -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 31842 invoked by uid 99); 28 Sep 2014 04:30:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Sep 2014 04:30:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AAE0F9B908A; Sun, 28 Sep 2014 04:30:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shv@apache.org To: common-commits@hadoop.apache.org Message-Id: <9c28cf8ca94e47f680de848944d07d27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HDFS-7156. Update fsck documentation. Contributed by Masahiro Yamaguch. Date: Sun, 28 Sep 2014 04:30:53 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 7f300bcdc -> 400e1bb4e HDFS-7156. Update fsck documentation. Contributed by Masahiro Yamaguch. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/400e1bb4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/400e1bb4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/400e1bb4 Branch: refs/heads/trunk Commit: 400e1bb4eff78333005144c58d33f10d4697ff70 Parents: 7f300bc Author: Konstantin V Shvachko Authored: Sat Sep 27 21:04:23 2014 -0700 Committer: Konstantin V Shvachko Committed: Sat Sep 27 21:04:23 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../org/apache/hadoop/hdfs/tools/DFSck.java | 3 +- .../src/site/apt/HDFSCommands.apt.vm | 56 +++++++++++--------- 3 files changed, 36 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/400e1bb4/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 0524cf0..a0e176a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -512,6 +512,8 @@ Release 2.6.0 - UNRELEASED HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe) + HDFS-7156. Update fsck documentation. (Masahiro Yamaguch via shv) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang) http://git-wip-us.apache.org/repos/asf/hadoop/blob/400e1bb4/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 b91090d..31ab596 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 @@ -77,7 +77,8 @@ public class DFSck extends Configured implements Tool { private static final String USAGE = "Usage: DFSck " + "[-list-corruptfileblocks | " + "[-move | -delete | -openforwrite] " - + "[-files [-blocks [-locations | -racks]]]] [-showprogress]\n" + + "[-files [-blocks [-locations | -racks]]]] " + + "[-includeSnapshots] [-showprogress]\n" + "\t\tstart checking from this path\n" + "\t-move\tmove corrupted files to /lost+found\n" + "\t-delete\tdelete corrupted files\n" http://git-wip-us.apache.org/repos/asf/hadoop/blob/400e1bb4/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm index 170f352..121f0ba 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm @@ -82,32 +82,40 @@ HDFS Commands Guide See {{{./HdfsUserGuide.html#fsck}fsck}} for more info. Usage: << + [-list-corruptfileblocks | [-move | -delete | -openforwrite] [-files [-blocks [-locations | -racks]]] - [-showprogress]>>> - -*------------------+---------------------------------------------+ -|| COMMAND_OPTION || Description -*------------------+---------------------------------------------+ -| | Start checking from this path. -*------------------+---------------------------------------------+ -| -move | Move corrupted files to /lost+found -*------------------+---------------------------------------------+ -| -delete | Delete corrupted files. -*------------------+---------------------------------------------+ -| -openforwrite | Print out files opened for write. -*------------------+---------------------------------------------+ -| -files | Print out files being checked. -*------------------+---------------------------------------------+ -| -blocks | Print out block report. -*------------------+---------------------------------------------+ -| -locations | Print out locations for every block. -*------------------+---------------------------------------------+ -| -racks | Print out network topology for data-node locations. -*------------------+---------------------------------------------+ -| -showprogress | Print out dots for progress in output. Default is OFF -| | (no progress). -*------------------+---------------------------------------------+ + [-includeSnapshots] [-showprogress]>>> + +*------------------------+---------------------------------------------+ +|| COMMAND_OPTION || Description +*------------------------+---------------------------------------------+ +| | Start checking from this path. +*------------------------+---------------------------------------------+ +| -move | Move corrupted files to /lost+found. +*------------------------+---------------------------------------------+ +| -delete | Delete corrupted files. +*------------------------+---------------------------------------------+ +| -files | Print out files being checked. +*------------------------+---------------------------------------------+ +| -openforwrite | Print out files opened for write. +*------------------------+---------------------------------------------+ +| | Include snapshot data if the given path +| -includeSnapshots | indicates a snapshottable directory or +| | there are snapshottable directories under it. +*------------------------+---------------------------------------------+ +| -list-corruptfileblocks| Print out list of missing blocks and +| | files they belong to. +*------------------------+---------------------------------------------+ +| -blocks | Print out block report. +*------------------------+---------------------------------------------+ +| -locations | Print out locations for every block. +*------------------------+---------------------------------------------+ +| -racks | Print out network topology for data-node locations. +*------------------------+---------------------------------------------+ +| -showprogress | Print out dots for progress in output. Default is OFF +| | (no progress). +*------------------------+---------------------------------------------+ * Administration Commands