From 8362e6222262b97596c91657c7354326e5ce8620 Mon Sep 17 00:00:00 2001 From: stack Date: Fri, 29 Aug 2014 11:15:36 -0700 Subject: [PATCH] HBASE-11726 Master should fail-safe if starting with a pre 0.96 layout (Esteban Guiterrez) --- .../main/java/org/apache/hadoop/hbase/util/FSUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java index b569f4bf3e9..560b5df404e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java @@ -491,9 +491,6 @@ public abstract class FSUtils { } finally { dis.close(); } - // Update the format - LOG.info("Updating the hbase.version file format with version=" + version); - setVersion(fs, rootdir, version, 0, HConstants.DEFAULT_VERSION_FILE_WRITE_ATTEMPTS); } } catch (EOFException eof) { LOG.warn("Version file was empty, odd, will try to set it."); @@ -579,9 +576,10 @@ public abstract class FSUtils { // version is deprecated require migration // Output on stdout so user sees it in terminal. String msg = "HBase file layout needs to be upgraded." - + " You have version " + version + + " You have version " + version + " and I want version " + HConstants.FILE_SYSTEM_VERSION - + ". Is your hbase.rootdir valid? If so, you may need to run " + + ". Consult http://hbase.apache.org/book.html for further information about upgrading HBase." + + " Is your hbase.rootdir valid? If so, you may need to run " + "'hbase hbck -fixVersionFile'."; if (message) { System.out.println("WARNING! " + msg);