Author: jdcryans
Date: Fri Mar 18 00:40:00 2011
New Revision: 1082772

URL: http://svn.apache.org/viewvc?rev=1082772&view=rev
Log:
Reverting HBASE-3515

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
    
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=1082772&r1=1082771&r2=1082772&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Mar 18 00:40:00 2011
@@ -38,8 +38,6 @@ Release 0.91.0 - Unreleased
    HBASE-3313  Table name isn't checked in isTableEnabled/isTableDisabled
                (Ted Yu via Stack)
    HBASE-3514  Speedup HFile.Writer append (Matteo Bertozzi via Ryan)
-   HBASE-3515  [replication] ReplicationSource can miss a log after RS comes
-               out of GC
    HBASE-3665  tighten assertions for testBloomFilterSize
    HBASE-3662  REST server does not respect client supplied max versions when
                creating scanner

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1082772&r1=1082771&r2=1082772&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java 
(original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java 
Fri Mar 18 00:40:00 2011
@@ -504,9 +504,6 @@ public class HLog implements Syncable {
       }
 
       synchronized (updateLock) {
-        if (closed) {
-          return regionsToFlush;
-        }
         // Clean up current writer.
         Path oldFile = cleanupCurrentWriter(currentFilenum);
         this.writer = nextWriter;

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=1082772&r1=1082771&r2=1082772&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
 Fri Mar 18 00:40:00 2011
@@ -517,6 +517,9 @@ public class TestReplication {
   /**
    * Load up multiple tables over 2 region servers and kill a source during
    * the upload. The failover happens internally.
+   *
+   * WARNING this test sometimes fails because of HBASE-3515
+   *
    * @throws Exception
    */
   @Test


Reply via email to