Author: cnauroth Date: Mon Feb 17 22:42:07 2014 New Revision: 1569133 URL: http://svn.apache.org/r1569133 Log: HDFS-5942. Merging change r1569124 from trunk to branch-2.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1569133&r1=1569132&r2=1569133&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Feb 17 22:42:07 2014 @@ -166,6 +166,8 @@ Release 2.4.0 - UNRELEASED HDFS-5759. Web UI does not show up during the period of loading FSImage. (Haohui Mai via Arpit Agarwal) + HDFS-5942. Fix javadoc in OfflineImageViewer. (Akira Ajisaka via cnauroth) + BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java?rev=1569133&r1=1569132&r2=1569133&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsrPBImage.java Mon Feb 17 22:42:07 2014 @@ -51,28 +51,16 @@ import com.google.common.collect.Maps; import com.google.common.io.LimitInputStream; /** - * This is the tool for analyzing file sizes in the namespace image. In order to - * run the tool one should define a range of integers <tt>[0, maxSize]</tt> by - * specifying <tt>maxSize</tt> and a <tt>step</tt>. The range of integers is - * divided into segments of size <tt>step</tt>: - * <tt>[0, s<sub>1</sub>, ..., s<sub>n-1</sub>, maxSize]</tt>, and the visitor - * calculates how many files in the system fall into each segment - * <tt>[s<sub>i-1</sub>, s<sub>i</sub>)</tt>. Note that files larger than - * <tt>maxSize</tt> always fall into the very last segment. - * - * <h3>Input.</h3> - * <ul> - * <li><tt>filename</tt> specifies the location of the image file;</li> - * <li><tt>maxSize</tt> determines the range <tt>[0, maxSize]</tt> of files - * sizes considered by the visitor;</li> - * <li><tt>step</tt> the range is divided into segments of size step.</li> - * </ul> - * - * <h3>Output.</h3> The output file is formatted as a tab separated two column - * table: Size and NumFiles. Where Size represents the start of the segment, and - * numFiles is the number of files form the image which size falls in this - * segment. + * LsrPBImage displays the blocks of the namespace in a format very similar + * to the output of ls/lsr. Entries are marked as directories or not, + * permissions listed, replication, username and groupname, along with size, + * modification date and full path. * + * Note: A significant difference between the output of the lsr command + * and this image visitor is that this class cannot sort the file entries; + * they are listed in the order they are stored within the fsimage file. + * Therefore, the output of this class cannot be directly compared to the + * output of the lsr command. */ final class LsrPBImage { private final Configuration conf; Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java?rev=1569133&r1=1569132&r2=1569133&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java Mon Feb 17 22:42:07 2014 @@ -55,28 +55,8 @@ import com.google.common.collect.Lists; import com.google.common.io.LimitInputStream; /** - * This is the tool for analyzing file sizes in the namespace image. In order to - * run the tool one should define a range of integers <tt>[0, maxSize]</tt> by - * specifying <tt>maxSize</tt> and a <tt>step</tt>. The range of integers is - * divided into segments of size <tt>step</tt>: - * <tt>[0, s<sub>1</sub>, ..., s<sub>n-1</sub>, maxSize]</tt>, and the visitor - * calculates how many files in the system fall into each segment - * <tt>[s<sub>i-1</sub>, s<sub>i</sub>)</tt>. Note that files larger than - * <tt>maxSize</tt> always fall into the very last segment. - * - * <h3>Input.</h3> - * <ul> - * <li><tt>filename</tt> specifies the location of the image file;</li> - * <li><tt>maxSize</tt> determines the range <tt>[0, maxSize]</tt> of files - * sizes considered by the visitor;</li> - * <li><tt>step</tt> the range is divided into segments of size step.</li> - * </ul> - * - * <h3>Output.</h3> The output file is formatted as a tab separated two column - * table: Size and NumFiles. Where Size represents the start of the segment, and - * numFiles is the number of files form the image which size falls in this - * segment. - * + * PBImageXmlWriter walks over an fsimage structure and writes out + * an equivalent XML document that contains the fsimage's components. */ @InterfaceAudience.Private public final class PBImageXmlWriter {