You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/02/11 15:14:18 UTC

[02/20] hbase-site git commit: Published site at .

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
index 66730bc..23d5489 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html
@@ -231,7 +231,7 @@
 <span class="sourceLineNo">223</span>   * @throws IOException<a name="line.223"></a>
 <span class="sourceLineNo">224</span>   * @throws InterruptedException<a name="line.224"></a>
 <span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  @Test (timeout=300000)<a name="line.226"></a>
+<span class="sourceLineNo">226</span>  @Test<a name="line.226"></a>
 <span class="sourceLineNo">227</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.228"></a>
 <span class="sourceLineNo">229</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.229"></a>
@@ -386,7 +386,7 @@
 <span class="sourceLineNo">378</span>  /**<a name="line.378"></a>
 <span class="sourceLineNo">379</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.379"></a>
 <span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  @Test (timeout=300000)<a name="line.381"></a>
+<span class="sourceLineNo">381</span>  @Test<a name="line.381"></a>
 <span class="sourceLineNo">382</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.382"></a>
 <span class="sourceLineNo">383</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.383"></a>
 <span class="sourceLineNo">384</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.384"></a>
@@ -408,7 +408,7 @@
 <span class="sourceLineNo">400</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.400"></a>
 <span class="sourceLineNo">401</span>   * This is useful in upgrading old instances.<a name="line.401"></a>
 <span class="sourceLineNo">402</span>   */<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  @Test (timeout=300000)<a name="line.403"></a>
+<span class="sourceLineNo">403</span>  @Test<a name="line.403"></a>
 <span class="sourceLineNo">404</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.404"></a>
 <span class="sourceLineNo">405</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.405"></a>
 <span class="sourceLineNo">406</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.406"></a>
@@ -437,7 +437,7 @@
 <span class="sourceLineNo">429</span>    fs.initialize(fs.getUri(), conf);<a name="line.429"></a>
 <span class="sourceLineNo">430</span>  }<a name="line.430"></a>
 <span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  @Test (timeout=300000)<a name="line.432"></a>
+<span class="sourceLineNo">432</span>  @Test<a name="line.432"></a>
 <span class="sourceLineNo">433</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.433"></a>
 <span class="sourceLineNo">434</span>    final String REGION = "region__1";<a name="line.434"></a>
 <span class="sourceLineNo">435</span>    REGIONS.clear();<a name="line.435"></a>
@@ -453,7 +453,7 @@
 <span class="sourceLineNo">445</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.445"></a>
 <span class="sourceLineNo">446</span>  }<a name="line.446"></a>
 <span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  @Test (timeout=300000)<a name="line.448"></a>
+<span class="sourceLineNo">448</span>  @Test<a name="line.448"></a>
 <span class="sourceLineNo">449</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.449"></a>
 <span class="sourceLineNo">450</span>    final String REGION = "region__1";<a name="line.450"></a>
 <span class="sourceLineNo">451</span>    REGIONS.clear();<a name="line.451"></a>
@@ -472,7 +472,7 @@
 <span class="sourceLineNo">464</span>  }<a name="line.464"></a>
 <span class="sourceLineNo">465</span><a name="line.465"></a>
 <span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @Test (timeout=300000)<a name="line.467"></a>
+<span class="sourceLineNo">467</span>  @Test<a name="line.467"></a>
 <span class="sourceLineNo">468</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.468"></a>
 <span class="sourceLineNo">469</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.469"></a>
 <span class="sourceLineNo">470</span>    REGIONS.clear();<a name="line.470"></a>
@@ -526,12 +526,12 @@
 <span class="sourceLineNo">518</span>    return result;<a name="line.518"></a>
 <span class="sourceLineNo">519</span>  }<a name="line.519"></a>
 <span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>  @Test (timeout=300000)<a name="line.521"></a>
+<span class="sourceLineNo">521</span>  @Test<a name="line.521"></a>
 <span class="sourceLineNo">522</span>  public void testEmptyLogFiles() throws IOException {<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    testEmptyLogFiles(true);<a name="line.523"></a>
 <span class="sourceLineNo">524</span>  }<a name="line.524"></a>
 <span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  @Test (timeout=300000)<a name="line.526"></a>
+<span class="sourceLineNo">526</span>  @Test<a name="line.526"></a>
 <span class="sourceLineNo">527</span>  public void testEmptyOpenLogFiles() throws IOException {<a name="line.527"></a>
 <span class="sourceLineNo">528</span>    testEmptyLogFiles(false);<a name="line.528"></a>
 <span class="sourceLineNo">529</span>  }<a name="line.529"></a>
@@ -546,14 +546,14 @@
 <span class="sourceLineNo">538</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); // skip 2 empty<a name="line.538"></a>
 <span class="sourceLineNo">539</span>  }<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>  @Test (timeout=300000)<a name="line.541"></a>
+<span class="sourceLineNo">541</span>  @Test<a name="line.541"></a>
 <span class="sourceLineNo">542</span>  public void testOpenZeroLengthReportedFileButWithDataGetsSplit() throws IOException {<a name="line.542"></a>
 <span class="sourceLineNo">543</span>    // generate logs but leave wal.dat.5 open.<a name="line.543"></a>
 <span class="sourceLineNo">544</span>    generateWALs(5);<a name="line.544"></a>
 <span class="sourceLineNo">545</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.545"></a>
 <span class="sourceLineNo">546</span>  }<a name="line.546"></a>
 <span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>  @Test (timeout=300000)<a name="line.548"></a>
+<span class="sourceLineNo">548</span>  @Test<a name="line.548"></a>
 <span class="sourceLineNo">549</span>  public void testTralingGarbageCorruptionFileSkipErrorsPasses() throws IOException {<a name="line.549"></a>
 <span class="sourceLineNo">550</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.550"></a>
 <span class="sourceLineNo">551</span>    generateWALs(Integer.MAX_VALUE);<a name="line.551"></a>
@@ -562,7 +562,7 @@
 <span class="sourceLineNo">554</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.554"></a>
 <span class="sourceLineNo">555</span>  }<a name="line.555"></a>
 <span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  @Test (timeout=300000)<a name="line.557"></a>
+<span class="sourceLineNo">557</span>  @Test<a name="line.557"></a>
 <span class="sourceLineNo">558</span>  public void testFirstLineCorruptionLogFileSkipErrorsPasses() throws IOException {<a name="line.558"></a>
 <span class="sourceLineNo">559</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.559"></a>
 <span class="sourceLineNo">560</span>    generateWALs(Integer.MAX_VALUE);<a name="line.560"></a>
@@ -571,7 +571,7 @@
 <span class="sourceLineNo">563</span>    splitAndCount(NUM_WRITERS - 1, (NUM_WRITERS - 1) * ENTRIES); //1 corrupt<a name="line.563"></a>
 <span class="sourceLineNo">564</span>  }<a name="line.564"></a>
 <span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>  @Test (timeout=300000)<a name="line.566"></a>
+<span class="sourceLineNo">566</span>  @Test<a name="line.566"></a>
 <span class="sourceLineNo">567</span>  public void testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile() throws IOException {<a name="line.567"></a>
 <span class="sourceLineNo">568</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.568"></a>
 <span class="sourceLineNo">569</span>    generateWALs(Integer.MAX_VALUE);<a name="line.569"></a>
@@ -587,7 +587,7 @@
 <span class="sourceLineNo">579</span>        REGIONS.size() * (goodEntries + firstHalfEntries) &lt;= allRegionsCount);<a name="line.579"></a>
 <span class="sourceLineNo">580</span>  }<a name="line.580"></a>
 <span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>  @Test(timeout = 300000)<a name="line.582"></a>
+<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
 <span class="sourceLineNo">583</span>  public void testCorruptedFileGetsArchivedIfSkipErrors() throws IOException {<a name="line.583"></a>
 <span class="sourceLineNo">584</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.584"></a>
 <span class="sourceLineNo">585</span>    List&lt;FaultyProtobufLogReader.FailureType&gt; failureTypes = Arrays<a name="line.585"></a>
@@ -653,14 +653,14 @@
 <span class="sourceLineNo">645</span>    }<a name="line.645"></a>
 <span class="sourceLineNo">646</span>  }<a name="line.646"></a>
 <span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span>  @Test (timeout=300000, expected = IOException.class)<a name="line.648"></a>
+<span class="sourceLineNo">648</span>  @Test (expected = IOException.class)<a name="line.648"></a>
 <span class="sourceLineNo">649</span>  public void testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows()<a name="line.649"></a>
 <span class="sourceLineNo">650</span>      throws IOException {<a name="line.650"></a>
 <span class="sourceLineNo">651</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.651"></a>
 <span class="sourceLineNo">652</span>    splitCorruptWALs(FaultyProtobufLogReader.FailureType.BEGINNING);<a name="line.652"></a>
 <span class="sourceLineNo">653</span>  }<a name="line.653"></a>
 <span class="sourceLineNo">654</span><a name="line.654"></a>
-<span class="sourceLineNo">655</span>  @Test (timeout=300000)<a name="line.655"></a>
+<span class="sourceLineNo">655</span>  @Test<a name="line.655"></a>
 <span class="sourceLineNo">656</span>  public void testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs()<a name="line.656"></a>
 <span class="sourceLineNo">657</span>      throws IOException {<a name="line.657"></a>
 <span class="sourceLineNo">658</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.658"></a>
@@ -705,19 +705,19 @@
 <span class="sourceLineNo">697</span><a name="line.697"></a>
 <span class="sourceLineNo">698</span>  }<a name="line.698"></a>
 <span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span>  @Test (timeout=300000)<a name="line.700"></a>
