svn commit: r940101 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/util/FSUtils.java

[stack]

Author: stack
Date: Sat May  1 20:12:41 2010
New Revision: 940101

URL: http://svn.apache.org/viewvc?rev=940101&view=rev
Log:
HBASE-2489 Make the "Filesystem needs to be upgraded" error message more useful

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/FSUtils.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=940101&r1=940100&r2=940101&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Sat May  1 20:12:41 2010
@@ -112,6 +112,8 @@ Release 0.20.4 - Unreleased
                (Todd Lipcon via Stack)
    HBASE-2493  [Transactional Contrib] Avoid unsafe concurrent use of HTable
                (Clint Morgan via Stack)
+   HBASE-2489  Make the "Filesystem needs to be upgraded" error message more
+               useful (Benoit Sigoure via Stack)
 
   IMPROVEMENTS
    HBASE-2180  Bad read performance from synchronizing hfile.fddatainputstream

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/FSUtils.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=940101&r1=940100&r2=940101&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/FSUtils.java 
(original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/util/FSUtils.java 
Sat May  1 20:12:41 2010
@@ -216,8 +216,10 @@ public class FSUtils {
     
     // version is deprecated require migration
     // Output on stdout so user sees it in terminal.
-    String msg = "File system needs to be upgraded. Run " +
-      "the '${HBASE_HOME}/bin/hbase migrate' script.";
+    String msg = "File system needs to be upgraded."
+      + "  You have version " + version
+      + " and I want version " + HConstants.FILE_SYSTEM_VERSION
+      + ".  Run the '${HBASE_HOME}/bin/hbase migrate' script.";
     if (message) {
       System.out.println("WARNING! " + msg);
     }