瀏覽代碼

HADOOP-1805 Region server hang on exit

Catch runtime exceptions in HMemcacheScanner constructor to ensure that read lock is released.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@570918 13f79535-47bb-0310-9956-ffa450edef68
Jim Kellerman 18 年之前
父節點
當前提交
8cbf645bd6
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 1 0
      src/contrib/hbase/CHANGES.txt
  2. 6 1
      src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java

+ 1 - 0
src/contrib/hbase/CHANGES.txt

@@ -23,6 +23,7 @@ Trunk (unreleased changes)
     HADOOP-1780 Regions are still being doubly assigned
     HADOOP-1797 Fix NPEs in MetaScanner constructor
     HADOOP-1799 Incorrect classpath in binary version of Hadoop
+    HADOOP-1805 Region server hang on exit
 
   IMPROVEMENTS
     HADOOP-1737 Make HColumnDescriptor data publically members settable

+ 6 - 1
src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMemcache.java

@@ -332,8 +332,13 @@ public class HMemcache {
             }
           }
         }
+      } catch (RuntimeException ex) {
+        LOG.error("error initializing HMemcache scanner: ", ex);
+        close();
+        throw ex;
+        
       } catch(IOException ex) {
-        LOG.error(ex);
+        LOG.error("error initializing HMemcache scanner: ", ex);
         close();
         throw ex;
       }