Repository: hbase Updated Branches: refs/heads/master e5a5e968f -> 2cd45eb9a
HBASE-11726 Master should fail-safe if starting with a pre 0.96 layout (Esteban Guiterrez) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2cd45eb9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2cd45eb9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2cd45eb9 Branch: refs/heads/master Commit: 2cd45eb9a006c67f0aee76745cab85ea21f66e50 Parents: e5a5e96 Author: stack <[email protected]> Authored: Fri Aug 29 11:15:36 2014 -0700 Committer: stack <[email protected]> Committed: Fri Aug 29 11:17:08 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/util/FSUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2cd45eb9/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java ---------------------------------------------------------------------- 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 0f21b72..580ca05 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 @@ -492,9 +492,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."); @@ -580,9 +577,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);
