From 400e1bb4eff78333005144c58d33f10d4697ff70 Mon Sep 17 00:00:00 2001 From: Konstantin V Shvachko Date: Sat, 27 Sep 2014 21:04:23 -0700 Subject: [PATCH] HDFS-7156. Update fsck documentation. Contributed by Masahiro Yamaguch. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../org/apache/hadoop/hdfs/tools/DFSck.java | 3 +- .../src/site/apt/HDFSCommands.apt.vm | 54 +++++++++++-------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 0524cf0e22..a0e176acd9 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) 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 b91090d167..31ab596c6d 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" 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 170f352890..121f0ba5b0 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]>>> + [-includeSnapshots] [-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). -*------------------+---------------------------------------------+ +*------------------------+---------------------------------------------+ +|| 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