hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1126871 - in /hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master: AssignmentManager.java HMaster.java
Date Tue, 24 May 2011 05:14:52 GMT
Author: stack
Date: Tue May 24 05:14:52 2011
New Revision: 1126871

URL: http://svn.apache.org/viewvc?rev=1126871&view=rev
Log:
HBASE-3195 Binary row keys in hbck and other miscellaneous binary key display issues

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

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1126871&r1=1126870&r2=1126871&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Tue May 24 05:14:52 2011
@@ -1724,7 +1724,11 @@ public class AssignmentManager extends Z
               case OPEN:
                 LOG.error("Region has been OPEN for too long, " +
                 "we don't know where region was opened so can't do anything");
+                synchronized(regionState) {
+                  regionState.update(regionState.getState());
+                }
                 break;
+
               case PENDING_CLOSE:
                 LOG.info("Region has been PENDING_CLOSE for too " +
                     "long, running forced unassign again on region=" +

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=1126871&r1=1126870&r2=1126871&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 Tue May
24 05:14:52 2011
@@ -805,8 +805,12 @@ implements HMasterInterface, HMasterRegi
     }
 
     // 5. Trigger immediate assignment of the regions in round-robin fashion
-    List<HServerInfo> servers = serverManager.getOnlineServersList();
-    this.assignmentManager.bulkAssignUserRegions(newRegions, servers, sync);
+    if (newRegions.length == 1) {
+      this.assignmentManager.assign(newRegions[0], true);
+    } else {
+      List<HServerInfo> servers = serverManager.getOnlineServersList();
+      this.assignmentManager.bulkAssignUserRegions(newRegions, servers, sync);
+    }
 
     // 6. If sync, wait for assignment of regions
     if (sync) {



Mime
View raw message