+<span class="sourceLineNo">700</span>  @Test<a name="line.700"></a>
 <span class="sourceLineNo">701</span>  public void testEOFisIgnored() throws IOException {<a name="line.701"></a>
 <span class="sourceLineNo">702</span>    int entryCount = 10;<a name="line.702"></a>
 <span class="sourceLineNo">703</span>    ignoreCorruption(Corruptions.TRUNCATE, entryCount, entryCount-1);<a name="line.703"></a>
 <span class="sourceLineNo">704</span>  }<a name="line.704"></a>
 <span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span>  @Test (timeout=300000)<a name="line.706"></a>
+<span class="sourceLineNo">706</span>  @Test<a name="line.706"></a>
 <span class="sourceLineNo">707</span>  public void testCorruptWALTrailer() throws IOException {<a name="line.707"></a>
 <span class="sourceLineNo">708</span>    int entryCount = 10;<a name="line.708"></a>
 <span class="sourceLineNo">709</span>    ignoreCorruption(Corruptions.TRUNCATE_TRAILER, entryCount, entryCount);<a name="line.709"></a>
 <span class="sourceLineNo">710</span>  }<a name="line.710"></a>
 <span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  @Test (timeout=300000)<a name="line.712"></a>
+<span class="sourceLineNo">712</span>  @Test<a name="line.712"></a>
 <span class="sourceLineNo">713</span>  public void testLogsGetArchivedAfterSplit() throws IOException {<a name="line.713"></a>
 <span class="sourceLineNo">714</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.714"></a>
 <span class="sourceLineNo">715</span>    generateWALs(-1);<a name="line.715"></a>
@@ -727,13 +727,13 @@
 <span class="sourceLineNo">719</span>    assertEquals("wrong number of files in the archive log", NUM_WRITERS, archivedLogs.length);<a name="line.719"></a>
 <span class="sourceLineNo">720</span>  }<a name="line.720"></a>
 <span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>  @Test (timeout=300000)<a name="line.722"></a>
+<span class="sourceLineNo">722</span>  @Test<a name="line.722"></a>
 <span class="sourceLineNo">723</span>  public void testSplit() throws IOException {<a name="line.723"></a>
 <span class="sourceLineNo">724</span>    generateWALs(-1);<a name="line.724"></a>
 <span class="sourceLineNo">725</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.725"></a>
 <span class="sourceLineNo">726</span>  }<a name="line.726"></a>
 <span class="sourceLineNo">727</span><a name="line.727"></a>
-<span class="sourceLineNo">728</span>  @Test (timeout=300000)<a name="line.728"></a>
+<span class="sourceLineNo">728</span>  @Test<a name="line.728"></a>
 <span class="sourceLineNo">729</span>  public void testLogDirectoryShouldBeDeletedAfterSuccessfulSplit()<a name="line.729"></a>
 <span class="sourceLineNo">730</span>      throws IOException {<a name="line.730"></a>
 <span class="sourceLineNo">731</span>    generateWALs(-1);<a name="line.731"></a>
@@ -751,7 +751,7 @@
 <span class="sourceLineNo">743</span>    }<a name="line.743"></a>
 <span class="sourceLineNo">744</span>  }<a name="line.744"></a>
 <span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span>  @Test(timeout=300000, expected = IOException.class)<a name="line.746"></a>
+<span class="sourceLineNo">746</span>  @Test(expected = IOException.class)<a name="line.746"></a>
 <span class="sourceLineNo">747</span>  public void testSplitWillFailIfWritingToRegionFails() throws Exception {<a name="line.747"></a>
 <span class="sourceLineNo">748</span>    //leave 5th log open so we could append the "trap"<a name="line.748"></a>
 <span class="sourceLineNo">749</span>    Writer writer = generateWALs(4);<a name="line.749"></a>
@@ -778,7 +778,7 @@
 <span class="sourceLineNo">770</span>    }<a name="line.770"></a>
 <span class="sourceLineNo">771</span>  }<a name="line.771"></a>
 <span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span>  @Test (timeout=300000)<a name="line.773"></a>
+<span class="sourceLineNo">773</span>  @Test<a name="line.773"></a>
 <span class="sourceLineNo">774</span>  public void testSplitDeletedRegion() throws IOException {<a name="line.774"></a>
 <span class="sourceLineNo">775</span>    REGIONS.clear();<a name="line.775"></a>
 <span class="sourceLineNo">776</span>    String region = "region_that_splits";<a name="line.776"></a>
@@ -793,7 +793,7 @@
 <span class="sourceLineNo">785</span>    assertFalse(fs.exists(regiondir));<a name="line.785"></a>
 <span class="sourceLineNo">786</span>  }<a name="line.786"></a>
 <span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span>  @Test (timeout=300000)<a name="line.788"></a>
+<span class="sourceLineNo">788</span>  @Test<a name="line.788"></a>
 <span class="sourceLineNo">789</span>  public void testIOEOnOutputThread() throws Exception {<a name="line.789"></a>
 <span class="sourceLineNo">790</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.790"></a>
 <span class="sourceLineNo">791</span><a name="line.791"></a>
@@ -875,7 +875,7 @@
 <span class="sourceLineNo">867</span>  }<a name="line.867"></a>
 <span class="sourceLineNo">868</span><a name="line.868"></a>
 <span class="sourceLineNo">869</span>  // Test for HBASE-3412<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  @Test (timeout=300000)<a name="line.870"></a>
+<span class="sourceLineNo">870</span>  @Test<a name="line.870"></a>
 <span class="sourceLineNo">871</span>  public void testMovedWALDuringRecovery() throws Exception {<a name="line.871"></a>
 <span class="sourceLineNo">872</span>    // This partial mock will throw LEE for every file simulating<a name="line.872"></a>
 <span class="sourceLineNo">873</span>    // files that were moved<a name="line.873"></a>
@@ -887,7 +887,7 @@
 <span class="sourceLineNo">879</span>    retryOverHdfsProblem(spiedFs);<a name="line.879"></a>
 <span class="sourceLineNo">880</span>  }<a name="line.880"></a>
 <span class="sourceLineNo">881</span><a name="line.881"></a>
