You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2017/03/29 03:54:14 UTC
[37/50] [abbrv] hadoop git commit: HDFS-10506. Addendum patch to
include missing changes. Contributed by Akira Ajisaka.
HDFS-10506. Addendum patch to include missing changes. Contributed by Akira Ajisaka.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46d37a65
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46d37a65
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46d37a65
Branch: refs/heads/HDFS-9806
Commit: 46d37a65cf09c2714b4c0c4ec0399031d60027a5
Parents: 96e2ab8
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Mon Mar 27 05:23:45 2017 -0700
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Mon Mar 27 05:23:45 2017 -0700
----------------------------------------------------------------------
.../tools/offlineImageViewer/OfflineImageReconstructor.java | 2 +-
.../hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/46d37a65/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
index d10b924..2b5a19f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
@@ -669,7 +669,7 @@ class OfflineImageReconstructor {
throw new IOException("<block> found without <id>");
}
blockBld.setBlockId(id);
- Long genstamp = block.removeChildLong(INODE_SECTION_GEMSTAMP);
+ Long genstamp = block.removeChildLong(INODE_SECTION_GENSTAMP);
if (genstamp == null) {
throw new IOException("<block> found without <genstamp>");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/46d37a65/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
index 5a42a6b..681ebf6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java
@@ -119,7 +119,7 @@ public final class PBImageXmlWriter {
public static final String INODE_SECTION_PERMISSION = "permission";
public static final String INODE_SECTION_BLOCKS = "blocks";
public static final String INODE_SECTION_BLOCK = "block";
- public static final String INODE_SECTION_GEMSTAMP = "genstamp";
+ public static final String INODE_SECTION_GENSTAMP = "genstamp";
public static final String INODE_SECTION_NUM_BYTES = "numBytes";
public static final String INODE_SECTION_FILE_UNDER_CONSTRUCTION =
"file-under-construction";
@@ -492,7 +492,7 @@ public final class PBImageXmlWriter {
for (BlockProto b : f.getBlocksList()) {
out.print("<" + INODE_SECTION_BLOCK + ">");
o(SECTION_ID, b.getBlockId())
- .o(INODE_SECTION_GEMSTAMP, b.getGenStamp())
+ .o(INODE_SECTION_GENSTAMP, b.getGenStamp())
.o(INODE_SECTION_NUM_BYTES, b.getNumBytes());
out.print("</" + INODE_SECTION_BLOCK + ">\n");
}
@@ -685,7 +685,7 @@ public final class PBImageXmlWriter {
for (BlockProto b : f.getBlocksList()) {
out.print("<" + INODE_SECTION_BLOCK + ">");
o(SECTION_ID, b.getBlockId())
- .o(INODE_SECTION_GEMSTAMP, b.getGenStamp())
+ .o(INODE_SECTION_GENSTAMP, b.getGenStamp())
.o(INODE_SECTION_NUM_BYTES, b.getNumBytes());
out.print("</" + INODE_SECTION_BLOCK + ">\n");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org