HBASE-1145 Ensure that there is only 1 Master with Zookeeper (part of HA Master)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@758266 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -117,6 +117,7 @@ Release 0.20.0 - Unreleased
                synthetic accessors (Nitay Joffe via Stack)
    HBASE-1273  ZooKeeper WARN spits out lots of useless messages
                (Nitay Joffe via Stack)
+   HBASE-1285  Forcing compactions should be available via thrift
 
 
 Release 0.19.0 - 01/21/2009

src/java/org/apache/hadoop/hbase/thrift/Hbase.thrift

@@ -183,6 +183,12 @@ service Hbase {
   bool isTableEnabled(1:Bytes tableName)
     throws (1:IOError io)
     
+  void compact(1:Bytes tableNameOrRegionName)
+    throws (1:IOError io)
+  
+  void majorCompact(1:Bytes tableNameOrRegionName)
+    throws (1:IOError io)
+    
   /**
    * List all the userspace tables.
    * @return - returns a list of names

src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java

@@ -163,6 +163,22 @@ public class ThriftServer {
       }
     }
     
+    public void compact(byte[] tableNameOrRegionName) throws IOError, TException {
+      try{
+        admin.compact(tableNameOrRegionName);
+      } catch (IOException e) {
+        throw new IOError(e.getMessage());
+      }
+    }
+
+    public void majorCompact(byte[] tableNameOrRegionName) throws IOError, TException {
+      try{
+        admin.majorCompact(tableNameOrRegionName);
+      } catch (IOException e) {
+        throw new IOError(e.getMessage());
+      }    
+    }
+    
     public List<byte[]> getTableNames() throws IOError {
       try {
         HTableDescriptor[] tables = this.admin.listTables();
@@ -504,7 +520,7 @@ public class ThriftServer {
       } catch (IOException e) {
         throw new IOError(e.getMessage());
       }
-    }
+    }    
   }
   
   //