From 482aeee784eb2e05c80680722687aebd5f8daedf Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Wed, 18 Mar 2015 13:33:41 -0700 Subject: [PATCH] HDFS-7697. Mark the PB OIV tool as experimental. Contributed by Lei (Eddy) Xu. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../tools/offlineImageViewer/OfflineImageViewerPB.java | 6 +++--- .../hadoop-hdfs/src/site/markdown/HdfsImageViewer.md | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 62cf1e54cc6..39842e2c707 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -868,6 +868,8 @@ Release 2.7.0 - UNRELEASED HDFS-7722. DataNode#checkDiskError should also remove Storage when error is found. (Lei Xu via Colin P. McCabe) + HDFS-7697. Mark the PB OIV tool as experimental. (Lei Xu via wheat9) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java index 9cba3c8892a..c9158d9a903 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewerPB.java @@ -65,7 +65,7 @@ public class OfflineImageViewerPB { + " -step defines the granularity of the distribution. (2MB by default)\n" + " * Web: Run a viewer to expose read-only WebHDFS API.\n" + " -addr specifies the address to listen. (localhost:5978 by default)\n" - + " * Delimited: Generate a text file with all of the elements common\n" + + " * Delimited (experimental): Generate a text file with all of the elements common\n" + " to both inodes and inodes-under-construction, separated by a\n" + " delimiter. The default delimiter is \\t, though this may be\n" + " changed via the -delimiter argument.\n" @@ -80,10 +80,10 @@ public class OfflineImageViewerPB { + "-p,--processor Select which type of processor to apply\n" + " against image file. (XML|FileDistribution|Web|Delimited)\n" + " (Web by default)\n" - + "-delimiter Delimiting string to use with Delimited processor\n" + + "-delimiter Delimiting string to use with Delimited processor. \n" + "-t,--temp Use temporary dir to cache intermediate result to generate\n" + " Delimited outputs. If not set, Delimited processor constructs\n" - + " the namespace in memory before outputting text." + + " the namespace in memory before outputting text.\n" + "-h,--help Display usage information and exit\n"; /** diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsImageViewer.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsImageViewer.md index 864eee8d707..e3952cdef48 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsImageViewer.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsImageViewer.md @@ -55,6 +55,11 @@ The Offline Image Viewer provides several output processors: and numFiles is the number of files form the image which size falls in this segment. +4. Delimited (experimental): Generate a text file with all of the elements + common to both inodes and inodes-under-construction, separated by a + delimiter. The default delimiter is \t, though this may be changed via + the -delimiter argument. + Usage ----- @@ -137,6 +142,8 @@ Options | `-addr` *address* | Specify the address(host:port) to listen. (localhost:5978 by default). This option is used with Web processor. | | `-maxSize` *size* | Specify the range [0, maxSize] of file sizes to be analyzed in bytes (128GB by default). This option is used with FileDistribution processor. | | `-step` *size* | Specify the granularity of the distribution in bytes (2MB by default). This option is used with FileDistribution processor. | +| `-delimiter` *arg* | Delimiting string to use with Delimited processor. | +| `-t`\|`--temp` *temporary dir* | Use temporary dir to cache intermediate result to generate Delimited outputs. If not set, Delimited processor constructs the namespace in memory before outputting text. | | `-h`\|`--help` | Display the tool usage and help information and exit. | Analyzing Results