HBASE-5243 LogSyncerThread not getting shutdown waiting for the interrupted flag (Ram)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1234559 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -9,6 +9,7 @@ Release 0.92.1 - Unreleased
    HBASE-5237  Addendum for HBASE-5160 and HBASE-4397 (Ram)
    HBASE-5235  HLogSplitter writer thread's streams not getting closed when any 
                of the writer threads has exceptions. (Ram)
+   HBASE-5243  LogSyncerThread not getting shutdown waiting for the interrupted flag (Ram)
 
   TESTS
    HBASE-5223  TestMetaReaderEditor is missing call to CatalogTracker.stop()

src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java

@@ -958,6 +958,7 @@ 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);
     } catch (InterruptedException e) {
@@ -1170,6 +1171,8 @@ public class HLog implements Syncable {
 
     private final long optionalFlushInterval;
     
+    private boolean closeLogSyncer = 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
     // instead of writing them to HDFS piecemeal, because the HDFS write 
@@ -1187,7 +1190,7 @@ public class HLog implements Syncable {
       try {
         // awaiting with a timeout doesn't always
         // throw exceptions on interrupt
-        while(!this.isInterrupted()) {
+        while(!this.isInterrupted() && !closeLogSyncer) {
 
           try {
             if (unflushedEntries.get() <= syncedTillHere) {
@@ -1232,6 +1235,10 @@ public class HLog implements Syncable {
         writer.append(e);
       }
     }
+    
+    void close(){
+      closeLogSyncer = true;
+    }
   }
 
   // sync all known transactions