-<span class="sourceLineNo">882</span>  @Test (timeout=300000)<a name="line.882"></a>
+<span class="sourceLineNo">882</span>  @Test<a name="line.882"></a>
 <span class="sourceLineNo">883</span>  public void testRetryOpenDuringRecovery() throws Exception {<a name="line.883"></a>
 <span class="sourceLineNo">884</span>    FileSystem spiedFs = Mockito.spy(fs);<a name="line.884"></a>
 <span class="sourceLineNo">885</span>    // The "Cannot obtain block length", "Could not obtain the last block",<a name="line.885"></a>
@@ -916,7 +916,7 @@
 <span class="sourceLineNo">908</span>    retryOverHdfsProblem(spiedFs);<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  @Test (timeout=300000)<a name="line.911"></a>
+<span class="sourceLineNo">911</span>  @Test<a name="line.911"></a>
 <span class="sourceLineNo">912</span>  public void testTerminationAskedByReporter() throws IOException, CorruptedLogFileException {<a name="line.912"></a>
 <span class="sourceLineNo">913</span>    generateWALs(1, 10, -1);<a name="line.913"></a>
 <span class="sourceLineNo">914</span>    FileStatus logfile = fs.listStatus(WALDIR)[0];<a name="line.914"></a>
@@ -960,7 +960,7 @@
 <span class="sourceLineNo">952</span>   * Test log split process with fake data and lots of edits to trigger threading<a name="line.952"></a>
 <span class="sourceLineNo">953</span>   * issues.<a name="line.953"></a>
 <span class="sourceLineNo">954</span>   */<a name="line.954"></a>
-<span class="sourceLineNo">955</span>  @Test (timeout=300000)<a name="line.955"></a>
+<span class="sourceLineNo">955</span>  @Test<a name="line.955"></a>
 <span class="sourceLineNo">956</span>  public void testThreading() throws Exception {<a name="line.956"></a>
 <span class="sourceLineNo">957</span>    doTestThreading(20000, 128*1024*1024, 0);<a name="line.957"></a>
 <span class="sourceLineNo">958</span>  }<a name="line.958"></a>
@@ -969,7 +969,7 @@
 <span class="sourceLineNo">961</span>   * Test blocking behavior of the log split process if writers are writing slower<a name="line.961"></a>
 <span class="sourceLineNo">962</span>   * than the reader is reading.<a name="line.962"></a>
 <span class="sourceLineNo">963</span>   */<a name="line.963"></a>
-<span class="sourceLineNo">964</span>  @Test (timeout=300000)<a name="line.964"></a>
+<span class="sourceLineNo">964</span>  @Test<a name="line.964"></a>
 <span class="sourceLineNo">965</span>  public void testThreadingSlowWriterSmallBuffer() throws Exception {<a name="line.965"></a>
 <span class="sourceLineNo">966</span>    doTestThreading(200, 1024, 50);<a name="line.966"></a>
 <span class="sourceLineNo">967</span>  }<a name="line.967"></a>
@@ -1077,7 +1077,7 @@
 <span class="sourceLineNo">1069</span>  }<a name="line.1069"></a>
 <span class="sourceLineNo">1070</span><a name="line.1070"></a>
 <span class="sourceLineNo">1071</span>  // Does leaving the writer open in testSplitDeletedRegion matter enough for two tests?<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>  @Test (timeout=300000)<a name="line.1072"></a>
+<span class="sourceLineNo">1072</span>  @Test<a name="line.1072"></a>
 <span class="sourceLineNo">1073</span>  public void testSplitLogFileDeletedRegionDir() throws IOException {<a name="line.1073"></a>
 <span class="sourceLineNo">1074</span>    LOG.info("testSplitLogFileDeletedRegionDir");<a name="line.1074"></a>
 <span class="sourceLineNo">1075</span>    final String REGION = "region__1";<a name="line.1075"></a>
@@ -1094,7 +1094,7 @@
 <span class="sourceLineNo">1086</span>    assertFalse(fs.exists(regiondir));<a name="line.1086"></a>
 <span class="sourceLineNo">1087</span>  }<a name="line.1087"></a>
 <span class="sourceLineNo">1088</span><a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>  @Test (timeout=300000)<a name="line.1089"></a>
+<span class="sourceLineNo">1089</span>  @Test<a name="line.1089"></a>
 <span class="sourceLineNo">1090</span>  public void testSplitLogFileEmpty() throws IOException {<a name="line.1090"></a>
 <span class="sourceLineNo">1091</span>    LOG.info("testSplitLogFileEmpty");<a name="line.1091"></a>
 <span class="sourceLineNo">1092</span>    // we won't create the hlog dir until getWAL got called, so<a name="line.1092"></a>
@@ -1110,14 +1110,14 @@
 <span class="sourceLineNo">1102</span>    assertEquals(0, countWAL(fs.listStatus(OLDLOGDIR)[0].getPath()));<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  }<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span><a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>  @Test (timeout=300000)<a name="line.1105"></a>
+<span class="sourceLineNo">1105</span>  @Test<a name="line.1105"></a>
 <span class="sourceLineNo">1106</span>  public void testSplitLogFileMultipleRegions() throws IOException {<a name="line.1106"></a>
 <span class="sourceLineNo">1107</span>    LOG.info("testSplitLogFileMultipleRegions");<a name="line.1107"></a>
 <span class="sourceLineNo">1108</span>    generateWALs(1, 10, -1);<a name="line.1108"></a>
 <span class="sourceLineNo">1109</span>    splitAndCount(1, 10);<a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  }<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span><a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>  @Test (timeout=300000)<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>  @Test<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>  public void testSplitLogFileFirstLineCorruptionLog()<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>      throws IOException {<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.1115"></a>
@@ -1137,7 +1137,7 @@
 <span class="sourceLineNo">1129</span>  /**<a name="line.1129"></a>
 <span class="sourceLineNo">1130</span>   * {@see https://issues.apache.org/jira/browse/HBASE-4862}<a name="line.1130"></a>
 <span class="sourceLineNo">1131</span>   */<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>  @Test (timeout=300000)<a name="line.1132"></a>
+<span class="sourceLineNo">1132</span>  @Test<a name="line.1132"></a>
 <span class="sourceLineNo">1133</span>  public void testConcurrentSplitLogAndReplayRecoverEdit() throws IOException {<a name="line.1133"></a>
 <span class="sourceLineNo">1134</span>    LOG.info("testConcurrentSplitLogAndReplayRecoverEdit");<a name="line.1134"></a>
 <span class="sourceLineNo">1135</span>    // Generate wals for our destination region<a name="line.1135"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
index 66730bc..23d5489 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.ZombieLastLogWriterRegionServer.html
@@ -231,7 +231,7 @@
 <span class="sourceLineNo">223</span>   * @throws IOException<a name="line.223"></a>
 <span class="sourceLineNo">224</span>   * @throws InterruptedException<a name="line.224"></a>
 <span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  @Test (timeout=300000)<a name="line.226"></a>
+<span class="sourceLineNo">226</span>  @Test<a name="line.226"></a>
 <span class="sourceLineNo">227</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.228"></a>
 <span class="sourceLineNo">229</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.229"></a>
@@ -386,7 +386,7 @@
 <span class="sourceLineNo">378</span>  /**<a name="line.378"></a>
 <span class="sourceLineNo">379</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.379"></a>
 <span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  @Test (timeout=300000)<a name="line.381"></a>
+<span class="sourceLineNo">381</span>  @Test<a name="line.381"></a>
 <span class="sourceLineNo">382</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.382"></a>
 <span class="sourceLineNo">383</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.383"></a>
 <span class="sourceLineNo">384</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.384"></a>
@@ -408,7 +408,7 @@
 <span class="sourceLineNo">400</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.400"></a>
 <span class="sourceLineNo">401</span>   * This is useful in upgrading old instances.<a name="line.401"></a>
 <span class="sourceLineNo">402</span>   */<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  @Test (timeout=300000)<a name="line.403"></a>
+<span class="sourceLineNo">403</span>  @Test<a name="line.403"></a>
 <span class="sourceLineNo">404</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.404"></a>
 <span class="sourceLineNo">405</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.405"></a>
 <span class="sourceLineNo">406</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.406"></a>
@@ -437,7 +437,7 @@
 <span class="sourceLineNo">429</span>    fs.initialize(fs.getUri(), conf);<a name="line.429"></a>
 <span class="sourceLineNo">430</span>  }<a name="line.430"></a>
 <span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  @Test (timeout=300000)<a name="line.432"></a>
+<span class="sourceLineNo">432</span>  @Test<a name="line.432"></a>
 <span class="sourceLineNo">433</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.433"></a>
 <span class="sourceLineNo">434</span>    final String REGION = "region__1";<a name="line.434"></a>
 <span class="sourceLineNo">435</span>    REGIONS.clear();<a name="line.435"></a>
@@ -453,7 +453,7 @@
 <span class="sourceLineNo">445</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.445"></a>
 <span class="sourceLineNo">446</span>  }<a name="line.446"></a>
 <span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  @Test (timeout=300000)<a name="line.448"></a>
+<span class="sourceLineNo">448</span>  @Test<a name="line.448"></a>
 <span class="sourceLineNo">449</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.449"></a>
 <span class="sourceLineNo">450</span>    final String REGION = "region__1";<a name="line.450"></a>
 <span class="sourceLineNo">451</span>    REGIONS.clear();<a name="line.451"></a>
@@ -472,7 +472,7 @@
 <span class="sourceLineNo">464</span>  }<a name="line.464"></a>
 <span class="sourceLineNo">465</span><a name="line.465"></a>
 <span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @Test (timeout=300000)<a name="line.467"></a>
+<span class="sourceLineNo">467</span>  @Test<a name="line.467"></a>
 <span class="sourceLineNo">468</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.468"></a>
 <span class="sourceLineNo">469</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.469"></a>
 <span class="sourceLineNo">470</span>    REGIONS.clear();<a name="line.470"></a>
@@ -526,12 +526,12 @@
 <span class="sourceLineNo">518</span>    return result;<a name="line.518"></a>
 <span class="sourceLineNo">519</span>  }<a name="line.519"></a>
 <span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>  @Test (timeout=300000)<a name="line.521"></a>
+<span class="sourceLineNo">521</span>  @Test<a name="line.521"></a>
 <span class="sourceLineNo">522</span>  public void testEmptyLogFiles() throws IOException {<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    testEmptyLogFiles(true);<a name="line.523"></a>
 <span class="sourceLineNo">524</span>  }<a name="line.524"></a>
 <span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  @Test (timeout=300000)<a name="line.526"></a>
+<span class="sourceLineNo">526</span>  @Test<a name="line.526"></a>
 <span class="sourceLineNo">527</span>  public void testEmptyOpenLogFiles() throws IOException {<a name="line.527"></a>
 <span class="sourceLineNo">528</span>    testEmptyLogFiles(false);<a name="line.528"></a>
 <span class="sourceLineNo">529</span>  }<a name="line.529"></a>
@@ -546,14 +546,14 @@
 <span class="sourceLineNo">538</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); // skip 2 empty<a name="line.538"></a>
 <span class="sourceLineNo">539</span>  }<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>  @Test (timeout=300000)<a name="line.541"></a>
+<span class="sourceLineNo">541</span>  @Test<a name="line.541"></a>
 <span class="sourceLineNo">542</span>  public void testOpenZeroLengthReportedFileButWithDataGetsSplit() throws IOException {<a name="line.542"></a>
 <span class="sourceLineNo">543</span>    // generate logs but leave wal.dat.5 open.<a name="line.543"></a>
 <span class="sourceLineNo">544</span>    generateWALs(5);<a name="line.544"></a>
 <span class="sourceLineNo">545</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.545"></a>
 <span class="sourceLineNo">546</span>  }<a name="line.546"></a>
 <span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>  @Test (timeout=300000)<a name="line.548"></a>
+<span class="sourceLineNo">548</span>  @Test<a name="line.548"></a>
 <span class="sourceLineNo">549</span>  public void testTralingGarbageCorruptionFileSkipErrorsPasses() throws IOException {<a name="line.549"></a>
 <span class="sourceLineNo">550</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.550"></a>
 <span class="sourceLineNo">551</span>    generateWALs(Integer.MAX_VALUE);<a name="line.551"></a>
@@ -562,7 +562,7 @@
 <span class="sourceLineNo">554</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.554"></a>
 <span class="sourceLineNo">555</span>  }<a name="line.555"></a>
 <span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  @Test (timeout=300000)<a name="line.557"></a>
+<span class="sourceLineNo">557</span>  @Test<a name="line.557"></a>
 <span class="sourceLineNo">558</span>  public void testFirstLineCorruptionLogFileSkipErrorsPasses() throws IOException {<a name="line.558"></a>
 <span class="sourceLineNo">559</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.559"></a>
 <span class="sourceLineNo">560</span>    generateWALs(Integer.MAX_VALUE);<a name="line.560"></a>
@@ -571,7 +571,7 @@
 <span class="sourceLineNo">563</span>    splitAndCount(NUM_WRITERS - 1, (NUM_WRITERS - 1) * ENTRIES); //1 corrupt<a name="line.563"></a>
 <span class="sourceLineNo">564</span>  }<a name="line.564"></a>
 <span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>  @Test (timeout=300000)<a name="line.566"></a>
