Repository: hadoop Updated Branches: refs/heads/branch-3.2.0 a7d813049 -> 38895fcef
HDFS-14007. Incompatible layout when generating FSImage. Contributed by Inigo Goiri. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/38895fce Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/38895fce Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/38895fce Branch: refs/heads/branch-3.2.0 Commit: 38895fcef1ab0848ca737cd88eb0bdf6935af909 Parents: a7d8130 Author: Giovanni Matteo Fumarola <gif...@apache.org> Authored: Thu Oct 18 17:24:23 2018 -0700 Committer: Giovanni Matteo Fumarola <gif...@apache.org> Committed: Thu Oct 18 17:32:48 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/ImageWriter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/38895fce/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java b/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java index 14a5f8f..d4a632c 100644 --- a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java +++ b/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java @@ -79,7 +79,8 @@ import static org.apache.hadoop.hdfs.server.namenode.FSImageUtil.MAGIC_HEADER; public class ImageWriter implements Closeable { private static final int ONDISK_VERSION = 1; - private static final int LAYOUT_VERSION = -64; // see NameNodeLayoutVersion + private static final int LAYOUT_VERSION = + NameNodeLayoutVersion.CURRENT_LAYOUT_VERSION; private final Path outdir; private final FileSystem outfs; @@ -128,7 +129,7 @@ public class ImageWriter implements Closeable { NamespaceInfo info = NNStorage.newNamespaceInfo(); if (info.getLayoutVersion() != LAYOUT_VERSION) { throw new IllegalStateException("Incompatible layout " + - info.getLayoutVersion() + " (expected " + LAYOUT_VERSION); + info.getLayoutVersion() + " (expected " + LAYOUT_VERSION + ")"); } // set the cluster id, if given if (opts.clusterID.length() > 0) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
