hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject git commit: HBASE-11726 Master should fail-safe if starting with a pre 0.96 layout (Esteban Guiterrez)
Date Fri, 29 Aug 2014 18:16:16 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 51cf5c359 -> 8362e6222


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/8362e622
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8362e622
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8362e622

Branch: refs/heads/branch-1
Commit: 8362e6222262b97596c91657c7354326e5ce8620
Parents: 51cf5c3
Author: stack <stack@apache.org>
Authored: Fri Aug 29 11:15:36 2014 -0700
Committer: stack <stack@apache.org>
Committed: Fri Aug 29 11:15:36 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/8362e622/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 b569f4b..560b5df 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);


Mime
View raw message