+<span class="sourceLineNo">566</span>  @Test<a name="line.566"></a>
 <span class="sourceLineNo">567</span>  public void testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile() throws IOException {<a name="line.567"></a>
 <span class="sourceLineNo">568</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.568"></a>
 <span class="sourceLineNo">569</span>    generateWALs(Integer.MAX_VALUE);<a name="line.569"></a>
@@ -587,7 +587,7 @@
 <span class="sourceLineNo">579</span>        REGIONS.size() * (goodEntries + firstHalfEntries) &lt;= allRegionsCount);<a name="line.579"></a>
 <span class="sourceLineNo">580</span>  }<a name="line.580"></a>
 <span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>  @Test(timeout = 300000)<a name="line.582"></a>
+<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
 <span class="sourceLineNo">583</span>  public void testCorruptedFileGetsArchivedIfSkipErrors() throws IOException {<a name="line.583"></a>
 <span class="sourceLineNo">584</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.584"></a>
 <span class="sourceLineNo">585</span>    List&lt;FaultyProtobufLogReader.FailureType&gt; failureTypes = Arrays<a name="line.585"></a>
@@ -653,14 +653,14 @@
 <span class="sourceLineNo">645</span>    }<a name="line.645"></a>
 <span class="sourceLineNo">646</span>  }<a name="line.646"></a>
 <span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span>  @Test (timeout=300000, expected = IOException.class)<a name="line.648"></a>
+<span class="sourceLineNo">648</span>  @Test (expected = IOException.class)<a name="line.648"></a>
 <span class="sourceLineNo">649</span>  public void testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows()<a name="line.649"></a>
 <span class="sourceLineNo">650</span>      throws IOException {<a name="line.650"></a>
 <span class="sourceLineNo">651</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.651"></a>
 <span class="sourceLineNo">652</span>    splitCorruptWALs(FaultyProtobufLogReader.FailureType.BEGINNING);<a name="line.652"></a>
 <span class="sourceLineNo">653</span>  }<a name="line.653"></a>
 <span class="sourceLineNo">654</span><a name="line.654"></a>
-<span class="sourceLineNo">655</span>  @Test (timeout=300000)<a name="line.655"></a>
+<span class="sourceLineNo">655</span>  @Test<a name="line.655"></a>
 <span class="sourceLineNo">656</span>  public void testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs()<a name="line.656"></a>
 <span class="sourceLineNo">657</span>      throws IOException {<a name="line.657"></a>
 <span class="sourceLineNo">658</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.658"></a>
@@ -705,19 +705,19 @@
 <span class="sourceLineNo">697</span><a name="line.697"></a>
 <span class="sourceLineNo">698</span>  }<a name="line.698"></a>
 <span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span>  @Test (timeout=300000)<a name="line.700"></a>
+<span class="sourceLineNo">700</span>  @Test<a name="line.700"></a>
 <span class="sourceLineNo">701</span>  public void testEOFisIgnored() throws IOException {<a name="line.701"></a>
 <span class="sourceLineNo">702</span>    int entryCount = 10;<a name="line.702"></a>
 <span class="sourceLineNo">703</span>    ignoreCorruption(Corruptions.TRUNCATE, entryCount, entryCount-1);<a name="line.703"></a>
 <span class="sourceLineNo">704</span>  }<a name="line.704"></a>
 <span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span>  @Test (timeout=300000)<a name="line.706"></a>
+<span class="sourceLineNo">706</span>  @Test<a name="line.706"></a>
 <span class="sourceLineNo">707</span>  public void testCorruptWALTrailer() throws IOException {<a name="line.707"></a>
 <span class="sourceLineNo">708</span>    int entryCount = 10;<a name="line.708"></a>
 <span class="sourceLineNo">709</span>    ignoreCorruption(Corruptions.TRUNCATE_TRAILER, entryCount, entryCount);<a name="line.709"></a>
 <span class="sourceLineNo">710</span>  }<a name="line.710"></a>
 <span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  @Test (timeout=300000)<a name="line.712"></a>
+<span class="sourceLineNo">712</span>  @Test<a name="line.712"></a>
 <span class="sourceLineNo">713</span>  public void testLogsGetArchivedAfterSplit() throws IOException {<a name="line.713"></a>
 <span class="sourceLineNo">714</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.714"></a>
 <span class="sourceLineNo">715</span>    generateWALs(-1);<a name="line.715"></a>
@@ -727,13 +727,13 @@
 <span class="sourceLineNo">719</span>    assertEquals("wrong number of files in the archive log", NUM_WRITERS, archivedLogs.length);<a name="line.719"></a>
 <span class="sourceLineNo">720</span>  }<a name="line.720"></a>
 <span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>  @Test (timeout=300000)<a name="line.722"></a>
+<span class="sourceLineNo">722</span>  @Test<a name="line.722"></a>
 <span class="sourceLineNo">723</span>  public void testSplit() throws IOException {<a name="line.723"></a>
 <span class="sourceLineNo">724</span>    generateWALs(-1);<a name="line.724"></a>
 <span class="sourceLineNo">725</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.725"></a>
 <span class="sourceLineNo">726</span>  }<a name="line.726"></a>
 <span class="sourceLineNo">727</span><a name="line.727"></a>
-<span class="sourceLineNo">728</span>  @Test (timeout=300000)<a name="line.728"></a>
+<span class="sourceLineNo">728</span>  @Test<a name="line.728"></a>
 <span class="sourceLineNo">729</span>  public void testLogDirectoryShouldBeDeletedAfterSuccessfulSplit()<a name="line.729"></a>
 <span class="sourceLineNo">730</span>      throws IOException {<a name="line.730"></a>
 <span class="sourceLineNo">731</span>    generateWALs(-1);<a name="line.731"></a>
@@ -751,7 +751,7 @@
 <span class="sourceLineNo">743</span>    }<a name="line.743"></a>
 <span class="sourceLineNo">744</span>  }<a name="line.744"></a>
 <span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span>  @Test(timeout=300000, expected = IOException.class)<a name="line.746"></a>
+<span class="sourceLineNo">746</span>  @Test(expected = IOException.class)<a name="line.746"></a>
 <span class="sourceLineNo">747</span>  public void testSplitWillFailIfWritingToRegionFails() throws Exception {<a name="line.747"></a>
 <span class="sourceLineNo">748</span>    //leave 5th log open so we could append the "trap"<a name="line.748"></a>
 <span class="sourceLineNo">749</span>    Writer writer = generateWALs(4);<a name="line.749"></a>
@@ -778,7 +778,7 @@
 <span class="sourceLineNo">770</span>    }<a name="line.770"></a>
 <span class="sourceLineNo">771</span>  }<a name="line.771"></a>
 <span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span>  @Test (timeout=300000)<a name="line.773"></a>
+<span class="sourceLineNo">773</span>  @Test<a name="line.773"></a>
 <span class="sourceLineNo">774</span>  public void testSplitDeletedRegion() throws IOException {<a name="line.774"></a>
 <span class="sourceLineNo">775</span>    REGIONS.clear();<a name="line.775"></a>
 <span class="sourceLineNo">776</span>    String region = "region_that_splits";<a name="line.776"></a>
@@ -793,7 +793,7 @@
 <span class="sourceLineNo">785</span>    assertFalse(fs.exists(regiondir));<a name="line.785"></a>
 <span class="sourceLineNo">786</span>  }<a name="line.786"></a>
 <span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span>  @Test (timeout=300000)<a name="line.788"></a>
+<span class="sourceLineNo">788</span>  @Test<a name="line.788"></a>
 <span class="sourceLineNo">789</span>  public void testIOEOnOutputThread() throws Exception {<a name="line.789"></a>
 <span class="sourceLineNo">790</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.790"></a>
 <span class="sourceLineNo">791</span><a name="line.791"></a>
@@ -875,7 +875,7 @@
 <span class="sourceLineNo">867</span>  }<a name="line.867"></a>
 <span class="sourceLineNo">868</span><a name="line.868"></a>
 <span class="sourceLineNo">869</span>  // Test for HBASE-3412<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  @Test (timeout=300000)<a name="line.870"></a>
+<span class="sourceLineNo">870</span>  @Test<a name="line.870"></a>
 <span class="sourceLineNo">871</span>  public void testMovedWALDuringRecovery() throws Exception {<a name="line.871"></a>
 <span class="sourceLineNo">872</span>    // This partial mock will throw LEE for every file simulating<a name="line.872"></a>
 <span class="sourceLineNo">873</span>    // files that were moved<a name="line.873"></a>
@@ -887,7 +887,7 @@
 <span class="sourceLineNo">879</span>    retryOverHdfsProblem(spiedFs);<a name="line.879"></a>
 <span class="sourceLineNo">880</span>  }<a name="line.880"></a>
 <span class="sourceLineNo">881</span><a name="line.881"></a>
