svn commit: r1061573 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[st...@apache.org]

Author: stack
Date: Thu Jan 20 23:46:33 2011
New Revision: 1061573

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

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1061573&r1=1061572&r2=1061573&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Jan 20 23:46:33 2011
@@ -3,6 +3,7 @@ Release 0.90.1 - Unreleased
   BUG FIXES
    HBASE-3387 Revert 'Pair does not deep check arrays for equality'
    HBASE-3445 Master crashes on data that was moved from different host
+   HBASE-3449 Server shutdown handlers deadlocked waiting for META
 
   IMPROVEMENTS
 

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1061573&r1=1061572&r2=1061573&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu Jan 20 23:46:33 2011
@@ -518,7 +518,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.