Thanks for fixing my mess Jon. St.Ack On Wed, Jul 15, 2009 at 7:27 AM, <[email protected]> wrote:
> Author: jgray > Date: Wed Jul 15 14:27:10 2009 > New Revision: 794282 > > URL: http://svn.apache.org/viewvc?rev=794282&view=rev > Log: > HBASE-1661 HBASE-1215 partial commit broke trunk, does not compile > > Modified: > hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java > hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java > > Modified: > hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java > URL: > http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=794282&r1=794281&r2=794282&view=diff > > ============================================================================== > --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java > (original) > +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/FSUtils.java > Wed Jul 15 14:27:10 2009 > @@ -295,7 +295,8 @@ > } > }); > for (int i = 0; i < directories.length; i++) { > - > + // TODO: check directories > } > + return true; > } > } > \ No newline at end of file > > Modified: > hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java > URL: > http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java?rev=794282&r1=794281&r2=794282&view=diff > > ============================================================================== > --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java > (original) > +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java > Wed Jul 15 14:27:10 2009 > @@ -217,7 +217,7 @@ > return; > } > // Before we start, make sure all is major compacted. > - if (!allMajorCompacted()) { > + if (!isMajorCompacted(fs, conf)) { > String msg = "All tables must be major compacted before the migration > can begin." + > MIGRATION_LINK; > System.out.println(msg); > @@ -294,7 +294,7 @@ > return isdir; > } > }); > - > + return true; > } > > /* > > >