-<span class="sourceLineNo">882</span>  @Test (timeout=300000)<a name="line.882"></a>
+<span class="sourceLineNo">882</span>  @Test<a name="line.882"></a>
 <span class="sourceLineNo">883</span>  public void testRetryOpenDuringRecovery() throws Exception {<a name="line.883"></a>
 <span class="sourceLineNo">884</span>    FileSystem spiedFs = Mockito.spy(fs);<a name="line.884"></a>
 <span class="sourceLineNo">885</span>    // The "Cannot obtain block length", "Could not obtain the last block",<a name="line.885"></a>
@@ -916,7 +916,7 @@
 <span class="sourceLineNo">908</span>    retryOverHdfsProblem(spiedFs);<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  @Test (timeout=300000)<a name="line.911"></a>
+<span class="sourceLineNo">911</span>  @Test<a name="line.911"></a>
 <span class="sourceLineNo">912</span>  public void testTerminationAskedByReporter() throws IOException, CorruptedLogFileException {<a name="line.912"></a>
 <span class="sourceLineNo">913</span>    generateWALs(1, 10, -1);<a name="line.913"></a>
 <span class="sourceLineNo">914</span>    FileStatus logfile = fs.listStatus(WALDIR)[0];<a name="line.914"></a>
@@ -960,7 +960,7 @@
 <span class="sourceLineNo">952</span>   * Test log split process with fake data and lots of edits to trigger threading<a name="line.952"></a>
 <span class="sourceLineNo">953</span>   * issues.<a name="line.953"></a>
 <span class="sourceLineNo">954</span>   */<a name="line.954"></a>
-<span class="sourceLineNo">955</span>  @Test (timeout=300000)<a name="line.955"></a>
+<span class="sourceLineNo">955</span>  @Test<a name="line.955"></a>
 <span class="sourceLineNo">956</span>  public void testThreading() throws Exception {<a name="line.956"></a>
 <span class="sourceLineNo">957</span>    doTestThreading(20000, 128*1024*1024, 0);<a name="line.957"></a>
 <span class="sourceLineNo">958</span>  }<a name="line.958"></a>
@@ -969,7 +969,7 @@
 <span class="sourceLineNo">961</span>   * Test blocking behavior of the log split process if writers are writing slower<a name="line.961"></a>
 <span class="sourceLineNo">962</span>   * than the reader is reading.<a name="line.962"></a>
 <span class="sourceLineNo">963</span>   */<a name="line.963"></a>
-<span class="sourceLineNo">964</span>  @Test (timeout=300000)<a name="line.964"></a>
+<span class="sourceLineNo">964</span>  @Test<a name="line.964"></a>
 <span class="sourceLineNo">965</span>  public void testThreadingSlowWriterSmallBuffer() throws Exception {<a name="line.965"></a>
 <span class="sourceLineNo">966</span>    doTestThreading(200, 1024, 50);<a name="line.966"></a>
 <span class="sourceLineNo">967</span>  }<a name="line.967"></a>
@@ -1077,7 +1077,7 @@
 <span class="sourceLineNo">1069</span>  }<a name="line.1069"></a>
 <span class="sourceLineNo">1070</span><a name="line.1070"></a>
 <span class="sourceLineNo">1071</span>  // Does leaving the writer open in testSplitDeletedRegion matter enough for two tests?<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>  @Test (timeout=300000)<a name="line.1072"></a>
+<span class="sourceLineNo">1072</span>  @Test<a name="line.1072"></a>
 <span class="sourceLineNo">1073</span>  public void testSplitLogFileDeletedRegionDir() throws IOException {<a name="line.1073"></a>
 <span class="sourceLineNo">1074</span>    LOG.info("testSplitLogFileDeletedRegionDir");<a name="line.1074"></a>
 <span class="sourceLineNo">1075</span>    final String REGION = "region__1";<a name="line.1075"></a>
@@ -1094,7 +1094,7 @@
 <span class="sourceLineNo">1086</span>    assertFalse(fs.exists(regiondir));<a name="line.1086"></a>
 <span class="sourceLineNo">1087</span>  }<a name="line.1087"></a>
 <span class="sourceLineNo">1088</span><a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>  @Test (timeout=300000)<a name="line.1089"></a>
+<span class="sourceLineNo">1089</span>  @Test<a name="line.1089"></a>
 <span class="sourceLineNo">1090</span>  public void testSplitLogFileEmpty() throws IOException {<a name="line.1090"></a>
 <span class="sourceLineNo">1091</span>    LOG.info("testSplitLogFileEmpty");<a name="line.1091"></a>
 <span class="sourceLineNo">1092</span>    // we won't create the hlog dir until getWAL got called, so<a name="line.1092"></a>
@@ -1110,14 +1110,14 @@
 <span class="sourceLineNo">1102</span>    assertEquals(0, countWAL(fs.listStatus(OLDLOGDIR)[0].getPath()));<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  }<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span><a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>  @Test (timeout=300000)<a name="line.1105"></a>
+<span class="sourceLineNo">1105</span>  @Test<a name="line.1105"></a>
 <span class="sourceLineNo">1106</span>  public void testSplitLogFileMultipleRegions() throws IOException {<a name="line.1106"></a>
 <span class="sourceLineNo">1107</span>    LOG.info("testSplitLogFileMultipleRegions");<a name="line.1107"></a>
 <span class="sourceLineNo">1108</span>    generateWALs(1, 10, -1);<a name="line.1108"></a>
 <span class="sourceLineNo">1109</span>    splitAndCount(1, 10);<a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  }<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span><a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>  @Test (timeout=300000)<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>  @Test<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>  public void testSplitLogFileFirstLineCorruptionLog()<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>      throws IOException {<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.1115"></a>
@@ -1137,7 +1137,7 @@
 <span class="sourceLineNo">1129</span>  /**<a name="line.1129"></a>
 <span class="sourceLineNo">1130</span>   * {@see https://issues.apache.org/jira/browse/HBASE-4862}<a name="line.1130"></a>
 <span class="sourceLineNo">1131</span>   */<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>  @Test (timeout=300000)<a name="line.1132"></a>
+<span class="sourceLineNo">1132</span>  @Test<a name="line.1132"></a>
 <span class="sourceLineNo">1133</span>  public void testConcurrentSplitLogAndReplayRecoverEdit() throws IOException {<a name="line.1133"></a>
 <span class="sourceLineNo">1134</span>    LOG.info("testConcurrentSplitLogAndReplayRecoverEdit");<a name="line.1134"></a>
 <span class="sourceLineNo">1135</span>    // Generate wals for our destination region<a name="line.1135"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html
index 66730bc..23d5489 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplit.html
@@ -231,7 +231,7 @@
 <span class="sourceLineNo">223</span>   * @throws IOException<a name="line.223"></a>
 <span class="sourceLineNo">224</span>   * @throws InterruptedException<a name="line.224"></a>
 <span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  @Test (timeout=300000)<a name="line.226"></a>
+<span class="sourceLineNo">226</span>  @Test<a name="line.226"></a>
 <span class="sourceLineNo">227</span>  public void testLogCannotBeWrittenOnceParsed() throws IOException, InterruptedException {<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    final AtomicLong counter = new AtomicLong(0);<a name="line.228"></a>
 <span class="sourceLineNo">229</span>    AtomicBoolean stop = new AtomicBoolean(false);<a name="line.229"></a>
@@ -386,7 +386,7 @@
 <span class="sourceLineNo">378</span>  /**<a name="line.378"></a>
 <span class="sourceLineNo">379</span>   * {@see https://issues.apache.org/jira/browse/HBASE-3020}<a name="line.379"></a>
 <span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  @Test (timeout=300000)<a name="line.381"></a>
+<span class="sourceLineNo">381</span>  @Test<a name="line.381"></a>
 <span class="sourceLineNo">382</span>  public void testRecoveredEditsPathForMeta() throws IOException {<a name="line.382"></a>
 <span class="sourceLineNo">383</span>    byte[] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.383"></a>
 <span class="sourceLineNo">384</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.384"></a>
@@ -408,7 +408,7 @@
 <span class="sourceLineNo">400</span>   * Test old recovered edits file doesn't break WALSplitter.<a name="line.400"></a>
 <span class="sourceLineNo">401</span>   * This is useful in upgrading old instances.<a name="line.401"></a>
 <span class="sourceLineNo">402</span>   */<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  @Test (timeout=300000)<a name="line.403"></a>
+<span class="sourceLineNo">403</span>  @Test<a name="line.403"></a>
 <span class="sourceLineNo">404</span>  public void testOldRecoveredEditsFileSidelined() throws IOException {<a name="line.404"></a>
 <span class="sourceLineNo">405</span>    byte [] encoded = RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes();<a name="line.405"></a>
 <span class="sourceLineNo">406</span>    Path tdir = FSUtils.getTableDir(HBASEDIR, TableName.META_TABLE_NAME);<a name="line.406"></a>
@@ -437,7 +437,7 @@
 <span class="sourceLineNo">429</span>    fs.initialize(fs.getUri(), conf);<a name="line.429"></a>
 <span class="sourceLineNo">430</span>  }<a name="line.430"></a>
 <span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  @Test (timeout=300000)<a name="line.432"></a>
+<span class="sourceLineNo">432</span>  @Test<a name="line.432"></a>
 <span class="sourceLineNo">433</span>  public void testSplitPreservesEdits() throws IOException{<a name="line.433"></a>
 <span class="sourceLineNo">434</span>    final String REGION = "region__1";<a name="line.434"></a>
 <span class="sourceLineNo">435</span>    REGIONS.clear();<a name="line.435"></a>
@@ -453,7 +453,7 @@
 <span class="sourceLineNo">445</span>    assertTrue("edits differ after split", logsAreEqual(originalLog, splitLog[0]));<a name="line.445"></a>
 <span class="sourceLineNo">446</span>  }<a name="line.446"></a>
 <span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  @Test (timeout=300000)<a name="line.448"></a>
+<span class="sourceLineNo">448</span>  @Test<a name="line.448"></a>
 <span class="sourceLineNo">449</span>  public void testSplitRemovesRegionEventsEdits() throws IOException{<a name="line.449"></a>
 <span class="sourceLineNo">450</span>    final String REGION = "region__1";<a name="line.450"></a>
 <span class="sourceLineNo">451</span>    REGIONS.clear();<a name="line.451"></a>
@@ -472,7 +472,7 @@
 <span class="sourceLineNo">464</span>  }<a name="line.464"></a>
 <span class="sourceLineNo">465</span><a name="line.465"></a>
 <span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>  @Test (timeout=300000)<a name="line.467"></a>
+<span class="sourceLineNo">467</span>  @Test<a name="line.467"></a>
 <span class="sourceLineNo">468</span>  public void testSplitLeavesCompactionEventsEdits() throws IOException{<a name="line.468"></a>
 <span class="sourceLineNo">469</span>    RegionInfo hri = RegionInfoBuilder.newBuilder(TABLE_NAME).build();<a name="line.469"></a>
 <span class="sourceLineNo">470</span>    REGIONS.clear();<a name="line.470"></a>
@@ -526,12 +526,12 @@
 <span class="sourceLineNo">518</span>    return result;<a name="line.518"></a>
 <span class="sourceLineNo">519</span>  }<a name="line.519"></a>
 <span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>  @Test (timeout=300000)<a name="line.521"></a>
+<span class="sourceLineNo">521</span>  @Test<a name="line.521"></a>
 <span class="sourceLineNo">522</span>  public void testEmptyLogFiles() throws IOException {<a name="line.522"></a>
 <span class="sourceLineNo">523</span>    testEmptyLogFiles(true);<a name="line.523"></a>
 <span class="sourceLineNo">524</span>  }<a name="line.524"></a>
 <span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>  @Test (timeout=300000)<a name="line.526"></a>
+<span class="sourceLineNo">526</span>  @Test<a name="line.526"></a>
 <span class="sourceLineNo">527</span>  public void testEmptyOpenLogFiles() throws IOException {<a name="line.527"></a>
 <span class="sourceLineNo">528</span>    testEmptyLogFiles(false);<a name="line.528"></a>
 <span class="sourceLineNo">529</span>  }<a name="line.529"></a>
@@ -546,14 +546,14 @@
 <span class="sourceLineNo">538</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES); // skip 2 empty<a name="line.538"></a>
 <span class="sourceLineNo">539</span>  }<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>  @Test (timeout=300000)<a name="line.541"></a>
+<span class="sourceLineNo">541</span>  @Test<a name="line.541"></a>
 <span class="sourceLineNo">542</span>  public void testOpenZeroLengthReportedFileButWithDataGetsSplit() throws IOException {<a name="line.542"></a>
 <span class="sourceLineNo">543</span>    // generate logs but leave wal.dat.5 open.<a name="line.543"></a>
 <span class="sourceLineNo">544</span>    generateWALs(5);<a name="line.544"></a>
 <span class="sourceLineNo">545</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.545"></a>
 <span class="sourceLineNo">546</span>  }<a name="line.546"></a>
 <span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>  @Test (timeout=300000)<a name="line.548"></a>
+<span class="sourceLineNo">548</span>  @Test<a name="line.548"></a>
 <span class="sourceLineNo">549</span>  public void testTralingGarbageCorruptionFileSkipErrorsPasses() throws IOException {<a name="line.549"></a>
 <span class="sourceLineNo">550</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.550"></a>
 <span class="sourceLineNo">551</span>    generateWALs(Integer.MAX_VALUE);<a name="line.551"></a>
@@ -562,7 +562,7 @@
 <span class="sourceLineNo">554</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.554"></a>
 <span class="sourceLineNo">555</span>  }<a name="line.555"></a>
 <span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  @Test (timeout=300000)<a name="line.557"></a>
+<span class="sourceLineNo">557</span>  @Test<a name="line.557"></a>
 <span class="sourceLineNo">558</span>  public void testFirstLineCorruptionLogFileSkipErrorsPasses() throws IOException {<a name="line.558"></a>
 <span class="sourceLineNo">559</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.559"></a>
 <span class="sourceLineNo">560</span>    generateWALs(Integer.MAX_VALUE);<a name="line.560"></a>
@@ -571,7 +571,7 @@
 <span class="sourceLineNo">563</span>    splitAndCount(NUM_WRITERS - 1, (NUM_WRITERS - 1) * ENTRIES); //1 corrupt<a name="line.563"></a>
 <span class="sourceLineNo">564</span>  }<a name="line.564"></a>
 <span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>  @Test (timeout=300000)<a name="line.566"></a>
+<span class="sourceLineNo">566</span>  @Test<a name="line.566"></a>
 <span class="sourceLineNo">567</span>  public void testMiddleGarbageCorruptionSkipErrorsReadsHalfOfFile() throws IOException {<a name="line.567"></a>
 <span class="sourceLineNo">568</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.568"></a>
 <span class="sourceLineNo">569</span>    generateWALs(Integer.MAX_VALUE);<a name="line.569"></a>
@@ -587,7 +587,7 @@
 <span class="sourceLineNo">579</span>        REGIONS.size() * (goodEntries + firstHalfEntries) &lt;= allRegionsCount);<a name="line.579"></a>
 <span class="sourceLineNo">580</span>  }<a name="line.580"></a>
 <span class="sourceLineNo">581</span><a name="line.581"></a>
-<span class="sourceLineNo">582</span>  @Test(timeout = 300000)<a name="line.582"></a>
+<span class="sourceLineNo">582</span>  @Test<a name="line.582"></a>
 <span class="sourceLineNo">583</span>  public void testCorruptedFileGetsArchivedIfSkipErrors() throws IOException {<a name="line.583"></a>
 <span class="sourceLineNo">584</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.584"></a>
 <span class="sourceLineNo">585</span>    List&lt;FaultyProtobufLogReader.FailureType&gt; failureTypes = Arrays<a name="line.585"></a>
@@ -653,14 +653,14 @@
 <span class="sourceLineNo">645</span>    }<a name="line.645"></a>
 <span class="sourceLineNo">646</span>  }<a name="line.646"></a>
 <span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span>  @Test (timeout=300000, expected = IOException.class)<a name="line.648"></a>
