http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1f2eeb22/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
index b49f000..a0b28cc 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html
@@ -1903,22 +1903,30 @@
 <span class="sourceLineNo">1895</span>        
.getRegionInfoForReplica(RegionInfoBuilder.FIRST_META_REGIONINFO,<a 
name="line.1895"></a>
 <span class="sourceLineNo">1896</span>            
RegionInfo.DEFAULT_REPLICA_ID);<a name="line.1896"></a>
 <span class="sourceLineNo">1897</span>    RegionState regionStateNode = 
getRegionStates().getRegionState(hri);<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>    if 
(!regionStateNode.getServerName().equals(serverName)) {<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      return;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span>    // meta has been assigned to crashed 
server.<a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    LOG.info("Meta assigned to crashed " 
+ serverName + "; reassigning...");<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    // Handle failure and wake event<a 
name="line.1903"></a>
-<span class="sourceLineNo">1904</span>    RegionTransitionProcedure rtp = 
getRegionStates().getRegionTransitionProcedure(hri);<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>    // Do not need to consider for 
REGION_TRANSITION_QUEUE step<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>    if (rtp != null &amp;&amp; 
rtp.isMeta() &amp;&amp;<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>        rtp.getTransitionState() == 
RegionTransitionState.REGION_TRANSITION_DISPATCH) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>      LOG.debug("Failing " + 
rtp.toString());<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      
rtp.remoteCallFailed(master.getMasterProcedureExecutor().getEnvironment(), 
serverName,<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>          new 
ServerCrashException(rtp.getProcId(), serverName));<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>    }<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>  }<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>}<a name="line.1913"></a>
+<span class="sourceLineNo">1898</span>    if (regionStateNode == null) {<a 
name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      LOG.warn("RegionStateNode is null 
for " + hri);<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      return;<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>    }<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    ServerName rsnServerName = 
regionStateNode.getServerName();<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span>    if (rsnServerName != null &amp;&amp; 
!rsnServerName.equals(serverName)) {<a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>      return;<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    } else if (rsnServerName == null) 
{<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      LOG.warn("Empty ServerName in 
RegionStateNode; proceeding anyways in case latched " +<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          "RecoverMetaProcedure so meta 
latch gets cleaned up.");<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>    }<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>    // meta has been assigned to crashed 
server.<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>    LOG.info("Meta assigned to crashed " 
+ serverName + "; reassigning...");<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>    // Handle failure and wake event<a 
name="line.1911"></a>
+<span class="sourceLineNo">1912</span>    RegionTransitionProcedure rtp = 
getRegionStates().getRegionTransitionProcedure(hri);<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>    // Do not need to consider for 
REGION_TRANSITION_QUEUE step<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>    if (rtp != null &amp;&amp; 
rtp.isMeta() &amp;&amp;<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>        rtp.getTransitionState() == 
RegionTransitionState.REGION_TRANSITION_DISPATCH) {<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      LOG.debug("Failing " + 
rtp.toString());<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>      
rtp.remoteCallFailed(master.getMasterProcedureExecutor().getEnvironment(), 
serverName,<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span>          new 
ServerCrashException(rtp.getProcId(), serverName));<a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    }<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1f2eeb22/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
index b49f000..a0b28cc 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html
@@ -1903,22 +1903,30 @@
 <span class="sourceLineNo">1895</span>        
.getRegionInfoForReplica(RegionInfoBuilder.FIRST_META_REGIONINFO,<a 
name="line.1895"></a>
 <span class="sourceLineNo">1896</span>            
RegionInfo.DEFAULT_REPLICA_ID);<a name="line.1896"></a>
 <span class="sourceLineNo">1897</span>    RegionState regionStateNode = 
getRegionStates().getRegionState(hri);<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>    if 
(!regionStateNode.getServerName().equals(serverName)) {<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      return;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span>    // meta has been assigned to crashed 
server.<a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    LOG.info("Meta assigned to crashed " 
+ serverName + "; reassigning...");<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    // Handle failure and wake event<a 
name="line.1903"></a>
-<span class="sourceLineNo">1904</span>    RegionTransitionProcedure rtp = 
getRegionStates().getRegionTransitionProcedure(hri);<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>    // Do not need to consider for 
REGION_TRANSITION_QUEUE step<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>    if (rtp != null &amp;&amp; 
rtp.isMeta() &amp;&amp;<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>        rtp.getTransitionState() == 
RegionTransitionState.REGION_TRANSITION_DISPATCH) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>      LOG.debug("Failing " + 
rtp.toString());<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      
rtp.remoteCallFailed(master.getMasterProcedureExecutor().getEnvironment(), 
serverName,<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>          new 
ServerCrashException(rtp.getProcId(), serverName));<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>    }<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>  }<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>}<a name="line.1913"></a>
+<span class="sourceLineNo">1898</span>    if (regionStateNode == null) {<a 
name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      LOG.warn("RegionStateNode is null 
for " + hri);<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      return;<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>    }<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    ServerName rsnServerName = 
regionStateNode.getServerName();<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span>    if (rsnServerName != null &amp;&amp; 
!rsnServerName.equals(serverName)) {<a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>      return;<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    } else if (rsnServerName == null) 
{<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      LOG.warn("Empty ServerName in 
RegionStateNode; proceeding anyways in case latched " +<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          "RecoverMetaProcedure so meta 
latch gets cleaned up.");<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>    }<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>    // meta has been assigned to crashed 
server.<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>    LOG.info("Meta assigned to crashed " 
+ serverName + "; reassigning...");<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>    // Handle failure and wake event<a 
name="line.1911"></a>
+<span class="sourceLineNo">1912</span>    RegionTransitionProcedure rtp = 
getRegionStates().getRegionTransitionProcedure(hri);<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>    // Do not need to consider for 
REGION_TRANSITION_QUEUE step<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>    if (rtp != null &amp;&amp; 
rtp.isMeta() &amp;&amp;<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>        rtp.getTransitionState() == 
RegionTransitionState.REGION_TRANSITION_DISPATCH) {<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      LOG.debug("Failing " + 
rtp.toString());<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>      
rtp.remoteCallFailed(master.getMasterProcedureExecutor().getEnvironment(), 
serverName,<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span>          new 
ServerCrashException(rtp.getProcId(), serverName));<a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    }<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1f2eeb22/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
index b49f000..a0b28cc 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html
@@ -1903,22 +1903,30 @@
 <span class="sourceLineNo">1895</span>        
.getRegionInfoForReplica(RegionInfoBuilder.FIRST_META_REGIONINFO,<a 
name="line.1895"></a>
 <span class="sourceLineNo">1896</span>            
RegionInfo.DEFAULT_REPLICA_ID);<a name="line.1896"></a>
 <span class="sourceLineNo">1897</span>    RegionState regionStateNode = 
getRegionStates().getRegionState(hri);<a name="line.1897"></a>
-<span class="sourceLineNo">1898</span>    if 
(!regionStateNode.getServerName().equals(serverName)) {<a name="line.1898"></a>
-<span class="sourceLineNo">1899</span>      return;<a name="line.1899"></a>
-<span class="sourceLineNo">1900</span>    }<a name="line.1900"></a>
-<span class="sourceLineNo">1901</span>    // meta has been assigned to crashed 
server.<a name="line.1901"></a>
-<span class="sourceLineNo">1902</span>    LOG.info("Meta assigned to crashed " 
+ serverName + "; reassigning...");<a name="line.1902"></a>
-<span class="sourceLineNo">1903</span>    // Handle failure and wake event<a 
name="line.1903"></a>
-<span class="sourceLineNo">1904</span>    RegionTransitionProcedure rtp = 
getRegionStates().getRegionTransitionProcedure(hri);<a name="line.1904"></a>
-<span class="sourceLineNo">1905</span>    // Do not need to consider for 
REGION_TRANSITION_QUEUE step<a name="line.1905"></a>
-<span class="sourceLineNo">1906</span>    if (rtp != null &amp;&amp; 
rtp.isMeta() &amp;&amp;<a name="line.1906"></a>
-<span class="sourceLineNo">1907</span>        rtp.getTransitionState() == 
RegionTransitionState.REGION_TRANSITION_DISPATCH) {<a name="line.1907"></a>
-<span class="sourceLineNo">1908</span>      LOG.debug("Failing " + 
rtp.toString());<a name="line.1908"></a>
-<span class="sourceLineNo">1909</span>      
rtp.remoteCallFailed(master.getMasterProcedureExecutor().getEnvironment(), 
serverName,<a name="line.1909"></a>
-<span class="sourceLineNo">1910</span>          new 
ServerCrashException(rtp.getProcId(), serverName));<a name="line.1910"></a>
-<span class="sourceLineNo">1911</span>    }<a name="line.1911"></a>
-<span class="sourceLineNo">1912</span>  }<a name="line.1912"></a>
-<span class="sourceLineNo">1913</span>}<a name="line.1913"></a>
+<span class="sourceLineNo">1898</span>    if (regionStateNode == null) {<a 
name="line.1898"></a>
+<span class="sourceLineNo">1899</span>      LOG.warn("RegionStateNode is null 
for " + hri);<a name="line.1899"></a>
+<span class="sourceLineNo">1900</span>      return;<a name="line.1900"></a>
+<span class="sourceLineNo">1901</span>    }<a name="line.1901"></a>
+<span class="sourceLineNo">1902</span>    ServerName rsnServerName = 
regionStateNode.getServerName();<a name="line.1902"></a>
+<span class="sourceLineNo">1903</span>    if (rsnServerName != null &amp;&amp; 
!rsnServerName.equals(serverName)) {<a name="line.1903"></a>
+<span class="sourceLineNo">1904</span>      return;<a name="line.1904"></a>
+<span class="sourceLineNo">1905</span>    } else if (rsnServerName == null) 
{<a name="line.1905"></a>
+<span class="sourceLineNo">1906</span>      LOG.warn("Empty ServerName in 
RegionStateNode; proceeding anyways in case latched " +<a name="line.1906"></a>
+<span class="sourceLineNo">1907</span>          "RecoverMetaProcedure so meta 
latch gets cleaned up.");<a name="line.1907"></a>
+<span class="sourceLineNo">1908</span>    }<a name="line.1908"></a>
+<span class="sourceLineNo">1909</span>    // meta has been assigned to crashed 
server.<a name="line.1909"></a>
+<span class="sourceLineNo">1910</span>    LOG.info("Meta assigned to crashed " 
+ serverName + "; reassigning...");<a name="line.1910"></a>
+<span class="sourceLineNo">1911</span>    // Handle failure and wake event<a 
name="line.1911"></a>
+<span class="sourceLineNo">1912</span>    RegionTransitionProcedure rtp = 
getRegionStates().getRegionTransitionProcedure(hri);<a name="line.1912"></a>
+<span class="sourceLineNo">1913</span>    // Do not need to consider for 
REGION_TRANSITION_QUEUE step<a name="line.1913"></a>
+<span class="sourceLineNo">1914</span>    if (rtp != null &amp;&amp; 
rtp.isMeta() &amp;&amp;<a name="line.1914"></a>
+<span class="sourceLineNo">1915</span>        rtp.getTransitionState() == 
RegionTransitionState.REGION_TRANSITION_DISPATCH) {<a name="line.1915"></a>
+<span class="sourceLineNo">1916</span>      LOG.debug("Failing " + 
rtp.toString());<a name="line.1916"></a>
+<span class="sourceLineNo">1917</span>      
rtp.remoteCallFailed(master.getMasterProcedureExecutor().getEnvironment(), 
serverName,<a name="line.1917"></a>
+<span class="sourceLineNo">1918</span>          new 
ServerCrashException(rtp.getProcId(), serverName));<a name="line.1918"></a>
+<span class="sourceLineNo">1919</span>    }<a name="line.1919"></a>
+<span class="sourceLineNo">1920</span>  }<a name="line.1920"></a>
+<span class="sourceLineNo">1921</span>}<a name="line.1921"></a>
 
 
 

Reply via email to