svn commit: r1061575 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[st...@apache.org]

Author: stack
Date: Thu Jan 20 23:47:37 2011
New Revision: 1061575

URL: http://svn.apache.org/viewvc?rev=1061575&view=rev
Log:
HBASE-3449 Server shutdown handlers deadlocked waiting for META

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1061575&r1=1061574&r2=1061575&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Jan 20 23:47:37 2011
@@ -26,6 +26,7 @@ Release 0.91.0 - Unreleased
                between memstore/snapshot and storefiles
    HBASE-3403  Region orphaned after failure during split
    HBASE-3387  Pair does not deep check arrays for equality -- REVERT THIS PATCH
+   HBASE-3449  Server shutdown handlers deadlocked waiting for META
 
 
   IMPROVEMENTS

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1061575&r1=1061574&r2=1061575&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu Jan 20 23:47:37 2011
@@ -524,7 +524,7 @@ implements HMasterInterface, HMasterRegi
       this.executorService.startExecutorService(ExecutorType.MASTER_SERVER_OPERATIONS,
         conf.getInt("hbase.master.executor.serverops.threads", 3));
       this.executorService.startExecutorService(ExecutorType.MASTER_META_SERVER_OPERATIONS,
-        conf.getInt("hbase.master.executor.serverops.threads", 2));
+        conf.getInt("hbase.master.executor.serverops.threads", 5));
       // We depend on there being only one instance of this executor running
       // at a time.  To do concurrency, would need fencing of enable/disable of
       // tables.