+<span class="sourceLineNo">648</span>  @Test (expected = IOException.class)<a name="line.648"></a>
 <span class="sourceLineNo">649</span>  public void testTrailingGarbageCorruptionLogFileSkipErrorsFalseThrows()<a name="line.649"></a>
 <span class="sourceLineNo">650</span>      throws IOException {<a name="line.650"></a>
 <span class="sourceLineNo">651</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.651"></a>
 <span class="sourceLineNo">652</span>    splitCorruptWALs(FaultyProtobufLogReader.FailureType.BEGINNING);<a name="line.652"></a>
 <span class="sourceLineNo">653</span>  }<a name="line.653"></a>
 <span class="sourceLineNo">654</span><a name="line.654"></a>
-<span class="sourceLineNo">655</span>  @Test (timeout=300000)<a name="line.655"></a>
+<span class="sourceLineNo">655</span>  @Test<a name="line.655"></a>
 <span class="sourceLineNo">656</span>  public void testCorruptedLogFilesSkipErrorsFalseDoesNotTouchLogs()<a name="line.656"></a>
 <span class="sourceLineNo">657</span>      throws IOException {<a name="line.657"></a>
 <span class="sourceLineNo">658</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.658"></a>
@@ -705,19 +705,19 @@
 <span class="sourceLineNo">697</span><a name="line.697"></a>
 <span class="sourceLineNo">698</span>  }<a name="line.698"></a>
 <span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span>  @Test (timeout=300000)<a name="line.700"></a>
+<span class="sourceLineNo">700</span>  @Test<a name="line.700"></a>
 <span class="sourceLineNo">701</span>  public void testEOFisIgnored() throws IOException {<a name="line.701"></a>
 <span class="sourceLineNo">702</span>    int entryCount = 10;<a name="line.702"></a>
 <span class="sourceLineNo">703</span>    ignoreCorruption(Corruptions.TRUNCATE, entryCount, entryCount-1);<a name="line.703"></a>
 <span class="sourceLineNo">704</span>  }<a name="line.704"></a>
 <span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span>  @Test (timeout=300000)<a name="line.706"></a>
+<span class="sourceLineNo">706</span>  @Test<a name="line.706"></a>
 <span class="sourceLineNo">707</span>  public void testCorruptWALTrailer() throws IOException {<a name="line.707"></a>
 <span class="sourceLineNo">708</span>    int entryCount = 10;<a name="line.708"></a>
 <span class="sourceLineNo">709</span>    ignoreCorruption(Corruptions.TRUNCATE_TRAILER, entryCount, entryCount);<a name="line.709"></a>
 <span class="sourceLineNo">710</span>  }<a name="line.710"></a>
 <span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>  @Test (timeout=300000)<a name="line.712"></a>
+<span class="sourceLineNo">712</span>  @Test<a name="line.712"></a>
 <span class="sourceLineNo">713</span>  public void testLogsGetArchivedAfterSplit() throws IOException {<a name="line.713"></a>
 <span class="sourceLineNo">714</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.714"></a>
 <span class="sourceLineNo">715</span>    generateWALs(-1);<a name="line.715"></a>
@@ -727,13 +727,13 @@
 <span class="sourceLineNo">719</span>    assertEquals("wrong number of files in the archive log", NUM_WRITERS, archivedLogs.length);<a name="line.719"></a>
 <span class="sourceLineNo">720</span>  }<a name="line.720"></a>
 <span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>  @Test (timeout=300000)<a name="line.722"></a>
+<span class="sourceLineNo">722</span>  @Test<a name="line.722"></a>
 <span class="sourceLineNo">723</span>  public void testSplit() throws IOException {<a name="line.723"></a>
 <span class="sourceLineNo">724</span>    generateWALs(-1);<a name="line.724"></a>
 <span class="sourceLineNo">725</span>    splitAndCount(NUM_WRITERS, NUM_WRITERS * ENTRIES);<a name="line.725"></a>
 <span class="sourceLineNo">726</span>  }<a name="line.726"></a>
 <span class="sourceLineNo">727</span><a name="line.727"></a>
-<span class="sourceLineNo">728</span>  @Test (timeout=300000)<a name="line.728"></a>
+<span class="sourceLineNo">728</span>  @Test<a name="line.728"></a>
 <span class="sourceLineNo">729</span>  public void testLogDirectoryShouldBeDeletedAfterSuccessfulSplit()<a name="line.729"></a>
 <span class="sourceLineNo">730</span>      throws IOException {<a name="line.730"></a>
 <span class="sourceLineNo">731</span>    generateWALs(-1);<a name="line.731"></a>
@@ -751,7 +751,7 @@
 <span class="sourceLineNo">743</span>    }<a name="line.743"></a>
 <span class="sourceLineNo">744</span>  }<a name="line.744"></a>
 <span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span>  @Test(timeout=300000, expected = IOException.class)<a name="line.746"></a>
