From d0512039380ffd0caeee7ff41001fdafea756ba3 Mon Sep 17 00:00:00 2001
From: Jean-Daniel Cryans <jdcryans@apache.org>
Date: Fri, 18 Mar 2011 00:40:00 +0000
Subject: [PATCH] Reverting HBASE-3515

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1082772 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                    | 2 --
 .../java/org/apache/hadoop/hbase/regionserver/wal/HLog.java    | 3 ---
 .../org/apache/hadoop/hbase/replication/TestReplication.java   | 3 +++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 788a43a49b1..ba2e3353038 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
index a846d06fefe..7569992535f 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
@@ -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;
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java b/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
index bd813defe66..999db15e67e 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
@@ -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