HBASE-2293 CME in RegionManager#isMetaServer

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@919708 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -225,6 +225,7 @@ Release 0.21.0 - Unreleased
                half-written hfile (Ruslan Salyakhov via Stack)
    HBASE-2281  Hbase shell does not work when started from the build dir
                (Alexey Kovyrin via Stack)
+   HBASE-2293  CME in RegionManager#isMetaServer
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java

@@ -330,7 +330,9 @@ public class RegionManager implements HConstants {
     String regionName = rs.getRegionInfo().getRegionNameAsString();
     LOG.info("Assigning region " + regionName + " to " + sinfo.getServerName());
     rs.setPendingOpen(sinfo.getServerName());
+    synchronized (this.regionsInTransition) {
       this.regionsInTransition.put(regionName, rs);
+    }
 
     returnMsgs.add(new HMsg(HMsg.Type.MSG_REGION_OPEN, rs.getRegionInfo()));
   }
@@ -378,9 +380,11 @@ public class RegionManager implements HConstants {
     Set<RegionState> regionsToAssign = new HashSet<RegionState>();
 
     boolean isMetaServer = isMetaServer(addr);
-
+    RegionState rootState = null;
     // Handle if root is unassigned... only assign root if root is offline.
-    RegionState rootState = regionsInTransition.get(HRegionInfo.ROOT_REGIONINFO.getRegionNameAsString());
+    synchronized (this.regionsInTransition) {
+      rootState = regionsInTransition.get(HRegionInfo.ROOT_REGIONINFO.getRegionNameAsString());
+    }
     if (rootState != null && rootState.isUnassigned()) {
       // make sure root isnt assigned here first.
       // if so return 'empty list'
@@ -400,8 +404,7 @@ public class RegionManager implements HConstants {
     if (reassigningMetas && isMetaOrRoot && !isSingleServer) {
       return regionsToAssign; // dont assign anything to this server.
     }
-
+    synchronized (this.regionsInTransition) {
-    synchronized(regionsInTransition) {
       for (RegionState s: regionsInTransition.values()) {
         HRegionInfo i = s.getRegionInfo();
         if (i == null) {
@@ -836,6 +839,7 @@ public class RegionManager implements HConstants {
    * @return true if server is transitioning the ROOT table
    */
   public boolean isRootServerCandidate(final String server) {
+    synchronized (this.regionsInTransition) {
       for (RegionState s : regionsInTransition.values()) {
         if (s.getRegionInfo().isRootRegion()
             && !s.isUnassigned()
@@ -845,6 +849,7 @@ public class RegionManager implements HConstants {
           return true;
         }
       }
+    }
     return false;
   }
 
@@ -855,6 +860,7 @@ public class RegionManager implements HConstants {
    * @return if this server was transitioning a META table then a not null HRegionInfo pointing to it
    */
   public HRegionInfo getMetaServerRegionInfo(final String server) {
+    synchronized (this.regionsInTransition) {
       for (RegionState s : regionsInTransition.values()) {
         if (s.getRegionInfo().isMetaRegion()
             && !s.isUnassigned()
@@ -864,6 +870,7 @@ public class RegionManager implements HConstants {
           return s.getRegionInfo();
         }
       }
+    }
     return null;
   }
 
@@ -910,26 +917,32 @@ public class RegionManager implements HConstants {
    * @param info
    */
   public void removeRegion(HRegionInfo info) {
+    synchronized (this.regionsInTransition) {
       this.regionsInTransition.remove(info.getRegionNameAsString());
     }
+  }
   
   /**
    * @param regionName
    * @return true if the named region is in a transition state
    */
   public boolean regionIsInTransition(String regionName) {
+    synchronized (this.regionsInTransition) {
       return regionsInTransition.containsKey(regionName);
     }
+  }
 
   /**
    * @param regionName
    * @return true if the region is unassigned, pendingOpen or open
    */
   public boolean regionIsOpening(String regionName) {
+    synchronized (this.regionsInTransition) {
       RegionState state = regionsInTransition.get(regionName);
       if (state != null) {
         return state.isOpening();
       }
+    }
     return false;
   }
 
@@ -939,17 +952,18 @@ public class RegionManager implements HConstants {
    * @param force if true mark region unassigned whatever its current state
    */
   public void setUnassigned(HRegionInfo info, boolean force) {
+    RegionState s = null;
     synchronized(this.regionsInTransition) {
-      RegionState s = regionsInTransition.get(info.getRegionNameAsString());
+      s = regionsInTransition.get(info.getRegionNameAsString());
       if (s == null) {
         s = new RegionState(info);
         regionsInTransition.put(info.getRegionNameAsString(), s);
       }
+    }
     if (force || (!s.isPendingOpen() || !s.isOpen())) {
       s.setUnassigned();
     }
   }
-  }
   
   /** 
    * Check if a region is on the unassigned list