+<span class="sourceLineNo">746</span>  @Test(expected = IOException.class)<a name="line.746"></a>
 <span class="sourceLineNo">747</span>  public void testSplitWillFailIfWritingToRegionFails() throws Exception {<a name="line.747"></a>
 <span class="sourceLineNo">748</span>    //leave 5th log open so we could append the "trap"<a name="line.748"></a>
 <span class="sourceLineNo">749</span>    Writer writer = generateWALs(4);<a name="line.749"></a>
@@ -778,7 +778,7 @@
 <span class="sourceLineNo">770</span>    }<a name="line.770"></a>
 <span class="sourceLineNo">771</span>  }<a name="line.771"></a>
 <span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span>  @Test (timeout=300000)<a name="line.773"></a>
+<span class="sourceLineNo">773</span>  @Test<a name="line.773"></a>
 <span class="sourceLineNo">774</span>  public void testSplitDeletedRegion() throws IOException {<a name="line.774"></a>
 <span class="sourceLineNo">775</span>    REGIONS.clear();<a name="line.775"></a>
 <span class="sourceLineNo">776</span>    String region = "region_that_splits";<a name="line.776"></a>
@@ -793,7 +793,7 @@
 <span class="sourceLineNo">785</span>    assertFalse(fs.exists(regiondir));<a name="line.785"></a>
 <span class="sourceLineNo">786</span>  }<a name="line.786"></a>
 <span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span>  @Test (timeout=300000)<a name="line.788"></a>
+<span class="sourceLineNo">788</span>  @Test<a name="line.788"></a>
 <span class="sourceLineNo">789</span>  public void testIOEOnOutputThread() throws Exception {<a name="line.789"></a>
 <span class="sourceLineNo">790</span>    conf.setBoolean(HBASE_SKIP_ERRORS, false);<a name="line.790"></a>
 <span class="sourceLineNo">791</span><a name="line.791"></a>
@@ -875,7 +875,7 @@
 <span class="sourceLineNo">867</span>  }<a name="line.867"></a>
 <span class="sourceLineNo">868</span><a name="line.868"></a>
 <span class="sourceLineNo">869</span>  // Test for HBASE-3412<a name="line.869"></a>
-<span class="sourceLineNo">870</span>  @Test (timeout=300000)<a name="line.870"></a>
+<span class="sourceLineNo">870</span>  @Test<a name="line.870"></a>
 <span class="sourceLineNo">871</span>  public void testMovedWALDuringRecovery() throws Exception {<a name="line.871"></a>
 <span class="sourceLineNo">872</span>    // This partial mock will throw LEE for every file simulating<a name="line.872"></a>
 <span class="sourceLineNo">873</span>    // files that were moved<a name="line.873"></a>
@@ -887,7 +887,7 @@
 <span class="sourceLineNo">879</span>    retryOverHdfsProblem(spiedFs);<a name="line.879"></a>
 <span class="sourceLineNo">880</span>  }<a name="line.880"></a>
 <span class="sourceLineNo">881</span><a name="line.881"></a>
-<span class="sourceLineNo">882</span>  @Test (timeout=300000)<a name="line.882"></a>
+<span class="sourceLineNo">882</span>  @Test<a name="line.882"></a>
 <span class="sourceLineNo">883</span>  public void testRetryOpenDuringRecovery() throws Exception {<a name="line.883"></a>
 <span class="sourceLineNo">884</span>    FileSystem spiedFs = Mockito.spy(fs);<a name="line.884"></a>
 <span class="sourceLineNo">885</span>    // The "Cannot obtain block length", "Could not obtain the last block",<a name="line.885"></a>
@@ -916,7 +916,7 @@
 <span class="sourceLineNo">908</span>    retryOverHdfsProblem(spiedFs);<a name="line.908"></a>
 <span class="sourceLineNo">909</span>  }<a name="line.909"></a>
 <span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>  @Test (timeout=300000)<a name="line.911"></a>
+<span class="sourceLineNo">911</span>  @Test<a name="line.911"></a>
 <span class="sourceLineNo">912</span>  public void testTerminationAskedByReporter() throws IOException, CorruptedLogFileException {<a name="line.912"></a>
 <span class="sourceLineNo">913</span>    generateWALs(1, 10, -1);<a name="line.913"></a>
 <span class="sourceLineNo">914</span>    FileStatus logfile = fs.listStatus(WALDIR)[0];<a name="line.914"></a>
@@ -960,7 +960,7 @@
 <span class="sourceLineNo">952</span>   * Test log split process with fake data and lots of edits to trigger threading<a name="line.952"></a>
 <span class="sourceLineNo">953</span>   * issues.<a name="line.953"></a>
 <span class="sourceLineNo">954</span>   */<a name="line.954"></a>
-<span class="sourceLineNo">955</span>  @Test (timeout=300000)<a name="line.955"></a>
+<span class="sourceLineNo">955</span>  @Test<a name="line.955"></a>
 <span class="sourceLineNo">956</span>  public void testThreading() throws Exception {<a name="line.956"></a>
 <span class="sourceLineNo">957</span>    doTestThreading(20000, 128*1024*1024, 0);<a name="line.957"></a>
 <span class="sourceLineNo">958</span>  }<a name="line.958"></a>
@@ -969,7 +969,7 @@
 <span class="sourceLineNo">961</span>   * Test blocking behavior of the log split process if writers are writing slower<a name="line.961"></a>
 <span class="sourceLineNo">962</span>   * than the reader is reading.<a name="line.962"></a>
 <span class="sourceLineNo">963</span>   */<a name="line.963"></a>
-<span class="sourceLineNo">964</span>  @Test (timeout=300000)<a name="line.964"></a>
+<span class="sourceLineNo">964</span>  @Test<a name="line.964"></a>
 <span class="sourceLineNo">965</span>  public void testThreadingSlowWriterSmallBuffer() throws Exception {<a name="line.965"></a>
 <span class="sourceLineNo">966</span>    doTestThreading(200, 1024, 50);<a name="line.966"></a>
 <span class="sourceLineNo">967</span>  }<a name="line.967"></a>
@@ -1077,7 +1077,7 @@
 <span class="sourceLineNo">1069</span>  }<a name="line.1069"></a>
 <span class="sourceLineNo">1070</span><a name="line.1070"></a>
 <span class="sourceLineNo">1071</span>  // Does leaving the writer open in testSplitDeletedRegion matter enough for two tests?<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>  @Test (timeout=300000)<a name="line.1072"></a>
+<span class="sourceLineNo">1072</span>  @Test<a name="line.1072"></a>
 <span class="sourceLineNo">1073</span>  public void testSplitLogFileDeletedRegionDir() throws IOException {<a name="line.1073"></a>
 <span class="sourceLineNo">1074</span>    LOG.info("testSplitLogFileDeletedRegionDir");<a name="line.1074"></a>
 <span class="sourceLineNo">1075</span>    final String REGION = "region__1";<a name="line.1075"></a>
@@ -1094,7 +1094,7 @@
 <span class="sourceLineNo">1086</span>    assertFalse(fs.exists(regiondir));<a name="line.1086"></a>
 <span class="sourceLineNo">1087</span>  }<a name="line.1087"></a>
 <span class="sourceLineNo">1088</span><a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>  @Test (timeout=300000)<a name="line.1089"></a>
+<span class="sourceLineNo">1089</span>  @Test<a name="line.1089"></a>
 <span class="sourceLineNo">1090</span>  public void testSplitLogFileEmpty() throws IOException {<a name="line.1090"></a>
 <span class="sourceLineNo">1091</span>    LOG.info("testSplitLogFileEmpty");<a name="line.1091"></a>
 <span class="sourceLineNo">1092</span>    // we won't create the hlog dir until getWAL got called, so<a name="line.1092"></a>
@@ -1110,14 +1110,14 @@
 <span class="sourceLineNo">1102</span>    assertEquals(0, countWAL(fs.listStatus(OLDLOGDIR)[0].getPath()));<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  }<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span><a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>  @Test (timeout=300000)<a name="line.1105"></a>
