Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/util/TestMigrate.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/util/TestMigrate.java (revision 614288) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/util/TestMigrate.java (working copy) @@ -111,10 +111,30 @@ listPaths(dfs, root, root.toString().length() + 1); Migrate u = new Migrate(conf); - u.run((String[]) null); + u.run(new String[] {"check"}); listPaths(dfs, root, root.toString().length() + 1); + u = new Migrate(conf); + u.run(new String[] {"upgrade"}); + + listPaths(dfs, root, root.toString().length() + 1); + + // Remove version file and try again + + dfs.delete(new Path(root, HConstants.VERSION_FILE_NAME)); + u = new Migrate(conf); + u.run(new String[] {"upgrade"}); + + listPaths(dfs, root, root.toString().length() + 1); + + // Try again. No upgrade should be necessary + + u = new Migrate(conf); + u.run(new String[] {"check"}); + u = new Migrate(conf); + u.run(new String[] {"upgrade"}); + } catch (Exception e) { e.printStackTrace(); } finally { Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (revision 614288) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (working copy) @@ -891,8 +891,8 @@ fs.mkdirs(rootdir); FSUtils.setVersion(fs, rootdir); } else if (!FSUtils.checkVersion(fs, rootdir)) { - throw new IOException( - "file system not correct version. Run hbase.util.Migrate"); + throw new IOException("File system needs upgrade. Run " + + "the '${HBASE_HOME}/bin/hbase migrate' script"); } if (!fs.exists(rootRegionDir)) { Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html (revision 614288) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/package.html (working copy) @@ -2,13 +2,13 @@ -Provides HBase, the Hadoop +Provides Hbase, the Hadoop simple database.

Requirements