From cc09b2b0c7e9efa45c17d93d9ae1fcda8e050965 Mon Sep 17 00:00:00 2001 From: Giovanni Matteo Fumarola Date: Thu, 18 Oct 2018 17:24:23 -0700 Subject: [PATCH] HDFS-14007. Incompatible layout when generating FSImage. Contributed by Inigo Goiri. --- .../org/apache/hadoop/hdfs/server/namenode/ImageWriter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 14a5f8fa307..d4a632cf06d 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) {