HBASE-12242 Fix new javadoc warnings in Admin, etc.

hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java

@@ -52,7 +52,7 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
- * The administrative API for HBase. Obtain an instance from an {@link HConnection}.
+ * The administrative API for HBase. Obtain an instance from a {@link Connection}.
  *
  * @since 0.99.0
  */
@@ -1223,8 +1223,8 @@ public interface Admin extends Abortable, Closeable {
    * @return A MasterCoprocessorRpcChannel instance
    */
   CoprocessorRpcChannel coprocessorService();
-  
-  
+
+
   /**
    * Creates and returns a {@link com.google.protobuf.RpcChannel} instance
    * connected to the passed region server.
@@ -1243,10 +1243,9 @@ public interface Admin extends Abortable, Closeable {
    *     .build();
    * MyCallResponse response = service.myCall(null, request);
    * </pre></blockquote></div>
-   * 
-   * @param the server name to which the endpoint call is made
+   *
+   * @param sn the server name to which the endpoint call is made
    * @return A RegionServerCoprocessorRpcChannel instance
    */
   CoprocessorRpcChannel coprocessorService(ServerName sn);
-  
 }

hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

@@ -36,8 +36,6 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Abortable;
 import org.apache.hadoop.hbase.ClusterStatus;
@@ -62,6 +60,8 @@ import org.apache.hadoop.hbase.TableNotEnabledException;
 import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.UnknownRegionException;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitor;
 import org.apache.hadoop.hbase.client.MetaScanner.MetaScannerVisitorBase;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
