HADOOP-2558 fixes for build up on hudson (Part 1)

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

src/contrib/hbase/CHANGES.txt

@@ -106,6 +106,7 @@ Trunk (unreleased changes)
                (Bryan Duxbury via Stack)
    HADOOP-2530 Missing type in new hbase custom RPC serializer
    HADOOP-2490 Failure in nightly #346 (Added debugging of hudson failures).
+   HADOOP-2558 fixes for build up on hudson (part 1)
    
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable

src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java

@@ -229,7 +229,6 @@ public class HTable implements HConstants {
       }
       try {
         Thread.sleep(this.pause);
-        
       } catch (InterruptedException x) {
         // continue
       }
@@ -275,7 +274,6 @@ public class HTable implements HConstants {
       }
       try {
         Thread.sleep(this.pause);
-        
       } catch (InterruptedException x) {
         // continue
       }
@@ -332,7 +330,6 @@ public class HTable implements HConstants {
       }
       try {
         Thread.sleep(this.pause);
-        
       } catch (InterruptedException x) {
         // continue
       }
@@ -394,7 +391,6 @@ public class HTable implements HConstants {
       }
       try {
         Thread.sleep(this.pause);
-        
       } catch (InterruptedException x) {
         // continue
       }
@@ -915,7 +911,6 @@ public class HTable implements HConstants {
         }
         try {
           Thread.sleep(pause);
-
         } catch (InterruptedException e) {
           // continue
         }
@@ -1047,7 +1042,11 @@ public class HTable implements HConstants {
             loadRegions();
           }
         }
-
+        try {
+          Thread.sleep(pause);
+        } catch (InterruptedException e) {
+          // continue
+        }
       } catch (IOException e) {
         close();
         if (e instanceof RemoteException) {

src/contrib/hbase/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java

@@ -118,6 +118,8 @@ public class StaticTestEnvironment {
       // It is way too noisy.
       Logger.getLogger("org.apache.hadoop.hbase.filter").setLevel(Level.INFO);
     }
+    // Enable mapreduce loggging for the mapreduce jobs.
+    Logger.getLogger("org.apache.hadoop.mapred").setLevel(Level.DEBUG);
   }
   
   /**

src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java

@@ -19,10 +19,14 @@
  */
 package org.apache.hadoop.hbase;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.Text;
 
 /** tests administrative functions */
 public class TestMasterAdmin extends HBaseClusterTestCase {
+  private final Log LOG = LogFactory.getLog(this.getClass().getName());
+  
   private static final Text COLUMN_NAME = new Text("col1:");
   private static HTableDescriptor testDesc;
   static {
@@ -55,17 +59,17 @@ public class TestMasterAdmin extends HBaseClusterTestCase {
     }
     assertTrue(exception);
     admin.createTable(testDesc);
+    LOG.info("Table " + testDesc.getName().toString() + " created");
     admin.disableTable(testDesc.getName());
-
+    LOG.info("Table " + testDesc.getName().toString() + " disabled");
     try {
       @SuppressWarnings("unused")
       HTable table = new HTable(conf, testDesc.getName());
-
-    } catch(IllegalStateException e) {
+    } catch (IllegalStateException e) {
       // Expected
       
       // This exception is not actually thrown.  It doesn't look like it should
-      // thrown since the connection manager is already filled w/ data
+      // throw since the connection manager is already filled w/ data
       // -- noticed by St.Ack 09/09/2007
     }