You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2011/12/31 06:03:49 UTC

svn commit: r1226039 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java

Author: tedyu
Date: Sat Dec 31 05:03:49 2011
New Revision: 1226039

URL: http://svn.apache.org/viewvc?rev=1226039&view=rev
Log:
HBASE-5112  TestReplication#queueFailover flaky due to potentially
               uninitialized Scan (Jimmy Xiang)

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1226039&r1=1226038&r2=1226039&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Dec 31 05:03:49 2011
@@ -482,6 +482,8 @@ Release 0.92.0 - Unreleased
    HBASE-4868  TestOfflineMetaRebuildBase#testMetaRebuild occasionally fails
                (Gao Jinchao)
    HBASE-4874  Run tests with non-secure random, some tests hang otherwise (Lars H)
+   HBASE-5112  TestReplication#queueFailover flaky due to potentially
+               uninitialized Scan (Jimmy Xiang)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java?rev=1226039&r1=1226038&r2=1226039&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java Sat Dec 31 05:03:49 2011
@@ -649,14 +649,13 @@ public class TestReplication {
       initialCount = res.length;
     }
 
-    Scan scan2 = new Scan();
-
     int lastCount = 0;
 
     for (int i = 0; i < NB_RETRIES; i++) {
       if (i==NB_RETRIES-1) {
         fail("Waited too much time for queueFailover replication");
       }
+      Scan scan2 = new Scan();
       ResultScanner scanner2 = htable2.getScanner(scan2);
       Result[] res2 = scanner2.next(initialCount * 2);
       scanner2.close();
@@ -686,6 +685,7 @@ public class TestReplication {
         }
       }
     };
+    killer.setDaemon(true);
     killer.start();
     return killer;
   }