@@ -3662,7 +3662,7 @@ public class HBaseAdmin implements Admin {
    * MyCallResponse response = service.myCall(null, request);
    * </pre></blockquote></div>
    * 
-   * @param the server name to which the endpoint call is made
+   * @param sn the server name to which the endpoint call is made
    * @return A RegionServerCoprocessorRpcChannel instance
    */
   @Override

hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java

@@ -1620,7 +1620,7 @@ public final class ProtobufUtil {
    * Make a region server endpoint call
    * @param client
    * @param call
-   * @return
+   * @return CoprocessorServiceResponse
    * @throws IOException
    */
   public static CoprocessorServiceResponse execRegionServerService(

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java

@@ -272,7 +272,7 @@ public class TestSplitLogManager {
    * Test whether the splitlog correctly creates a task in zookeeper
    * @throws Exception
    */
-  @Test
+  @Test (timeout=180000)
   public void testTaskCreation() throws Exception {
 
     LOG.info("TestTaskCreation - test the creation of a task in zk");
@@ -287,7 +287,7 @@ public class TestSplitLogManager {
     assertTrue(slt.isUnassigned(DUMMY_MASTER));
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testOrphanTaskAcquisition() throws Exception {
     LOG.info("TestOrphanTaskAcquisition");
 
@@ -311,7 +311,7 @@ public class TestSplitLogManager {
     waitForCounter(tot_mgr_rescan, 0, 1, to + to/2);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testUnassignedOrphan() throws Exception {
     LOG.info("TestUnassignedOrphan - an unassigned task is resubmitted at" +
         " startup");
@@ -340,7 +340,7 @@ public class TestSplitLogManager {
     assertTrue(ZKUtil.checkExists(zkw, tasknode) > version);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testMultipleResubmits() throws Exception {
     LOG.info("TestMultipleResbmits - no indefinite resubmissions");
     conf.setInt("hbase.splitlog.max.resubmit", 2);
@@ -372,7 +372,7 @@ public class TestSplitLogManager {
     assertEquals(2L, tot_mgr_resubmit.get() - tot_mgr_resubmit_force.get());
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testRescanCleanup() throws Exception {
     LOG.info("TestRescanCleanup - ensure RESCAN nodes are cleaned up");
 
@@ -401,7 +401,7 @@ public class TestSplitLogManager {
     waitForCounter(tot_mgr_rescan_deleted, 0, 1, to/2);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testTaskDone() throws Exception {
     LOG.info("TestTaskDone - cleanup task node once in DONE state");
 
@@ -420,7 +420,7 @@ public class TestSplitLogManager {
     assertTrue(ZKUtil.checkExists(zkw, tasknode) == -1);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testTaskErr() throws Exception {
     LOG.info("TestTaskErr - cleanup task node once in ERR state");
 
@@ -443,7 +443,7 @@ public class TestSplitLogManager {
     conf.setInt("hbase.splitlog.max.resubmit", ZKSplitLogManagerCoordination.DEFAULT_MAX_RESUBMIT);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testTaskResigned() throws Exception {
     LOG.info("TestTaskResigned - resubmit task node once in RESIGNED state");
     assertEquals(tot_mgr_resubmit.get(), 0);
@@ -469,7 +469,7 @@ public class TestSplitLogManager {
     assertTrue(slt.isUnassigned(DUMMY_MASTER));
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testUnassignedTimeout() throws Exception {
     LOG.info("TestUnassignedTimeout - iff all tasks are unassigned then" +
         " resubmit");
@@ -505,7 +505,7 @@ public class TestSplitLogManager {
     waitForCounter(tot_mgr_resubmit_unassigned, 0, 1, 2 * to + to/2);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testDeadWorker() throws Exception {
     LOG.info("testDeadWorker");
 
@@ -533,7 +533,7 @@ public class TestSplitLogManager {
     return;
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testWorkerCrash() throws Exception {
     slm = new SplitLogManager(ds, conf, stopper, master, DUMMY_MASTER);
     TaskBatch batch = new TaskBatch();
@@ -557,7 +557,7 @@ public class TestSplitLogManager {
     Assert.assertEquals(1, tot_mgr_resubmit.get());
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testEmptyLogDir() throws Exception {
     LOG.info("testEmptyLogDir");
     slm = new SplitLogManager(ds, conf, stopper, master, DUMMY_MASTER);

hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java

@@ -383,7 +383,8 @@ public class TestReplicationSmallTests extends TestReplicationBase {
    * @throws Exception
    */
   @Test(timeout=300000)
-  public void loadTesting() throws Exception {
+  public void testLoading() throws Exception {
+    LOG.info("Writing out rows to table1 in testLoading");
     htable1.setWriteBufferSize(1024);
     htable1.setAutoFlush(false, true);
     for (int i = 0; i < NB_ROWS_IN_BIG_BATCH; i++) {
@@ -401,16 +402,18 @@ public class TestReplicationSmallTests extends TestReplicationBase {
 
     assertEquals(NB_ROWS_IN_BIG_BATCH, res.length);
 
-
+    LOG.info("Looking in table2 for replicated rows in testLoading");
     long start = System.currentTimeMillis();
-    for (int i = 0; i < NB_RETRIES; i++) {
+    // Retry more than NB_RETRIES.  As it was, retries were done in 5 seconds and we'd fail
+    // sometimes.
+    final long retries = NB_RETRIES * 10;
+    for (int i = 0; i < retries; i++) {
       scan = new Scan();
-
       scanner = htable2.getScanner(scan);
       res = scanner.next(NB_ROWS_IN_BIG_BATCH);
       scanner.close();
       if (res.length != NB_ROWS_IN_BIG_BATCH) {
-        if (i == NB_RETRIES - 1) {
+        if (i == retries - 1) {
           int lastRow = -1;
           for (Result result : res) {
             int currentRow = Bytes.toInt(result.getRow());
@@ -424,7 +427,7 @@ public class TestReplicationSmallTests extends TestReplicationBase {
             res.length + " instead of " + NB_ROWS_IN_BIG_BATCH + "; waited=" +
             (System.currentTimeMillis() - start) + "ms");
         } else {
-          LOG.info("Only got " + res.length + " rows");
+          LOG.info("Only got " + res.length + " rows... retrying");
           Thread.sleep(SLEEP_TIME);
         }
       } else {