From d843c50d5840e1e7c58ad4ae6353d0f9a9682e21 Mon Sep 17 00:00:00 2001 From: Vinayakumar B Date: Mon, 5 Oct 2015 18:23:18 +0530 Subject: [PATCH] HDFS-9158. [OEV-Doc] : Document does not mention about '-f' and '-r' options (Contributed by nijel) (cherry picked from commit b925cf100662e155c9efeff06523b09303817394) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/tools/offlineEditsViewer/OfflineEditsViewer.java | 2 +- .../hadoop-hdfs/src/site/markdown/HdfsEditsViewer.md | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 06dac2fbb3d..4669e3f8e39 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1148,6 +1148,9 @@ Release 2.8.0 - UNRELEASED HDFS-9151. Mover should print the exit status/reason on console like balancer tool. (Surendra singh lilhore via vinayakumarb) + HDFS-9154. [OEV-Doc] : Document does not mention about "-f" and "-r" options + (nijel via vinayakumarb) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/OfflineEditsViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/OfflineEditsViewer.java index 833f2bc05b5..cd1e73b93ba 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/OfflineEditsViewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineEditsViewer/OfflineEditsViewer.java @@ -69,7 +69,7 @@ public class OfflineEditsViewer extends Configured implements Tool { " edits file)\n" + "-h,--help Display usage information and exit\n" + "-f,--fix-txids Renumber the transaction IDs in the input,\n" + - " so that there are no gaps or invalid " + + " so that there are no gaps or invalid\n" + " transaction IDs.\n" + "-r,--recover When reading binary edit logs, use recovery \n" + " mode. This will give you the chance to skip \n" + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsEditsViewer.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsEditsViewer.md index 267471f9c9c..58f115baf99 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsEditsViewer.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsEditsViewer.md @@ -51,6 +51,8 @@ Usage | [`-o` ; `--outputFile`] *output file* | Specify the output filename, if the specified output processor generates one. If the specified file already exists, it is silently overwritten. Required. | | [`-p` ; `--processor`] *processor* | Specify the image processor to apply against the image file. Currently valid options are `binary`, `xml` (default) and `stats`. | | [`-v` ; `--verbose`] | Print the input and output filenames and pipe output of processor to console as well as specified file. On extremely large files, this may increase processing time by an order of magnitude. | +| [`-f` ; `--fix-txids`] | Renumber the transaction IDs in the input, so that there are no gaps or invalid transaction IDs. | +| [`-r` ; `--recover`] | When reading binary edit logs, use recovery mode. This will give you the chance to skip corrupt parts of the edit log. | | [`-h` ; `--help`] | Display the tool usage and help information and exit. | Case study: Hadoop cluster recovery