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

HBASE-6420 Gracefully shutdown logsyncer 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1363180 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2012-07-19 00:00:40 +00:00
parent 5586daa4de
commit dc17a2559c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
View File

@ -41,6 +41,7 @@ import java.util.TreeSet;
import java.util.UUID;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
@ -984,7 +985,6 @@ public class HLog implements Syncable {
*/
public void close() throws IOException {
try {
logSyncerThread.interrupt();
logSyncerThread.close();
// Make sure we synced everything
logSyncerThread.join(this.optionalFlushInterval*2);
@ -1198,7 +1198,7 @@ public class HLog implements Syncable {
private final long optionalFlushInterval;
private boolean closeLogSyncer = false;
private AtomicBoolean closeLogSyncer = new AtomicBoolean(false);
// List of pending writes to the HLog. There corresponds to transactions
// that have not yet returned to the client. We keep them cached here
@ -1217,11 +1217,13 @@ public class HLog implements Syncable {
try {
// awaiting with a timeout doesn't always
// throw exceptions on interrupt
while(!this.isInterrupted() && !closeLogSyncer) {
while(!this.isInterrupted() && !closeLogSyncer.get()) {
try {
if (unflushedEntries.get() <= syncedTillHere) {
Thread.sleep(this.optionalFlushInterval);
synchronized (closeLogSyncer) {
closeLogSyncer.wait(this.optionalFlushInterval);
}
}
sync();
} catch (IOException e) {
@ -1261,8 +1263,11 @@ public class HLog implements Syncable {
}
}
void close(){
closeLogSyncer = true;
void close() {
synchronized (closeLogSyncer) {
closeLogSyncer.set(true);
closeLogSyncer.notifyAll();
}
}
}