svn commit: r1049360 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java

[jdcryans]

Author: jdcryans
Date: Wed Dec 15 00:20:14 2010
New Revision: 1049360

URL: http://svn.apache.org/viewvc?rev=1049360&view=rev
Log:
   HBASE-3358  Recovered replication queue wait on themselves when terminating
   HBASE-3359  LogRoller not added as a WAL listener when replication is enabled

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1049360&r1=1049359&r2=1049360&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Dec 15 00:20:14 2010
@@ -777,6 +777,8 @@ Release 0.90.0 - Unreleased
                defaults to false
    HBASE-3355  Stopping a stopped cluster leaks an HMaster
    HBASE-3356  Add more checks in replication if RS is stopped
+   HBASE-3358  Recovered replication queue wait on themselves when terminating
+   HBASE-3359  LogRoller not added as a WAL listener when replication is 
enabled
 
 
   IMPROVEMENTS

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1049360&r1=1049359&r2=1049360&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Wed Dec 15 00:20:14 2010
@@ -1103,7 +1103,6 @@ public class HRegionServer implements HR
     this.hlogRoller = new LogRoller(this, this);
     listeners.add(this.hlogRoller);
     if (this.replicationHandler != null) {
-      listeners = new ArrayList<WALObserver>();
       // Replication handler is an implementation of WALActionsListener.
       listeners.add(this.replicationHandler);
     }

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java?rev=1049360&r1=1049359&r2=1049360&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
 Wed Dec 15 00:20:14 2010
@@ -605,7 +605,8 @@ public class ReplicationSource extends T
       return true;
     } else if (this.queueRecovered) {
       this.manager.closeRecoveredQueue(this);
-      this.terminate("Finished recovering the queue");
+      LOG.info("Finished recovering the queue");
+      this.running = false;
       return true;
     }
     return false;