+<span class="sourceLineNo">1105</span>  @Test<a name="line.1105"></a>
 <span class="sourceLineNo">1106</span>  public void testSplitLogFileMultipleRegions() throws IOException {<a name="line.1106"></a>
 <span class="sourceLineNo">1107</span>    LOG.info("testSplitLogFileMultipleRegions");<a name="line.1107"></a>
 <span class="sourceLineNo">1108</span>    generateWALs(1, 10, -1);<a name="line.1108"></a>
 <span class="sourceLineNo">1109</span>    splitAndCount(1, 10);<a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  }<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span><a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>  @Test (timeout=300000)<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>  @Test<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>  public void testSplitLogFileFirstLineCorruptionLog()<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>      throws IOException {<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span>    conf.setBoolean(HBASE_SKIP_ERRORS, true);<a name="line.1115"></a>
@@ -1137,7 +1137,7 @@
 <span class="sourceLineNo">1129</span>  /**<a name="line.1129"></a>
 <span class="sourceLineNo">1130</span>   * {@see https://issues.apache.org/jira/browse/HBASE-4862}<a name="line.1130"></a>
 <span class="sourceLineNo">1131</span>   */<a name="line.1131"></a>
-<span class="sourceLineNo">1132</span>  @Test (timeout=300000)<a name="line.1132"></a>
+<span class="sourceLineNo">1132</span>  @Test<a name="line.1132"></a>
 <span class="sourceLineNo">1133</span>  public void testConcurrentSplitLogAndReplayRecoverEdit() throws IOException {<a name="line.1133"></a>
 <span class="sourceLineNo">1134</span>    LOG.info("testConcurrentSplitLogAndReplayRecoverEdit");<a name="line.1134"></a>
 <span class="sourceLineNo">1135</span>    // Generate wals for our destination region<a name="line.1135"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.html
index e44e8c3..971ea7b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/wal/TestWALSplitBoundedLogWriterCreation.html
@@ -50,7 +50,7 @@
 <span class="sourceLineNo">042</span>   * The logic of this test has conflict with the limit writers split logic, skip this test<a name="line.42"></a>
 <span class="sourceLineNo">043</span>   */<a name="line.43"></a>
 <span class="sourceLineNo">044</span>  @Override<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  @Test(timeout=300000)<a name="line.45"></a>
+<span class="sourceLineNo">045</span>  @Test<a name="line.45"></a>
 <span class="sourceLineNo">046</span>  @Ignore<a name="line.46"></a>
 <span class="sourceLineNo">047</span>  public void testThreadingSlowWriterSmallBuffer() throws Exception {<a name="line.47"></a>
 <span class="sourceLineNo">048</span>    super.testThreadingSlowWriterSmallBuffer();<a name="line.48"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestInstancePending.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestInstancePending.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestInstancePending.html
index 7f30e61..211b692 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestInstancePending.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestInstancePending.html
@@ -41,7 +41,7 @@
 <span class="sourceLineNo">033</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.33"></a>
 <span class="sourceLineNo">034</span>      HBaseClassTestRule.forClass(TestInstancePending.class);<a name="line.34"></a>
 <span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>  @Test(timeout = 1000)<a name="line.36"></a>
+<span class="sourceLineNo">036</span>  @Test<a name="line.36"></a>
 <span class="sourceLineNo">037</span>  public void test() throws Exception {<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    final InstancePending&lt;String&gt; pending = new InstancePending&lt;&gt;();<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    final AtomicReference&lt;String&gt; getResultRef = new AtomicReference&lt;&gt;();<a name="line.39"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKMulti.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKMulti.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKMulti.html
index 599d8f0..777b9ad 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKMulti.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/zookeeper/TestZKMulti.html
@@ -89,7 +89,7 @@
 <span class="sourceLineNo">081</span>    TEST_UTIL.shutdownMiniZKCluster();<a name="line.81"></a>
 <span class="sourceLineNo">082</span>  }<a name="line.82"></a>
 <span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  @Test (timeout=60000)<a name="line.84"></a>
+<span class="sourceLineNo">084</span>  @Test<a name="line.84"></a>
 <span class="sourceLineNo">085</span>  public void testSimpleMulti() throws Exception {<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    // null multi<a name="line.86"></a>
 <span class="sourceLineNo">087</span>    ZKUtil.multiOrSequential(zkw, null, false);<a name="line.87"></a>
@@ -118,7 +118,7 @@
 <span class="sourceLineNo">110</span>    assertTrue(ZKUtil.checkExists(zkw, path) == -1);<a name="line.110"></a>
 <span class="sourceLineNo">111</span>  }<a name="line.111"></a>
 <span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  @Test (timeout=60000)<a name="line.113"></a>
+<span class="sourceLineNo">113</span>  @Test<a name="line.113"></a>
 <span class="sourceLineNo">114</span>  public void testComplexMulti() throws Exception {<a name="line.114"></a>
 <span class="sourceLineNo">115</span>    String path1 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti1");<a name="line.115"></a>
 <span class="sourceLineNo">116</span>    String path2 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testComplexMulti2");<a name="line.116"></a>
@@ -160,7 +160,7 @@
 <span class="sourceLineNo">152</span>    assertTrue(Bytes.equals(ZKUtil.getData(zkw, path6), Bytes.toBytes(path6)));<a name="line.152"></a>
 <span class="sourceLineNo">153</span>  }<a name="line.153"></a>
 <span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  @Test (timeout=60000)<a name="line.155"></a>
+<span class="sourceLineNo">155</span>  @Test<a name="line.155"></a>
 <span class="sourceLineNo">156</span>  public void testSingleFailure() throws Exception {<a name="line.156"></a>
 <span class="sourceLineNo">157</span>    // try to delete a node that doesn't exist<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    boolean caughtNoNode = false;<a name="line.158"></a>
@@ -198,7 +198,7 @@
 <span class="sourceLineNo">190</span>    assertTrue(caughtNodeExists);<a name="line.190"></a>
 <span class="sourceLineNo">191</span>  }<a name="line.191"></a>
 <span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  @Test (timeout=60000)<a name="line.193"></a>
+<span class="sourceLineNo">193</span>  @Test<a name="line.193"></a>
 <span class="sourceLineNo">194</span>  public void testSingleFailureInMulti() throws Exception {<a name="line.194"></a>
 <span class="sourceLineNo">195</span>    // try a multi where all but one operation succeeds<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    String pathA = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testSingleFailureInMultiA");<a name="line.196"></a>
@@ -221,7 +221,7 @@
 <span class="sourceLineNo">213</span>    assertTrue(ZKUtil.checkExists(zkw, pathC) == -1);<a name="line.213"></a>
 <span class="sourceLineNo">214</span>  }<a name="line.214"></a>
 <span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>  @Test (timeout=60000)<a name="line.216"></a>
+<span class="sourceLineNo">216</span>  @Test<a name="line.216"></a>
 <span class="sourceLineNo">217</span>  public void testMultiFailure() throws Exception {<a name="line.217"></a>
 <span class="sourceLineNo">218</span>    String pathX = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureX");<a name="line.218"></a>
 <span class="sourceLineNo">219</span>    String pathY = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "testMultiFailureY");<a name="line.219"></a>
@@ -275,7 +275,7 @@
 <span class="sourceLineNo">267</span>    assertTrue(ZKUtil.checkExists(zkw, pathV) == -1);<a name="line.267"></a>
 <span class="sourceLineNo">268</span>  }<a name="line.268"></a>
 <span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>  @Test (timeout=60000)<a name="line.270"></a>
+<span class="sourceLineNo">270</span>  @Test<a name="line.270"></a>
 <span class="sourceLineNo">271</span>  public void testRunSequentialOnMultiFailure() throws Exception {<a name="line.271"></a>
 <span class="sourceLineNo">272</span>    String path1 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential1");<a name="line.272"></a>
 <span class="sourceLineNo">273</span>    String path2 = ZNodePaths.joinZNode(zkw.znodePaths.baseZNode, "runSequential2");<a name="line.273"></a>
@@ -308,7 +308,7 @@
 <span class="sourceLineNo">300</span>   * Verifies that for the given root node, it should delete all the child nodes<a name="line.300"></a>
 <span class="sourceLineNo">301</span>   * recursively using multi-update api.<a name="line.301"></a>
 <span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  @Test (timeout=60000)<a name="line.303"></a>
+<span class="sourceLineNo">303</span>  @Test<a name="line.303"></a>
 <span class="sourceLineNo">304</span>  public void testdeleteChildrenRecursivelyMulti() throws Exception {<a name="line.304"></a>
 <span class="sourceLineNo">305</span>    String parentZNode = "/testRootMulti";<a name="line.305"></a>
 <span class="sourceLineNo">306</span>    createZNodeTree(parentZNode);<a name="line.306"></a>
@@ -326,7 +326,7 @@
 <span class="sourceLineNo">318</span>   * Verifies that for the given root node, it should delete all the nodes recursively using<a name="line.318"></a>
 <span class="sourceLineNo">319</span>   * multi-update api.<a name="line.319"></a>
 <span class="sourceLineNo">320</span>   */<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  @Test(timeout = 60000)<a name="line.321"></a>
+<span class="sourceLineNo">321</span>  @Test<a name="line.321"></a>
 <span class="sourceLineNo">322</span>  public void testDeleteNodeRecursivelyMulti() throws Exception {<a name="line.322"></a>
 <span class="sourceLineNo">323</span>    String parentZNode = "/testdeleteNodeRecursivelyMulti";<a name="line.323"></a>
 <span class="sourceLineNo">324</span>    createZNodeTree(parentZNode);<a name="line.324"></a>
@@ -335,7 +335,7 @@
 <span class="sourceLineNo">327</span>    assertTrue("Parent znode should be deleted.", ZKUtil.checkExists(zkw, parentZNode) == -1);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>  }<a name="line.328"></a>
 <span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @Test(timeout = 60000)<a name="line.330"></a>
+<span class="sourceLineNo">330</span>  @Test<a name="line.330"></a>
 <span class="sourceLineNo">331</span>  public void testDeleteNodeRecursivelyMultiOrSequential() throws Exception {<a name="line.331"></a>
 <span class="sourceLineNo">332</span>    String parentZNode1 = "/testdeleteNode1";<a name="line.332"></a>
 <span class="sourceLineNo">333</span>    String parentZNode2 = "/testdeleteNode2";<a name="line.333"></a>
@@ -351,7 +351,7 @@
 <span class="sourceLineNo">343</span>    assertTrue("Parent znode 3 should be deleted.", ZKUtil.checkExists(zkw, parentZNode3) == -1);<a name="line.343"></a>
 <span class="sourceLineNo">344</span>  }<a name="line.344"></a>
 <span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>  @Test(timeout = 60000)<a name="line.346"></a>
+<span class="sourceLineNo">346</span>  @Test<a name="line.346"></a>
 <span class="sourceLineNo">347</span>  public void testDeleteChildrenRecursivelyMultiOrSequential() throws Exception {<a name="line.347"></a>
 <span class="sourceLineNo">348</span>    String parentZNode1 = "/testdeleteChildren1";<a name="line.348"></a>
 <span class="sourceLineNo">349</span>    String parentZNode2 = "/testdeleteChildren2";<a name="line.349"></a>