From 4dee3ff2e4a59df624238ba692ecb6779f02ad6c Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jgray@apache.org>
Date: Wed, 15 Jul 2009 14:27:10 +0000
Subject: [PATCH] HBASE-1661 HBASE-1215 partial commit broke trunk, does not
 compile

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@794282 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/hadoop/hbase/util/FSUtils.java | 3 ++-
 src/java/org/apache/hadoop/hbase/util/Migrate.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/hadoop/hbase/util/FSUtils.java b/src/java/org/apache/hadoop/hbase/util/FSUtils.java
index ae885f2f0d4..43542a35231 100644
--- a/src/java/org/apache/hadoop/hbase/util/FSUtils.java
+++ b/src/java/org/apache/hadoop/hbase/util/FSUtils.java
@@ -295,7 +295,8 @@ public class FSUtils {
         }
     });    
     for (int i = 0; i < directories.length; i++) {
-      
+      // TODO: check directories
     }
+    return true;
   }
 }
\ No newline at end of file
diff --git a/src/java/org/apache/hadoop/hbase/util/Migrate.java b/src/java/org/apache/hadoop/hbase/util/Migrate.java
index ef47a9fda57..e84bb34f91c 100644
--- a/src/java/org/apache/hadoop/hbase/util/Migrate.java
+++ b/src/java/org/apache/hadoop/hbase/util/Migrate.java
@@ -217,7 +217,7 @@ public class Migrate extends Configured implements Tool {
       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 @@ set to control the master's address (not mandatory).
           return isdir;
         }
     });    
-    
+    return true;
   }
 
   /*