hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1033303 - in /hbase/trunk: ./ src/main/java/org/apache/hadoop/hbase/master/ src/main/java/org/apache/hadoop/hbase/master/handler/
Date Wed, 10 Nov 2010 00:18:00 GMT
Author: stack
Date: Wed Nov 10 00:18:00 2010
New Revision: 1033303

URL: http://svn.apache.org/viewvc?rev=1033303&view=rev
Log:
HBASE-3212 More testing of enable/disable uncovered base condition not in place; i.e. that
only one enable/disable runs at a time

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1033303&r1=1033302&r2=1033303&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Nov 10 00:18:00 2010
@@ -665,6 +665,8 @@ Release 0.90.0 - Unreleased
    HBASE-3207  If we get IOException when closing a region, we should still
                remove it from online regions and complete the close in ZK
    HBASE-3199  large response handling: some fixups and cleanups
+   HBASE-3212  More testing of enable/disable uncovered base condition not in
+               place; i.e. that only one enable/disable runs at a time
 
 
   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=1033303&r1=1033302&r2=1033303&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 Wed Nov 10 00:18:00
2010
@@ -513,8 +513,11 @@ implements HMasterInterface, HMasterRegi
         conf.getInt("hbase.master.executor.serverops.threads", 3));
       this.executorService.startExecutorService(ExecutorType.MASTER_META_SERVER_OPERATIONS,
         conf.getInt("hbase.master.executor.serverops.threads", 2));
+      // 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.
       this.executorService.startExecutorService(ExecutorType.MASTER_TABLE_OPERATIONS,
-        conf.getInt("hbase.master.executor.tableops.threads", 3));
+        conf.getInt("hbase.master.executor.tableops.threads", 1));
 
       // Put up info server.
       int port = this.conf.getInt("hbase.master.info.port", 60010);

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java?rev=1033303&r1=1033302&r2=1033303&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
Wed Nov 10 00:18:00 2010
@@ -83,7 +83,7 @@ public class ClosedRegionHandler extends
     LOG.debug("Handling CLOSED event for " + regionInfo.getEncodedName());
     // Check if this table is being disabled or not
     if (this.assignmentManager.getZKTable().
-        isDisabledTable(this.regionInfo.getTableDesc().getNameAsString())) {
+        isDisablingOrDisabledTable(this.regionInfo.getTableDesc().getNameAsString())) {
       assignmentManager.offlineDisabledRegion(regionInfo);
       return;
     }

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java?rev=1033303&r1=1033302&r2=1033303&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
Wed Nov 10 00:18:00 2010
@@ -92,7 +92,7 @@ public class OpenedRegionHandler extends
           regionInfo.getEncodedName() + ")", e);
     }
     this.assignmentManager.regionOnline(regionInfo, serverInfo);
-    if (this.assignmentManager.getZKTable().isDisabledTable(
+    if (this.assignmentManager.getZKTable().isDisablingOrDisabledTable(
         regionInfo.getTableDesc().getNameAsString())) {
       LOG.debug("Opened region " + regionInfo.getRegionNameAsString() + " but "
           + "this table is disabled, triggering close of region");



Mime
View raw message