You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2010/12/15 01:18:20 UTC
svn commit: r1049359 - in /hbase/branches/0.90: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
Author: jdcryans
Date: Wed Dec 15 00:18:20 2010
New Revision: 1049359
URL: http://svn.apache.org/viewvc?rev=1049359&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/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1049359&r1=1049358&r2=1049359&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Dec 15 00:18:20 2010
@@ -747,6 +747,8 @@ Release 0.90.0 - Unreleased
HBASE-3332 Regions stuck in transition after RS failure
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/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1049359&r1=1049358&r2=1049359&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Dec 15 00:18:20 2010
@@ -1099,7 +1099,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/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java?rev=1049359&r1=1049358&r2=1049359&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java Wed Dec 15 00:18:20 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;