HDFS-14007. Incompatible layout when generating FSImage. Contributed by Inigo Goiri.

This commit is contained in:
Giovanni Matteo Fumarola 2018-10-18 17:24:23 -07:00
parent 66f059ed1d
commit cc09b2b0c7

View File

@ -79,7 +79,8 @@
public class ImageWriter implements Closeable { public class ImageWriter implements Closeable {
private static final int ONDISK_VERSION = 1; 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 Path outdir;
private final FileSystem outfs; private final FileSystem outfs;
@ -128,7 +129,7 @@ public ImageWriter(Options opts) throws IOException {
NamespaceInfo info = NNStorage.newNamespaceInfo(); NamespaceInfo info = NNStorage.newNamespaceInfo();
if (info.getLayoutVersion() != LAYOUT_VERSION) { if (info.getLayoutVersion() != LAYOUT_VERSION) {
throw new IllegalStateException("Incompatible layout " + throw new IllegalStateException("Incompatible layout " +
info.getLayoutVersion() + " (expected " + LAYOUT_VERSION); info.getLayoutVersion() + " (expected " + LAYOUT_VERSION + ")");
} }
// set the cluster id, if given // set the cluster id, if given
if (opts.clusterID.length() > 0) { if (opts.clusterID.length() > 0) {