Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3358 Recovered replication queue wait on themselves when terminating 

HBASE-3359  LogRoller not added as a WAL listener when replication is enabled


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1049360 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2010-12-15 00:20:14 +00:00
parent 499a74cb8d
commit e6e0eea777
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -777,6 +777,8 @@ Release 0.90.0 - Unreleased
defaults to false defaults to false
HBASE-3355 Stopping a stopped cluster leaks an HMaster HBASE-3355 Stopping a stopped cluster leaks an HMaster
HBASE-3356 Add more checks in replication if RS is stopped 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 IMPROVEMENTS

1
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -1103,7 +1103,6 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
this.hlogRoller = new LogRoller(this, this); this.hlogRoller = new LogRoller(this, this);
listeners.add(this.hlogRoller); listeners.add(this.hlogRoller);
if (this.replicationHandler != null) { if (this.replicationHandler != null) {
listeners = new ArrayList<WALObserver>();
// Replication handler is an implementation of WALActionsListener. // Replication handler is an implementation of WALActionsListener.
listeners.add(this.replicationHandler); listeners.add(this.replicationHandler);
} }

3
src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
View File

@ -605,7 +605,8 @@ public class ReplicationSource extends Thread
return true; return true;
} else if (this.queueRecovered) { } else if (this.queueRecovered) {
this.manager.closeRecoveredQueue(this); this.manager.closeRecoveredQueue(this);
this.terminate("Finished recovering the queue"); LOG.info("Finished recovering the queue");
this.running = false;
return true; return true;
} }
return false; return false;