http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7c8351c/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateStampComparator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateStampComparator.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateStampComparator.html
index ac01a35..5f41fe7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateStampComparator.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStates.RegionStateStampComparator.html
@@ -511,643 +511,649 @@
 <span class="sourceLineNo">503</span><a name="line.503"></a>
 <span class="sourceLineNo">504</span>  public void deleteRegion(final 
RegionInfo regionInfo) {<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    
regionsMap.remove(regionInfo.getRegionName());<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    // Remove from the offline regions 
map too if there.<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    if 
(this.regionOffline.containsKey(regionInfo)) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      if (LOG.isTraceEnabled()) 
LOG.trace("Removing from regionOffline Map: " + regionInfo);<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span>      
this.regionOffline.remove(regionInfo);<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    }<a name="line.510"></a>
-<span class="sourceLineNo">511</span>  }<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>  ArrayList&lt;RegionStateNode&gt; 
getTableRegionStateNodes(final TableName tableName) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    final 
ArrayList&lt;RegionStateNode&gt; regions = new 
ArrayList&lt;RegionStateNode&gt;();<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    for (RegionStateNode node: 
regionsMap.tailMap(tableName.getName()).values()) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      if 
(!node.getTable().equals(tableName)) break;<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      regions.add(node);<a 
name="line.517"></a>
-<span class="sourceLineNo">518</span>    }<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    return regions;<a name="line.519"></a>
-<span class="sourceLineNo">520</span>  }<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span>  ArrayList&lt;RegionState&gt; 
getTableRegionStates(final TableName tableName) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    final ArrayList&lt;RegionState&gt; 
regions = new ArrayList&lt;RegionState&gt;();<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    for (RegionStateNode node: 
regionsMap.tailMap(tableName.getName()).values()) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      if 
(!node.getTable().equals(tableName)) break;<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      
regions.add(node.toRegionState());<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    }<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    return regions;<a name="line.528"></a>
-<span class="sourceLineNo">529</span>  }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span>  ArrayList&lt;RegionInfo&gt; 
getTableRegionsInfo(final TableName tableName) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    final ArrayList&lt;RegionInfo&gt; 
regions = new ArrayList&lt;RegionInfo&gt;();<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    for (RegionStateNode node: 
regionsMap.tailMap(tableName.getName()).values()) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      if 
(!node.getTable().equals(tableName)) break;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      
regions.add(node.getRegionInfo());<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    return regions;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>  }<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span>  Collection&lt;RegionStateNode&gt; 
getRegionStateNodes() {<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    return regionsMap.values();<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>  }<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>  public ArrayList&lt;RegionState&gt; 
getRegionStates() {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    final ArrayList&lt;RegionState&gt; 
regions = new ArrayList&lt;RegionState&gt;(regionsMap.size());<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      
regions.add(node.toRegionState());<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    return regions;<a name="line.549"></a>
-<span class="sourceLineNo">550</span>  }<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>  // 
==========================================================================<a 
name="line.552"></a>
-<span class="sourceLineNo">553</span>  //  RegionState helpers<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>  // 
==========================================================================<a 
name="line.554"></a>
-<span class="sourceLineNo">555</span>  public RegionState getRegionState(final 
RegionInfo regionInfo) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    RegionStateNode regionStateNode = 
getRegionStateNode(regionInfo);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    return regionStateNode == null ? null 
: regionStateNode.toRegionState();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>  }<a name="line.558"></a>
-<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span>  public RegionState getRegionState(final 
String encodedRegionName) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    // TODO: Need a map &lt;encodedName, 
...&gt; but it is just dispatch merge...<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      if 
(node.getRegionInfo().getEncodedName().equals(encodedRegionName)) {<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>        return node.toRegionState();<a 
name="line.564"></a>
-<span class="sourceLineNo">565</span>      }<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    }<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    return null;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>  }<a name="line.568"></a>
-<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span>  // 
============================================================================================<a
 name="line.570"></a>
-<span class="sourceLineNo">571</span>  //  TODO: helpers<a name="line.571"></a>
-<span class="sourceLineNo">572</span>  // 
============================================================================================<a
 name="line.572"></a>
-<span class="sourceLineNo">573</span>  public boolean 
hasTableRegionStates(final TableName tableName) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    // TODO<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    return 
!getTableRegionStates(tableName).isEmpty();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>  }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span>  /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span>   * @return Return online regions of 
table; does not include OFFLINE or SPLITTING regions.<a name="line.579"></a>
-<span class="sourceLineNo">580</span>   */<a name="line.580"></a>
-<span class="sourceLineNo">581</span>  public List&lt;RegionInfo&gt; 
getRegionsOfTable(final TableName table) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    return getRegionsOfTable(table, 
false);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  private HRegionLocation 
createRegionForReopen(RegionStateNode node) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    synchronized (node) {<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>      if (!include(node, false)) {<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>        return null;<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>      }<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      if (node.isInState(State.OPEN)) {<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>        return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(),<a 
name="line.591"></a>
-<span class="sourceLineNo">592</span>          node.getOpenSeqNum());<a 
name="line.592"></a>
-<span class="sourceLineNo">593</span>      } else if 
(node.isInState(State.OPENING)) {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(), -1);<a 
name="line.594"></a>
-<span class="sourceLineNo">595</span>      } else {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>        return null;<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>      }<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span>  }<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>  /**<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * Get the regions to be reopened when 
modifying a table.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   * &lt;p/&gt;<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   * Notice that the {@code openSeqNum} 
in the returned HRegionLocation is also used to indicate the<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span>   * state of this region, positive means 
the region is in {@link State#OPEN}, -1 means<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   * {@link State#OPENING}. And for 
regions in other states we do not need reopen them.<a name="line.606"></a>
-<span class="sourceLineNo">607</span>   */<a name="line.607"></a>
-<span class="sourceLineNo">608</span>  public List&lt;HRegionLocation&gt; 
getRegionsOfTableForReopen(TableName tableName) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    return 
getTableRegionStateNodes(tableName).stream().map(this::createRegionForReopen)<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>      .filter(r -&gt; r != 
null).collect(Collectors.toList());<a name="line.610"></a>
-<span class="sourceLineNo">611</span>  }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>  /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span>   * Check whether the region has been 
reopened. The meaning of the {@link HRegionLocation} is the<a 
name="line.614"></a>
-<span class="sourceLineNo">615</span>   * same with {@link 
#getRegionsOfTableForReopen(TableName)}.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>   * &lt;p/&gt;<a name="line.616"></a>
-<span class="sourceLineNo">617</span>   * For a region which is in {@link 
State#OPEN} before, if the region state is changed or the open<a 
name="line.617"></a>
-<span class="sourceLineNo">618</span>   * seq num is changed, we can confirm 
that it has been reopened.<a name="line.618"></a>
-<span class="sourceLineNo">619</span>   * &lt;p/&gt;<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   * For a region which is in {@link 
State#OPENING} before, usually it will be in {@link State#OPEN}<a 
name="line.620"></a>
-<span class="sourceLineNo">621</span>   * now and we will schedule a MRP to 
reopen it. But there are several exceptions:<a name="line.621"></a>
-<span class="sourceLineNo">622</span>   * &lt;ul&gt;<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   * &lt;li&gt;The region is in state 
other than {@link State#OPEN} or {@link State#OPENING}.&lt;/li&gt;<a 
name="line.623"></a>
-<span class="sourceLineNo">624</span>   * &lt;li&gt;The location of the region 
has been changed&lt;/li&gt;<a name="line.624"></a>
-<span class="sourceLineNo">625</span>   * &lt;/ul&gt;<a name="line.625"></a>
-<span class="sourceLineNo">626</span>   * Of course the region could still be 
in {@link State#OPENING} state and still on the same<a name="line.626"></a>
-<span class="sourceLineNo">627</span>   * server, then here we will still 
return a {@link HRegionLocation} for it, just like<a name="line.627"></a>
-<span class="sourceLineNo">628</span>   * {@link 
#getRegionsOfTableForReopen(TableName)}.<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   * @param oldLoc the previous 
state/location of this region<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * @return null if the region has been 
reopened, otherwise a new {@link HRegionLocation} which<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   *         means we still need to 
reopen the region.<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @see 
#getRegionsOfTableForReopen(TableName)<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  public HRegionLocation 
checkReopened(HRegionLocation oldLoc) {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    RegionStateNode node = 
getRegionStateNode(oldLoc.getRegion());<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    synchronized (node) {<a 
name="line.636"></a>
-<span class="sourceLineNo">637</span>      if (oldLoc.getSeqNum() &gt;= 0) {<a 
name="line.637"></a>
-<span class="sourceLineNo">638</span>        // in OPEN state before<a 
name="line.638"></a>
-<span class="sourceLineNo">639</span>        if (node.isInState(State.OPEN)) 
{<a name="line.639"></a>
-<span class="sourceLineNo">640</span>          if (node.getOpenSeqNum() &gt; 
oldLoc.getSeqNum()) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            // normal case, the region 
has been reopened<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            return null;<a 
name="line.642"></a>
-<span class="sourceLineNo">643</span>          } else {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>            // the open seq num does not 
change, need to reopen again<a name="line.644"></a>
-<span class="sourceLineNo">645</span>            return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(),<a 
name="line.645"></a>
-<span class="sourceLineNo">646</span>              node.getOpenSeqNum());<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span>          }<a name="line.647"></a>
-<span class="sourceLineNo">648</span>        } else {<a name="line.648"></a>
-<span class="sourceLineNo">649</span>          // the state has been changed 
so we can make sure that the region has been reopened(not<a name="line.649"></a>
-<span class="sourceLineNo">650</span>          // finished maybe, but not a 
problem).<a name="line.650"></a>
-<span class="sourceLineNo">651</span>          return null;<a 
name="line.651"></a>
-<span class="sourceLineNo">652</span>        }<a name="line.652"></a>
-<span class="sourceLineNo">653</span>      } else {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>        // in OPENING state before<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>        if (!node.isInState(State.OPEN, 
State.OPENING)) {<a name="line.655"></a>
-<span class="sourceLineNo">656</span>          // not in OPEN or OPENING 
state, then we can make sure that the region has been<a name="line.656"></a>
-<span class="sourceLineNo">657</span>          // reopened(not finished maybe, 
but not a problem)<a name="line.657"></a>
-<span class="sourceLineNo">658</span>          return null;<a 
name="line.658"></a>
-<span class="sourceLineNo">659</span>        } else {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          if 
(!node.getRegionLocation().equals(oldLoc.getServerName())) {<a 
name="line.660"></a>
-<span class="sourceLineNo">661</span>            // the region has been moved, 
so we can make sure that the region has been reopened.<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            return null;<a 
name="line.662"></a>
-<span class="sourceLineNo">663</span>          }<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          // normal case, we are still in 
OPENING state, or the reopen has been opened and the state<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>          // is changed to OPEN.<a 
name="line.665"></a>
-<span class="sourceLineNo">666</span>          long openSeqNum = 
node.isInState(State.OPEN) ? node.getOpenSeqNum() : -1;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>          return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(), openSeqNum);<a 
name="line.667"></a>
-<span class="sourceLineNo">668</span>        }<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      }<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
-<span class="sourceLineNo">671</span>  }<a name="line.671"></a>
-<span class="sourceLineNo">672</span><a name="line.672"></a>
-<span class="sourceLineNo">673</span>  /**<a name="line.673"></a>
-<span class="sourceLineNo">674</span>   * @return Return online regions of 
table; does not include OFFLINE or SPLITTING regions.<a name="line.674"></a>
-<span class="sourceLineNo">675</span>   */<a name="line.675"></a>
-<span class="sourceLineNo">676</span>  public List&lt;RegionInfo&gt; 
getRegionsOfTable(TableName table, boolean offline) {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    return getRegionsOfTable(table, state 
-&gt; include(state, offline));<a name="line.677"></a>
-<span class="sourceLineNo">678</span>  }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>  /**<a name="line.680"></a>
-<span class="sourceLineNo">681</span>   * @return Return the regions of the 
table; does not include OFFLINE unless you set<a name="line.681"></a>
-<span class="sourceLineNo">682</span>   *         
&lt;code&gt;offline&lt;/code&gt; to true. Does not include regions that are in 
the<a name="line.682"></a>
-<span class="sourceLineNo">683</span>   *         {@link State#SPLIT} state.<a 
name="line.683"></a>
-<span class="sourceLineNo">684</span>   */<a name="line.684"></a>
-<span class="sourceLineNo">685</span>  private List&lt;RegionInfo&gt; 
getRegionsOfTable(TableName table, Predicate&lt;RegionStateNode&gt; filter) {<a 
name="line.685"></a>
-<span class="sourceLineNo">686</span>    return 
getTableRegionStateNodes(table).stream().filter(filter).map(n -&gt; 
n.getRegionInfo())<a name="line.686"></a>
-<span class="sourceLineNo">687</span>      .collect(Collectors.toList());<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>  }<a name="line.688"></a>
-<span class="sourceLineNo">689</span><a name="line.689"></a>
-<span class="sourceLineNo">690</span>  /**<a name="line.690"></a>
-<span class="sourceLineNo">691</span>   * Utility. Whether to include region 
in list of regions. Default is to<a name="line.691"></a>
-<span class="sourceLineNo">692</span>   * weed out split and offline 
regions.<a name="line.692"></a>
-<span class="sourceLineNo">693</span>   * @return True if we should include 
the &lt;code&gt;node&lt;/code&gt; (do not include<a name="line.693"></a>
-<span class="sourceLineNo">694</span>   * if split or offline unless 
&lt;code&gt;offline&lt;/code&gt; is set to true.<a name="line.694"></a>
-<span class="sourceLineNo">695</span>   */<a name="line.695"></a>
-<span class="sourceLineNo">696</span>  boolean include(final RegionStateNode 
node, final boolean offline) {<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    if (LOG.isTraceEnabled()) {<a 
name="line.697"></a>
-<span class="sourceLineNo">698</span>      LOG.trace("WORKING ON " + node + " 
" + node.getRegionInfo());<a name="line.698"></a>
-<span class="sourceLineNo">699</span>    }<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    if (node.isInState(State.SPLIT)) 
return false;<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    if (node.isInState(State.OFFLINE) 
&amp;&amp; !offline) return false;<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    final RegionInfo hri = 
node.getRegionInfo();<a name="line.702"></a>
-<span class="sourceLineNo">703</span>    return (!hri.isOffline() &amp;&amp; 
!hri.isSplit()) ||<a name="line.703"></a>
-<span class="sourceLineNo">704</span>        ((hri.isOffline() || 
hri.isSplit()) &amp;&amp; offline);<a name="line.704"></a>
-<span class="sourceLineNo">705</span>  }<a name="line.705"></a>
-<span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>  /**<a name="line.707"></a>
-<span class="sourceLineNo">708</span>   * Returns the set of regions hosted by 
the specified server<a name="line.708"></a>
-<span class="sourceLineNo">709</span>   * @param serverName the server we are 
interested in<a name="line.709"></a>
-<span class="sourceLineNo">710</span>   * @return set of RegionInfo hosted by 
the specified server<a name="line.710"></a>
-<span class="sourceLineNo">711</span>   */<a name="line.711"></a>
-<span class="sourceLineNo">712</span>  public List&lt;RegionInfo&gt; 
getServerRegionInfoSet(final ServerName serverName) {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>    final ServerStateNode serverInfo = 
getServerNode(serverName);<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    if (serverInfo == null) return 
Collections.emptyList();<a name="line.714"></a>
-<span class="sourceLineNo">715</span><a name="line.715"></a>
-<span class="sourceLineNo">716</span>    synchronized (serverInfo) {<a 
name="line.716"></a>
-<span class="sourceLineNo">717</span>      return 
serverInfo.getRegionInfoList();<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    }<a name="line.718"></a>
-<span class="sourceLineNo">719</span>  }<a name="line.719"></a>
-<span class="sourceLineNo">720</span><a name="line.720"></a>
-<span class="sourceLineNo">721</span>  // 
============================================================================================<a
 name="line.721"></a>
-<span class="sourceLineNo">722</span>  // Split helpers<a name="line.722"></a>
-<span class="sourceLineNo">723</span>  // These methods will only be called in 
ServerCrashProcedure, and at the end of SCP we will remove<a 
name="line.723"></a>
-<span class="sourceLineNo">724</span>  // the ServerStateNode by calling 
removeServer.<a name="line.724"></a>
-<span class="sourceLineNo">725</span>  // 
============================================================================================<a
 name="line.725"></a>
+<span class="sourceLineNo">506</span>    // See HBASE-20860<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span>    // After master restarts, merged 
regions' RIT state may not be cleaned,<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    // making sure they are cleaned 
here<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    if 
(regionInTransition.containsKey(regionInfo)) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      
regionInTransition.remove(regionInfo);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    }<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    // Remove from the offline regions 
map too if there.<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    if 
(this.regionOffline.containsKey(regionInfo)) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>      if (LOG.isTraceEnabled()) 
LOG.trace("Removing from regionOffline Map: " + regionInfo);<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>      
this.regionOffline.remove(regionInfo);<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
+<span class="sourceLineNo">517</span>  }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>  ArrayList&lt;RegionStateNode&gt; 
getTableRegionStateNodes(final TableName tableName) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    final 
ArrayList&lt;RegionStateNode&gt; regions = new 
ArrayList&lt;RegionStateNode&gt;();<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    for (RegionStateNode node: 
regionsMap.tailMap(tableName.getName()).values()) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>      if 
(!node.getTable().equals(tableName)) break;<a name="line.522"></a>
+<span class="sourceLineNo">523</span>      regions.add(node);<a 
name="line.523"></a>
+<span class="sourceLineNo">524</span>    }<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    return regions;<a name="line.525"></a>
+<span class="sourceLineNo">526</span>  }<a name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span>  ArrayList&lt;RegionState&gt; 
getTableRegionStates(final TableName tableName) {<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    final ArrayList&lt;RegionState&gt; 
regions = new ArrayList&lt;RegionState&gt;();<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    for (RegionStateNode node: 
regionsMap.tailMap(tableName.getName()).values()) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      if 
(!node.getTable().equals(tableName)) break;<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      
regions.add(node.toRegionState());<a name="line.532"></a>
+<span class="sourceLineNo">533</span>    }<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    return regions;<a name="line.534"></a>
+<span class="sourceLineNo">535</span>  }<a name="line.535"></a>
+<span class="sourceLineNo">536</span><a name="line.536"></a>
+<span class="sourceLineNo">537</span>  ArrayList&lt;RegionInfo&gt; 
getTableRegionsInfo(final TableName tableName) {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    final ArrayList&lt;RegionInfo&gt; 
regions = new ArrayList&lt;RegionInfo&gt;();<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    for (RegionStateNode node: 
regionsMap.tailMap(tableName.getName()).values()) {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      if 
(!node.getTable().equals(tableName)) break;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>      
regions.add(node.getRegionInfo());<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    }<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    return regions;<a name="line.543"></a>
+<span class="sourceLineNo">544</span>  }<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>  Collection&lt;RegionStateNode&gt; 
getRegionStateNodes() {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    return regionsMap.values();<a 
name="line.547"></a>
+<span class="sourceLineNo">548</span>  }<a name="line.548"></a>
+<span class="sourceLineNo">549</span><a name="line.549"></a>
+<span class="sourceLineNo">550</span>  public ArrayList&lt;RegionState&gt; 
getRegionStates() {<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    final ArrayList&lt;RegionState&gt; 
regions = new ArrayList&lt;RegionState&gt;(regionsMap.size());<a 
name="line.551"></a>
+<span class="sourceLineNo">552</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.552"></a>
+<span class="sourceLineNo">553</span>      
regions.add(node.toRegionState());<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    }<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    return regions;<a name="line.555"></a>
+<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
+<span class="sourceLineNo">557</span><a name="line.557"></a>
+<span class="sourceLineNo">558</span>  // 
==========================================================================<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>  //  RegionState helpers<a 
name="line.559"></a>
+<span class="sourceLineNo">560</span>  // 
==========================================================================<a 
name="line.560"></a>
+<span class="sourceLineNo">561</span>  public RegionState getRegionState(final 
RegionInfo regionInfo) {<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    RegionStateNode regionStateNode = 
getRegionStateNode(regionInfo);<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    return regionStateNode == null ? null 
: regionStateNode.toRegionState();<a name="line.563"></a>
+<span class="sourceLineNo">564</span>  }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span>  public RegionState getRegionState(final 
String encodedRegionName) {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    // TODO: Need a map &lt;encodedName, 
...&gt; but it is just dispatch merge...<a name="line.567"></a>
+<span class="sourceLineNo">568</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      if 
(node.getRegionInfo().getEncodedName().equals(encodedRegionName)) {<a 
name="line.569"></a>
+<span class="sourceLineNo">570</span>        return node.toRegionState();<a 
name="line.570"></a>
+<span class="sourceLineNo">571</span>      }<a name="line.571"></a>
+<span class="sourceLineNo">572</span>    }<a name="line.572"></a>
+<span class="sourceLineNo">573</span>    return null;<a name="line.573"></a>
+<span class="sourceLineNo">574</span>  }<a name="line.574"></a>
+<span class="sourceLineNo">575</span><a name="line.575"></a>
+<span class="sourceLineNo">576</span>  // 
============================================================================================<a
 name="line.576"></a>
+<span class="sourceLineNo">577</span>  //  TODO: helpers<a name="line.577"></a>
+<span class="sourceLineNo">578</span>  // 
============================================================================================<a
 name="line.578"></a>
+<span class="sourceLineNo">579</span>  public boolean 
hasTableRegionStates(final TableName tableName) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>    // TODO<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    return 
!getTableRegionStates(tableName).isEmpty();<a name="line.581"></a>
+<span class="sourceLineNo">582</span>  }<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span>  /**<a name="line.584"></a>
+<span class="sourceLineNo">585</span>   * @return Return online regions of 
table; does not include OFFLINE or SPLITTING regions.<a name="line.585"></a>
+<span class="sourceLineNo">586</span>   */<a name="line.586"></a>
+<span class="sourceLineNo">587</span>  public List&lt;RegionInfo&gt; 
getRegionsOfTable(final TableName table) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    return getRegionsOfTable(table, 
false);<a name="line.588"></a>
+<span class="sourceLineNo">589</span>  }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>  private HRegionLocation 
createRegionForReopen(RegionStateNode node) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    synchronized (node) {<a 
name="line.592"></a>
+<span class="sourceLineNo">593</span>      if (!include(node, false)) {<a 
name="line.593"></a>
+<span class="sourceLineNo">594</span>        return null;<a 
name="line.594"></a>
+<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      if (node.isInState(State.OPEN)) {<a 
name="line.596"></a>
+<span class="sourceLineNo">597</span>        return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(),<a 
name="line.597"></a>
+<span class="sourceLineNo">598</span>          node.getOpenSeqNum());<a 
name="line.598"></a>
+<span class="sourceLineNo">599</span>      } else if 
(node.isInState(State.OPENING)) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span>        return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(), -1);<a 
name="line.600"></a>
+<span class="sourceLineNo">601</span>      } else {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>        return null;<a 
name="line.602"></a>
+<span class="sourceLineNo">603</span>      }<a name="line.603"></a>
+<span class="sourceLineNo">604</span>    }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>  }<a name="line.605"></a>
+<span class="sourceLineNo">606</span><a name="line.606"></a>
+<span class="sourceLineNo">607</span>  /**<a name="line.607"></a>
+<span class="sourceLineNo">608</span>   * Get the regions to be reopened when 
modifying a table.<a name="line.608"></a>
+<span class="sourceLineNo">609</span>   * &lt;p/&gt;<a name="line.609"></a>
+<span class="sourceLineNo">610</span>   * Notice that the {@code openSeqNum} 
in the returned HRegionLocation is also used to indicate the<a 
name="line.610"></a>
+<span class="sourceLineNo">611</span>   * state of this region, positive means 
the region is in {@link State#OPEN}, -1 means<a name="line.611"></a>
+<span class="sourceLineNo">612</span>   * {@link State#OPENING}. And for 
regions in other states we do not need reopen them.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>   */<a name="line.613"></a>
+<span class="sourceLineNo">614</span>  public List&lt;HRegionLocation&gt; 
getRegionsOfTableForReopen(TableName tableName) {<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    return 
getTableRegionStateNodes(tableName).stream().map(this::createRegionForReopen)<a 
name="line.615"></a>
+<span class="sourceLineNo">616</span>      .filter(r -&gt; r != 
null).collect(Collectors.toList());<a name="line.616"></a>
+<span class="sourceLineNo">617</span>  }<a name="line.617"></a>
+<span class="sourceLineNo">618</span><a name="line.618"></a>
+<span class="sourceLineNo">619</span>  /**<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   * Check whether the region has been 
reopened. The meaning of the {@link HRegionLocation} is the<a 
name="line.620"></a>
+<span class="sourceLineNo">621</span>   * same with {@link 
#getRegionsOfTableForReopen(TableName)}.<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * &lt;p/&gt;<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   * For a region which is in {@link 
State#OPEN} before, if the region state is changed or the open<a 
name="line.623"></a>
+<span class="sourceLineNo">624</span>   * seq num is changed, we can confirm 
that it has been reopened.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   * &lt;p/&gt;<a name="line.625"></a>
+<span class="sourceLineNo">626</span>   * For a region which is in {@link 
State#OPENING} before, usually it will be in {@link State#OPEN}<a 
name="line.626"></a>
+<span class="sourceLineNo">627</span>   * now and we will schedule a MRP to 
reopen it. But there are several exceptions:<a name="line.627"></a>
+<span class="sourceLineNo">628</span>   * &lt;ul&gt;<a name="line.628"></a>
+<span class="sourceLineNo">629</span>   * &lt;li&gt;The region is in state 
other than {@link State#OPEN} or {@link State#OPENING}.&lt;/li&gt;<a 
name="line.629"></a>
+<span class="sourceLineNo">630</span>   * &lt;li&gt;The location of the region 
has been changed&lt;/li&gt;<a name="line.630"></a>
+<span class="sourceLineNo">631</span>   * &lt;/ul&gt;<a name="line.631"></a>
+<span class="sourceLineNo">632</span>   * Of course the region could still be 
in {@link State#OPENING} state and still on the same<a name="line.632"></a>
+<span class="sourceLineNo">633</span>   * server, then here we will still 
return a {@link HRegionLocation} for it, just like<a name="line.633"></a>
+<span class="sourceLineNo">634</span>   * {@link 
#getRegionsOfTableForReopen(TableName)}.<a name="line.634"></a>
+<span class="sourceLineNo">635</span>   * @param oldLoc the previous 
state/location of this region<a name="line.635"></a>
+<span class="sourceLineNo">636</span>   * @return null if the region has been 
reopened, otherwise a new {@link HRegionLocation} which<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   *         means we still need to 
reopen the region.<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   * @see 
#getRegionsOfTableForReopen(TableName)<a name="line.638"></a>
+<span class="sourceLineNo">639</span>   */<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  public HRegionLocation 
checkReopened(HRegionLocation oldLoc) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span>    RegionStateNode node = 
getRegionStateNode(oldLoc.getRegion());<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    synchronized (node) {<a 
name="line.642"></a>
+<span class="sourceLineNo">643</span>      if (oldLoc.getSeqNum() &gt;= 0) {<a 
name="line.643"></a>
+<span class="sourceLineNo">644</span>        // in OPEN state before<a 
name="line.644"></a>
+<span class="sourceLineNo">645</span>        if (node.isInState(State.OPEN)) 
{<a name="line.645"></a>
+<span class="sourceLineNo">646</span>          if (node.getOpenSeqNum() &gt; 
oldLoc.getSeqNum()) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>            // normal case, the region 
has been reopened<a name="line.647"></a>
+<span class="sourceLineNo">648</span>            return null;<a 
name="line.648"></a>
+<span class="sourceLineNo">649</span>          } else {<a name="line.649"></a>
+<span class="sourceLineNo">650</span>            // the open seq num does not 
change, need to reopen again<a name="line.650"></a>
+<span class="sourceLineNo">651</span>            return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(),<a 
name="line.651"></a>
+<span class="sourceLineNo">652</span>              node.getOpenSeqNum());<a 
name="line.652"></a>
+<span class="sourceLineNo">653</span>          }<a name="line.653"></a>
+<span class="sourceLineNo">654</span>        } else {<a name="line.654"></a>
+<span class="sourceLineNo">655</span>          // the state has been changed 
so we can make sure that the region has been reopened(not<a name="line.655"></a>
+<span class="sourceLineNo">656</span>          // finished maybe, but not a 
problem).<a name="line.656"></a>
+<span class="sourceLineNo">657</span>          return null;<a 
name="line.657"></a>
+<span class="sourceLineNo">658</span>        }<a name="line.658"></a>
+<span class="sourceLineNo">659</span>      } else {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>        // in OPENING state before<a 
name="line.660"></a>
+<span class="sourceLineNo">661</span>        if (!node.isInState(State.OPEN, 
State.OPENING)) {<a name="line.661"></a>
+<span class="sourceLineNo">662</span>          // not in OPEN or OPENING 
state, then we can make sure that the region has been<a name="line.662"></a>
+<span class="sourceLineNo">663</span>          // reopened(not finished maybe, 
but not a problem)<a name="line.663"></a>
+<span class="sourceLineNo">664</span>          return null;<a 
name="line.664"></a>
+<span class="sourceLineNo">665</span>        } else {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>          if 
(!node.getRegionLocation().equals(oldLoc.getServerName())) {<a 
name="line.666"></a>
+<span class="sourceLineNo">667</span>            // the region has been moved, 
so we can make sure that the region has been reopened.<a name="line.667"></a>
+<span class="sourceLineNo">668</span>            return null;<a 
name="line.668"></a>
+<span class="sourceLineNo">669</span>          }<a name="line.669"></a>
+<span class="sourceLineNo">670</span>          // normal case, we are still in 
OPENING state, or the reopen has been opened and the state<a 
name="line.670"></a>
+<span class="sourceLineNo">671</span>          // is changed to OPEN.<a 
name="line.671"></a>
+<span class="sourceLineNo">672</span>          long openSeqNum = 
node.isInState(State.OPEN) ? node.getOpenSeqNum() : -1;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>          return new 
HRegionLocation(node.getRegionInfo(), node.getRegionLocation(), openSeqNum);<a 
name="line.673"></a>
+<span class="sourceLineNo">674</span>        }<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      }<a name="line.675"></a>
+<span class="sourceLineNo">676</span>    }<a name="line.676"></a>
+<span class="sourceLineNo">677</span>  }<a name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span>  /**<a name="line.679"></a>
+<span class="sourceLineNo">680</span>   * @return Return online regions of 
table; does not include OFFLINE or SPLITTING regions.<a name="line.680"></a>
+<span class="sourceLineNo">681</span>   */<a name="line.681"></a>
+<span class="sourceLineNo">682</span>  public List&lt;RegionInfo&gt; 
getRegionsOfTable(TableName table, boolean offline) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span>    return getRegionsOfTable(table, state 
-&gt; include(state, offline));<a name="line.683"></a>
+<span class="sourceLineNo">684</span>  }<a name="line.684"></a>
+<span class="sourceLineNo">685</span><a name="line.685"></a>
+<span class="sourceLineNo">686</span>  /**<a name="line.686"></a>
+<span class="sourceLineNo">687</span>   * @return Return the regions of the 
table; does not include OFFLINE unless you set<a name="line.687"></a>
+<span class="sourceLineNo">688</span>   *         
&lt;code&gt;offline&lt;/code&gt; to true. Does not include regions that are in 
the<a name="line.688"></a>
+<span class="sourceLineNo">689</span>   *         {@link State#SPLIT} state.<a 
name="line.689"></a>
+<span class="sourceLineNo">690</span>   */<a name="line.690"></a>
+<span class="sourceLineNo">691</span>  private List&lt;RegionInfo&gt; 
getRegionsOfTable(TableName table, Predicate&lt;RegionStateNode&gt; filter) {<a 
name="line.691"></a>
+<span class="sourceLineNo">692</span>    return 
getTableRegionStateNodes(table).stream().filter(filter).map(n -&gt; 
n.getRegionInfo())<a name="line.692"></a>
+<span class="sourceLineNo">693</span>      .collect(Collectors.toList());<a 
name="line.693"></a>
+<span class="sourceLineNo">694</span>  }<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span>  /**<a name="line.696"></a>
+<span class="sourceLineNo">697</span>   * Utility. Whether to include region 
in list of regions. Default is to<a name="line.697"></a>
+<span class="sourceLineNo">698</span>   * weed out split and offline 
regions.<a name="line.698"></a>
+<span class="sourceLineNo">699</span>   * @return True if we should include 
the &lt;code&gt;node&lt;/code&gt; (do not include<a name="line.699"></a>
+<span class="sourceLineNo">700</span>   * if split or offline unless 
&lt;code&gt;offline&lt;/code&gt; is set to true.<a name="line.700"></a>
+<span class="sourceLineNo">701</span>   */<a name="line.701"></a>
+<span class="sourceLineNo">702</span>  boolean include(final RegionStateNode 
node, final boolean offline) {<a name="line.702"></a>
+<span class="sourceLineNo">703</span>    if (LOG.isTraceEnabled()) {<a 
name="line.703"></a>
+<span class="sourceLineNo">704</span>      LOG.trace("WORKING ON " + node + " 
" + node.getRegionInfo());<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    }<a name="line.705"></a>
+<span class="sourceLineNo">706</span>    if (node.isInState(State.SPLIT)) 
return false;<a name="line.706"></a>
+<span class="sourceLineNo">707</span>    if (node.isInState(State.OFFLINE) 
&amp;&amp; !offline) return false;<a name="line.707"></a>
+<span class="sourceLineNo">708</span>    final RegionInfo hri = 
node.getRegionInfo();<a name="line.708"></a>
+<span class="sourceLineNo">709</span>    return (!hri.isOffline() &amp;&amp; 
!hri.isSplit()) ||<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        ((hri.isOffline() || 
hri.isSplit()) &amp;&amp; offline);<a name="line.710"></a>
+<span class="sourceLineNo">711</span>  }<a name="line.711"></a>
+<span class="sourceLineNo">712</span><a name="line.712"></a>
+<span class="sourceLineNo">713</span>  /**<a name="line.713"></a>
+<span class="sourceLineNo">714</span>   * Returns the set of regions hosted by 
the specified server<a name="line.714"></a>
+<span class="sourceLineNo">715</span>   * @param serverName the server we are 
interested in<a name="line.715"></a>
+<span class="sourceLineNo">716</span>   * @return set of RegionInfo hosted by 
the specified server<a name="line.716"></a>
+<span class="sourceLineNo">717</span>   */<a name="line.717"></a>
+<span class="sourceLineNo">718</span>  public List&lt;RegionInfo&gt; 
getServerRegionInfoSet(final ServerName serverName) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    final ServerStateNode serverInfo = 
getServerNode(serverName);<a name="line.719"></a>
+<span class="sourceLineNo">720</span>    if (serverInfo == null) return 
Collections.emptyList();<a name="line.720"></a>
+<span class="sourceLineNo">721</span><a name="line.721"></a>
+<span class="sourceLineNo">722</span>    synchronized (serverInfo) {<a 
name="line.722"></a>
+<span class="sourceLineNo">723</span>      return 
serverInfo.getRegionInfoList();<a name="line.723"></a>
+<span class="sourceLineNo">724</span>    }<a name="line.724"></a>
+<span class="sourceLineNo">725</span>  }<a name="line.725"></a>
 <span class="sourceLineNo">726</span><a name="line.726"></a>
-<span class="sourceLineNo">727</span>  private void setServerState(ServerName 
serverName, ServerState state) {<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    ServerStateNode serverNode = 
getOrCreateServer(serverName);<a name="line.728"></a>
-<span class="sourceLineNo">729</span>    synchronized (serverNode) {<a 
name="line.729"></a>
-<span class="sourceLineNo">730</span>      serverNode.setState(state);<a 
name="line.730"></a>
-<span class="sourceLineNo">731</span>    }<a name="line.731"></a>
-<span class="sourceLineNo">732</span>  }<a name="line.732"></a>
-<span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span>  /**<a name="line.734"></a>
-<span class="sourceLineNo">735</span>   * Call this when we start meta log 
splitting a crashed Server.<a name="line.735"></a>
-<span class="sourceLineNo">736</span>   * @see #metaLogSplit(ServerName)<a 
name="line.736"></a>
-<span class="sourceLineNo">737</span>   */<a name="line.737"></a>
-<span class="sourceLineNo">738</span>  public void metaLogSplitting(ServerName 
serverName) {<a name="line.738"></a>
-<span class="sourceLineNo">739</span>    setServerState(serverName, 
ServerState.SPLITTING_META);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>  }<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span>  /**<a name="line.742"></a>
-<span class="sourceLineNo">743</span>   * Called after we've split the meta 
logs on a crashed Server.<a name="line.743"></a>
-<span class="sourceLineNo">744</span>   * @see #metaLogSplitting(ServerName)<a 
name="line.744"></a>
-<span class="sourceLineNo">745</span>   */<a name="line.745"></a>
-<span class="sourceLineNo">746</span>  public void metaLogSplit(ServerName 
serverName) {<a name="line.746"></a>
-<span class="sourceLineNo">747</span>    setServerState(serverName, 
ServerState.SPLITTING_META_DONE);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>  }<a name="line.748"></a>
-<span class="sourceLineNo">749</span><a name="line.749"></a>
-<span class="sourceLineNo">750</span>  /**<a name="line.750"></a>
-<span class="sourceLineNo">751</span>   * Call this when we start log 
splitting for a crashed Server.<a name="line.751"></a>
-<span class="sourceLineNo">752</span>   * @see #logSplit(ServerName)<a 
name="line.752"></a>
-<span class="sourceLineNo">753</span>   */<a name="line.753"></a>
-<span class="sourceLineNo">754</span>  public void logSplitting(final 
ServerName serverName) {<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    setServerState(serverName, 
ServerState.SPLITTING);<a name="line.755"></a>
-<span class="sourceLineNo">756</span>  }<a name="line.756"></a>
-<span class="sourceLineNo">757</span><a name="line.757"></a>
-<span class="sourceLineNo">758</span>  /**<a name="line.758"></a>
-<span class="sourceLineNo">759</span>   * Called after we've split all logs on 
a crashed Server.<a name="line.759"></a>
-<span class="sourceLineNo">760</span>   * @see #logSplitting(ServerName)<a 
name="line.760"></a>
-<span class="sourceLineNo">761</span>   */<a name="line.761"></a>
-<span class="sourceLineNo">762</span>  public void logSplit(final ServerName 
serverName) {<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    setServerState(serverName, 
ServerState.OFFLINE);<a name="line.763"></a>
-<span class="sourceLineNo">764</span>  }<a name="line.764"></a>
-<span class="sourceLineNo">765</span><a name="line.765"></a>
-<span class="sourceLineNo">766</span>  @VisibleForTesting<a 
name="line.766"></a>
-<span class="sourceLineNo">767</span>  public void updateRegionState(final 
RegionInfo regionInfo, final State state) {<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    final RegionStateNode regionNode = 
getOrCreateRegionStateNode(regionInfo);<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    synchronized (regionNode) {<a 
name="line.769"></a>
-<span class="sourceLineNo">770</span>      regionNode.setState(state);<a 
name="line.770"></a>
-<span class="sourceLineNo">771</span>    }<a name="line.771"></a>
-<span class="sourceLineNo">772</span>  }<a name="line.772"></a>
-<span class="sourceLineNo">773</span><a name="line.773"></a>
-<span class="sourceLineNo">774</span>  // 
============================================================================================<a
 name="line.774"></a>
-<span class="sourceLineNo">775</span>  //  TODO:<a name="line.775"></a>
-<span class="sourceLineNo">776</span>  // 
============================================================================================<a
 name="line.776"></a>
-<span class="sourceLineNo">777</span>  public List&lt;RegionInfo&gt; 
getAssignedRegions() {<a name="line.777"></a>
-<span class="sourceLineNo">778</span>    final List&lt;RegionInfo&gt; result = 
new ArrayList&lt;RegionInfo&gt;();<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      if (!node.isInTransition()) {<a 
name="line.780"></a>
-<span class="sourceLineNo">781</span>        
result.add(node.getRegionInfo());<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      }<a name="line.782"></a>
-<span class="sourceLineNo">783</span>    }<a name="line.783"></a>
-<span class="sourceLineNo">784</span>    return result;<a name="line.784"></a>
-<span class="sourceLineNo">785</span>  }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span>  public boolean isRegionInState(final 
RegionInfo regionInfo, final State... state) {<a name="line.787"></a>
-<span class="sourceLineNo">788</span>    final RegionStateNode region = 
getRegionStateNode(regionInfo);<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    if (region != null) {<a 
name="line.789"></a>
-<span class="sourceLineNo">790</span>      synchronized (region) {<a 
name="line.790"></a>
-<span class="sourceLineNo">791</span>        return region.isInState(state);<a 
name="line.791"></a>
-<span class="sourceLineNo">792</span>      }<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    }<a name="line.793"></a>
-<span class="sourceLineNo">794</span>    return false;<a name="line.794"></a>
-<span class="sourceLineNo">795</span>  }<a name="line.795"></a>
-<span class="sourceLineNo">796</span><a name="line.796"></a>
-<span class="sourceLineNo">797</span>  public boolean isRegionOnline(final 
RegionInfo regionInfo) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span>    return isRegionInState(regionInfo, 
State.OPEN);<a name="line.798"></a>
-<span class="sourceLineNo">799</span>  }<a name="line.799"></a>
-<span class="sourceLineNo">800</span><a name="line.800"></a>
-<span class="sourceLineNo">801</span>  /**<a name="line.801"></a>
-<span class="sourceLineNo">802</span>   * @return True if region is offline 
(In OFFLINE or CLOSED state).<a name="line.802"></a>
-<span class="sourceLineNo">803</span>   */<a name="line.803"></a>
-<span class="sourceLineNo">804</span>  public boolean isRegionOffline(final 
RegionInfo regionInfo) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    return isRegionInState(regionInfo, 
State.OFFLINE, State.CLOSED);<a name="line.805"></a>
-<span class="sourceLineNo">806</span>  }<a name="line.806"></a>
-<span class="sourceLineNo">807</span><a name="line.807"></a>
-<span class="sourceLineNo">808</span>  public Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; getSnapShotOfAssignment(<a name="line.808"></a>
-<span class="sourceLineNo">809</span>      final Collection&lt;RegionInfo&gt; 
regions) {<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    final Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; result = new HashMap&lt;ServerName, 
List&lt;RegionInfo&gt;&gt;();<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    for (RegionInfo hri: regions) {<a 
name="line.811"></a>
-<span class="sourceLineNo">812</span>      final RegionStateNode node = 
getRegionStateNode(hri);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      if (node == null) continue;<a 
name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>      // TODO: State.OPEN<a 
name="line.815"></a>
-<span class="sourceLineNo">816</span>      final ServerName serverName = 
node.getRegionLocation();<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      if (serverName == null) continue;<a 
name="line.817"></a>
-<span class="sourceLineNo">818</span><a name="line.818"></a>
-<span class="sourceLineNo">819</span>      List&lt;RegionInfo&gt; 
serverRegions = result.get(serverName);<a name="line.819"></a>
-<span class="sourceLineNo">820</span>      if (serverRegions == null) {<a 
name="line.820"></a>
-<span class="sourceLineNo">821</span>        serverRegions = new 
ArrayList&lt;RegionInfo&gt;();<a name="line.821"></a>
-<span class="sourceLineNo">822</span>        result.put(serverName, 
serverRegions);<a name="line.822"></a>
-<span class="sourceLineNo">823</span>      }<a name="line.823"></a>
+<span class="sourceLineNo">727</span>  // 
============================================================================================<a
 name="line.727"></a>
+<span class="sourceLineNo">728</span>  // Split helpers<a name="line.728"></a>
+<span class="sourceLineNo">729</span>  // These methods will only be called in 
ServerCrashProcedure, and at the end of SCP we will remove<a 
name="line.729"></a>
+<span class="sourceLineNo">730</span>  // the ServerStateNode by calling 
removeServer.<a name="line.730"></a>
+<span class="sourceLineNo">731</span>  // 
============================================================================================<a
 name="line.731"></a>
+<span class="sourceLineNo">732</span><a name="line.732"></a>
+<span class="sourceLineNo">733</span>  private void setServerState(ServerName 
serverName, ServerState state) {<a name="line.733"></a>
+<span class="sourceLineNo">734</span>    ServerStateNode serverNode = 
getOrCreateServer(serverName);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    synchronized (serverNode) {<a 
name="line.735"></a>
+<span class="sourceLineNo">736</span>      serverNode.setState(state);<a 
name="line.736"></a>
+<span class="sourceLineNo">737</span>    }<a name="line.737"></a>
+<span class="sourceLineNo">738</span>  }<a name="line.738"></a>
+<span class="sourceLineNo">739</span><a name="line.739"></a>
+<span class="sourceLineNo">740</span>  /**<a name="line.740"></a>
+<span class="sourceLineNo">741</span>   * Call this when we start meta log 
splitting a crashed Server.<a name="line.741"></a>
+<span class="sourceLineNo">742</span>   * @see #metaLogSplit(ServerName)<a 
name="line.742"></a>
+<span class="sourceLineNo">743</span>   */<a name="line.743"></a>
+<span class="sourceLineNo">744</span>  public void metaLogSplitting(ServerName 
serverName) {<a name="line.744"></a>
+<span class="sourceLineNo">745</span>    setServerState(serverName, 
ServerState.SPLITTING_META);<a name="line.745"></a>
+<span class="sourceLineNo">746</span>  }<a name="line.746"></a>
+<span class="sourceLineNo">747</span><a name="line.747"></a>
+<span class="sourceLineNo">748</span>  /**<a name="line.748"></a>
+<span class="sourceLineNo">749</span>   * Called after we've split the meta 
logs on a crashed Server.<a name="line.749"></a>
+<span class="sourceLineNo">750</span>   * @see #metaLogSplitting(ServerName)<a 
name="line.750"></a>
+<span class="sourceLineNo">751</span>   */<a name="line.751"></a>
+<span class="sourceLineNo">752</span>  public void metaLogSplit(ServerName 
serverName) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>    setServerState(serverName, 
ServerState.SPLITTING_META_DONE);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>  }<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span>  /**<a name="line.756"></a>
+<span class="sourceLineNo">757</span>   * Call this when we start log 
splitting for a crashed Server.<a name="line.757"></a>
+<span class="sourceLineNo">758</span>   * @see #logSplit(ServerName)<a 
name="line.758"></a>
+<span class="sourceLineNo">759</span>   */<a name="line.759"></a>
+<span class="sourceLineNo">760</span>  public void logSplitting(final 
ServerName serverName) {<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    setServerState(serverName, 
ServerState.SPLITTING);<a name="line.761"></a>
+<span class="sourceLineNo">762</span>  }<a name="line.762"></a>
+<span class="sourceLineNo">763</span><a name="line.763"></a>
+<span class="sourceLineNo">764</span>  /**<a name="line.764"></a>
+<span class="sourceLineNo">765</span>   * Called after we've split all logs on 
a crashed Server.<a name="line.765"></a>
+<span class="sourceLineNo">766</span>   * @see #logSplitting(ServerName)<a 
name="line.766"></a>
+<span class="sourceLineNo">767</span>   */<a name="line.767"></a>
+<span class="sourceLineNo">768</span>  public void logSplit(final ServerName 
serverName) {<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    setServerState(serverName, 
ServerState.OFFLINE);<a name="line.769"></a>
+<span class="sourceLineNo">770</span>  }<a name="line.770"></a>
+<span class="sourceLineNo">771</span><a name="line.771"></a>
+<span class="sourceLineNo">772</span>  @VisibleForTesting<a 
name="line.772"></a>
+<span class="sourceLineNo">773</span>  public void updateRegionState(final 
RegionInfo regionInfo, final State state) {<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    final RegionStateNode regionNode = 
getOrCreateRegionStateNode(regionInfo);<a name="line.774"></a>
+<span class="sourceLineNo">775</span>    synchronized (regionNode) {<a 
name="line.775"></a>
+<span class="sourceLineNo">776</span>      regionNode.setState(state);<a 
name="line.776"></a>
+<span class="sourceLineNo">777</span>    }<a name="line.777"></a>
+<span class="sourceLineNo">778</span>  }<a name="line.778"></a>
+<span class="sourceLineNo">779</span><a name="line.779"></a>
+<span class="sourceLineNo">780</span>  // 
============================================================================================<a
 name="line.780"></a>
+<span class="sourceLineNo">781</span>  //  TODO:<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  // 
============================================================================================<a
 name="line.782"></a>
+<span class="sourceLineNo">783</span>  public List&lt;RegionInfo&gt; 
getAssignedRegions() {<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    final List&lt;RegionInfo&gt; result = 
new ArrayList&lt;RegionInfo&gt;();<a name="line.784"></a>
+<span class="sourceLineNo">785</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.785"></a>
+<span class="sourceLineNo">786</span>      if (!node.isInTransition()) {<a 
name="line.786"></a>
+<span class="sourceLineNo">787</span>        
result.add(node.getRegionInfo());<a name="line.787"></a>
+<span class="sourceLineNo">788</span>      }<a name="line.788"></a>
+<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
+<span class="sourceLineNo">790</span>    return result;<a name="line.790"></a>
+<span class="sourceLineNo">791</span>  }<a name="line.791"></a>
+<span class="sourceLineNo">792</span><a name="line.792"></a>
+<span class="sourceLineNo">793</span>  public boolean isRegionInState(final 
RegionInfo regionInfo, final State... state) {<a name="line.793"></a>
+<span class="sourceLineNo">794</span>    final RegionStateNode region = 
getRegionStateNode(regionInfo);<a name="line.794"></a>
+<span class="sourceLineNo">795</span>    if (region != null) {<a 
name="line.795"></a>
+<span class="sourceLineNo">796</span>      synchronized (region) {<a 
name="line.796"></a>
+<span class="sourceLineNo">797</span>        return region.isInState(state);<a 
name="line.797"></a>
+<span class="sourceLineNo">798</span>      }<a name="line.798"></a>
+<span class="sourceLineNo">799</span>    }<a name="line.799"></a>
+<span class="sourceLineNo">800</span>    return false;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>  }<a name="line.801"></a>
+<span class="sourceLineNo">802</span><a name="line.802"></a>
+<span class="sourceLineNo">803</span>  public boolean isRegionOnline(final 
RegionInfo regionInfo) {<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    return isRegionInState(regionInfo, 
State.OPEN);<a name="line.804"></a>
+<span class="sourceLineNo">805</span>  }<a name="line.805"></a>
+<span class="sourceLineNo">806</span><a name="line.806"></a>
+<span class="sourceLineNo">807</span>  /**<a name="line.807"></a>
+<span class="sourceLineNo">808</span>   * @return True if region is offline 
(In OFFLINE or CLOSED state).<a name="line.808"></a>
+<span class="sourceLineNo">809</span>   */<a name="line.809"></a>
+<span class="sourceLineNo">810</span>  public boolean isRegionOffline(final 
RegionInfo regionInfo) {<a name="line.810"></a>
+<span class="sourceLineNo">811</span>    return isRegionInState(regionInfo, 
State.OFFLINE, State.CLOSED);<a name="line.811"></a>
+<span class="sourceLineNo">812</span>  }<a name="line.812"></a>
+<span class="sourceLineNo">813</span><a name="line.813"></a>
+<span class="sourceLineNo">814</span>  public Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; getSnapShotOfAssignment(<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      final Collection&lt;RegionInfo&gt; 
regions) {<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    final Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; result = new HashMap&lt;ServerName, 
List&lt;RegionInfo&gt;&gt;();<a name="line.816"></a>
+<span class="sourceLineNo">817</span>    for (RegionInfo hri: regions) {<a 
name="line.817"></a>
+<span class="sourceLineNo">818</span>      final RegionStateNode node = 
getRegionStateNode(hri);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>      if (node == null) continue;<a 
name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>      // TODO: State.OPEN<a 
name="line.821"></a>
+<span class="sourceLineNo">822</span>      final ServerName serverName = 
node.getRegionLocation();<a name="line.822"></a>
+<span class="sourceLineNo">823</span>      if (serverName == null) continue;<a 
name="line.823"></a>
 <span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span>      
serverRegions.add(node.getRegionInfo());<a name="line.825"></a>
-<span class="sourceLineNo">826</span>    }<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    return result;<a name="line.827"></a>
-<span class="sourceLineNo">828</span>  }<a name="line.828"></a>
-<span class="sourceLineNo">829</span><a name="line.829"></a>
-<span class="sourceLineNo">830</span>  public Map&lt;RegionInfo, 
ServerName&gt; getRegionAssignments() {<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    final HashMap&lt;RegionInfo, 
ServerName&gt; assignments = new HashMap&lt;RegionInfo, ServerName&gt;();<a 
name="line.831"></a>
-<span class="sourceLineNo">832</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.832"></a>
-<span class="sourceLineNo">833</span>      
assignments.put(node.getRegionInfo(), node.getRegionLocation());<a 
name="line.833"></a>
-<span class="sourceLineNo">834</span>    }<a name="line.834"></a>
-<span class="sourceLineNo">835</span>    return assignments;<a 
name="line.835"></a>
-<span class="sourceLineNo">836</span>  }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>  public Map&lt;RegionState.State, 
List&lt;RegionInfo&gt;&gt; getRegionByStateOfTable(TableName tableName) {<a 
name="line.838"></a>
-<span class="sourceLineNo">839</span>    final State[] states = 
State.values();<a name="line.839"></a>
-<span class="sourceLineNo">840</span>    final Map&lt;RegionState.State, 
List&lt;RegionInfo&gt;&gt; tableRegions =<a name="line.840"></a>
-<span class="sourceLineNo">841</span>        new HashMap&lt;State, 
List&lt;RegionInfo&gt;&gt;(states.length);<a name="line.841"></a>
-<span class="sourceLineNo">842</span>    for (int i = 0; i &lt; states.length; 
++i) {<a name="line.842"></a>
-<span class="sourceLineNo">843</span>      tableRegions.put(states[i], new 
ArrayList&lt;RegionInfo&gt;());<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    }<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.846"></a>
-<span class="sourceLineNo">847</span>      if 
(node.getTable().equals(tableName)) {<a name="line.847"></a>
-<span class="sourceLineNo">848</span>        
tableRegions.get(node.getState()).add(node.getRegionInfo());<a 
name="line.848"></a>
-<span class="sourceLineNo">849</span>      }<a name="line.849"></a>
+<span class="sourceLineNo">825</span>      List&lt;RegionInfo&gt; 
serverRegions = result.get(serverName);<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      if (serverRegions == null) {<a 
name="line.826"></a>
+<span class="sourceLineNo">827</span>        serverRegions = new 
ArrayList&lt;RegionInfo&gt;();<a name="line.827"></a>
+<span class="sourceLineNo">828</span>        result.put(serverName, 
serverRegions);<a name="line.828"></a>
+<span class="sourceLineNo">829</span>      }<a name="line.829"></a>
+<span class="sourceLineNo">830</span><a name="line.830"></a>
+<span class="sourceLineNo">831</span>      
serverRegions.add(node.getRegionInfo());<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>    return result;<a name="line.833"></a>
+<span class="sourceLineNo">834</span>  }<a name="line.834"></a>
+<span class="sourceLineNo">835</span><a name="line.835"></a>
+<span class="sourceLineNo">836</span>  public Map&lt;RegionInfo, 
ServerName&gt; getRegionAssignments() {<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    final HashMap&lt;RegionInfo, 
ServerName&gt; assignments = new HashMap&lt;RegionInfo, ServerName&gt;();<a 
name="line.837"></a>
+<span class="sourceLineNo">838</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.838"></a>
+<span class="sourceLineNo">839</span>      
assignments.put(node.getRegionInfo(), node.getRegionLocation());<a 
name="line.839"></a>
+<span class="sourceLineNo">840</span>    }<a name="line.840"></a>
+<span class="sourceLineNo">841</span>    return assignments;<a 
name="line.841"></a>
+<span class="sourceLineNo">842</span>  }<a name="line.842"></a>
+<span class="sourceLineNo">843</span><a name="line.843"></a>
+<span class="sourceLineNo">844</span>  public Map&lt;RegionState.State, 
List&lt;RegionInfo&gt;&gt; getRegionByStateOfTable(TableName tableName) {<a 
name="line.844"></a>
+<span class="sourceLineNo">845</span>    final State[] states = 
State.values();<a name="line.845"></a>
+<span class="sourceLineNo">846</span>    final Map&lt;RegionState.State, 
List&lt;RegionInfo&gt;&gt; tableRegions =<a name="line.846"></a>
+<span class="sourceLineNo">847</span>        new HashMap&lt;State, 
List&lt;RegionInfo&gt;&gt;(states.length);<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    for (int i = 0; i &lt; states.length; 
++i) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      tableRegions.put(states[i], new 
ArrayList&lt;RegionInfo&gt;());<a name="line.849"></a>
 <span class="sourceLineNo">850</span>    }<a name="line.850"></a>
-<span class="sourceLineNo">851</span>    return tableRegions;<a 
name="line.851"></a>
-<span class="sourceLineNo">852</span>  }<a name="line.852"></a>
-<span class="sourceLineNo">853</span><a name="line.853"></a>
-<span class="sourceLineNo">854</span>  public ServerName 
getRegionServerOfRegion(final RegionInfo regionInfo) {<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    final RegionStateNode region = 
getRegionStateNode(regionInfo);<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    if (region != null) {<a 
name="line.856"></a>
-<span class="sourceLineNo">857</span>      synchronized (region) {<a 
name="line.857"></a>
-<span class="sourceLineNo">858</span>        ServerName server = 
region.getRegionLocation();<a name="line.858"></a>
-<span class="sourceLineNo">859</span>        return server != null ? server : 
region.getLastHost();<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      }<a name="line.860"></a>
-<span class="sourceLineNo">861</span>    }<a name="line.861"></a>
-<span class="sourceLineNo">862</span>    return null;<a name="line.862"></a>
-<span class="sourceLineNo">863</span>  }<a name="line.863"></a>
-<span class="sourceLineNo">864</span><a name="line.864"></a>
-<span class="sourceLineNo">865</span>  /**<a name="line.865"></a>
-<span class="sourceLineNo">866</span>   * This is an EXPENSIVE clone.  Cloning 
though is the safest thing to do.<a name="line.866"></a>
-<span class="sourceLineNo">867</span>   * Can't let out original since it can 
change and at least the load balancer<a name="line.867"></a>
-<span class="sourceLineNo">868</span>   * wants to iterate this exported list. 
 We need to synchronize on regions<a name="line.868"></a>
-<span class="sourceLineNo">869</span>   * since all access to this.servers is 
under a lock on this.regions.<a name="line.869"></a>
-<span class="sourceLineNo">870</span>   * @param forceByCluster a flag to 
force to aggregate the server-load to the cluster level<a name="line.870"></a>
-<span class="sourceLineNo">871</span>   * @return A clone of current 
assignments by table.<a name="line.871"></a>
-<span class="sourceLineNo">872</span>   */<a name="line.872"></a>
-<span class="sourceLineNo">873</span>  public Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; getAssignmentsByTable(<a 
name="line.873"></a>
-<span class="sourceLineNo">874</span>      final boolean forceByCluster) {<a 
name="line.874"></a>
-<span class="sourceLineNo">875</span>    if (!forceByCluster) return 
getAssignmentsByTable();<a name="line.875"></a>
-<span class="sourceLineNo">876</span><a name="line.876"></a>
-<span class="sourceLineNo">877</span>    final HashMap&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; ensemble =<a name="line.877"></a>
-<span class="sourceLineNo">878</span>      new HashMap&lt;ServerName, 
List&lt;RegionInfo&gt;&gt;(serverMap.size());<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    for (ServerStateNode serverNode: 
serverMap.values()) {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>      
ensemble.put(serverNode.getServerName(), serverNode.getRegionInfoList());<a 
name="line.880"></a>
-<span class="sourceLineNo">881</span>    }<a name="line.881"></a>
+<span class="sourceLineNo">851</span><a name="line.851"></a>
+<span class="sourceLineNo">852</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.852"></a>
+<span class="sourceLineNo">853</span>      if 
(node.getTable().equals(tableName)) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>        
tableRegions.get(node.getState()).add(node.getRegionInfo());<a 
name="line.854"></a>
+<span class="sourceLineNo">855</span>      }<a name="line.855"></a>
+<span class="sourceLineNo">856</span>    }<a name="line.856"></a>
+<span class="sourceLineNo">857</span>    return tableRegions;<a 
name="line.857"></a>
+<span class="sourceLineNo">858</span>  }<a name="line.858"></a>
+<span class="sourceLineNo">859</span><a name="line.859"></a>
+<span class="sourceLineNo">860</span>  public ServerName 
getRegionServerOfRegion(final RegionInfo regionInfo) {<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    final RegionStateNode region = 
getRegionStateNode(regionInfo);<a name="line.861"></a>
+<span class="sourceLineNo">862</span>    if (region != null) {<a 
name="line.862"></a>
+<span class="sourceLineNo">863</span>      synchronized (region) {<a 
name="line.863"></a>
+<span class="sourceLineNo">864</span>        ServerName server = 
region.getRegionLocation();<a name="line.864"></a>
+<span class="sourceLineNo">865</span>        return server != null ? server : 
region.getLastHost();<a name="line.865"></a>
+<span class="sourceLineNo">866</span>      }<a name="line.866"></a>
+<span class="sourceLineNo">867</span>    }<a name="line.867"></a>
+<span class="sourceLineNo">868</span>    return null;<a name="line.868"></a>
+<span class="sourceLineNo">869</span>  }<a name="line.869"></a>
+<span class="sourceLineNo">870</span><a name="line.870"></a>
+<span class="sourceLineNo">871</span>  /**<a name="line.871"></a>
+<span class="sourceLineNo">872</span>   * This is an EXPENSIVE clone.  Cloning 
though is the safest thing to do.<a name="line.872"></a>
+<span class="sourceLineNo">873</span>   * Can't let out original since it can 
change and at least the load balancer<a name="line.873"></a>
+<span class="sourceLineNo">874</span>   * wants to iterate this exported list. 
 We need to synchronize on regions<a name="line.874"></a>
+<span class="sourceLineNo">875</span>   * since all access to this.servers is 
under a lock on this.regions.<a name="line.875"></a>
+<span class="sourceLineNo">876</span>   * @param forceByCluster a flag to 
force to aggregate the server-load to the cluster level<a name="line.876"></a>
+<span class="sourceLineNo">877</span>   * @return A clone of current 
assignments by table.<a name="line.877"></a>
+<span class="sourceLineNo">878</span>   */<a name="line.878"></a>
+<span class="sourceLineNo">879</span>  public Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; getAssignmentsByTable(<a 
name="line.879"></a>
+<span class="sourceLineNo">880</span>      final boolean forceByCluster) {<a 
name="line.880"></a>
+<span class="sourceLineNo">881</span>    if (!forceByCluster) return 
getAssignmentsByTable();<a name="line.881"></a>
 <span class="sourceLineNo">882</span><a name="line.882"></a>
-<span class="sourceLineNo">883</span>    // TODO: can we use 
Collections.singletonMap(HConstants.ENSEMBLE_TABLE_NAME, ensemble)?<a 
name="line.883"></a>
-<span class="sourceLineNo">884</span>    final Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; result =<a 
name="line.884"></a>
-<span class="sourceLineNo">885</span>      new HashMap&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt;(1);<a name="line.885"></a>
-<span class="sourceLineNo">886</span>    
result.put(HConstants.ENSEMBLE_TABLE_NAME, ensemble);<a name="line.886"></a>
-<span class="sourceLineNo">887</span>    return result;<a name="line.887"></a>
-<span class="sourceLineNo">888</span>  }<a name="line.888"></a>
-<span class="sourceLineNo">889</span><a name="line.889"></a>
-<span class="sourceLineNo">890</span>  public Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; getAssignmentsByTable() {<a 
name="line.890"></a>
-<span class="sourceLineNo">891</span>    final Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; result = new 
HashMap&lt;&gt;();<a name="line.891"></a>
-<span class="sourceLineNo">892</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.892"></a>
-<span class="sourceLineNo">893</span>      Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; tableResult = result.get(node.getTable());<a 
name="line.893"></a>
-<span class="sourceLineNo">894</span>      if (tableResult == null) {<a 
name="line.894"></a>
-<span class="sourceLineNo">895</span>        tableResult = new 
HashMap&lt;ServerName, List&lt;RegionInfo&gt;&gt;();<a name="line.895"></a>
-<span class="sourceLineNo">896</span>        result.put(node.getTable(), 
tableResult);<a name="line.896"></a>
-<span class="sourceLineNo">897</span>      }<a name="line.897"></a>
-<span class="sourceLineNo">898</span><a name="line.898"></a>
-<span class="sourceLineNo">899</span>      final ServerName serverName = 
node.getRegionLocation();<a name="line.899"></a>
-<span class="sourceLineNo">900</span>      if (serverName == null) {<a 
name="line.900"></a>
-<span class="sourceLineNo">901</span>        LOG.info("Skipping, no server for 
" + node);<a name="line.901"></a>
-<span class="sourceLineNo">902</span>        continue;<a name="line.902"></a>
+<span class="sourceLineNo">883</span>    final HashMap&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; ensemble =<a name="line.883"></a>
+<span class="sourceLineNo">884</span>      new HashMap&lt;ServerName, 
List&lt;RegionInfo&gt;&gt;(serverMap.size());<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    for (ServerStateNode serverNode: 
serverMap.values()) {<a name="line.885"></a>
+<span class="sourceLineNo">886</span>      
ensemble.put(serverNode.getServerName(), serverNode.getRegionInfoList());<a 
name="line.886"></a>
+<span class="sourceLineNo">887</span>    }<a name="line.887"></a>
+<span class="sourceLineNo">888</span><a name="line.888"></a>
+<span class="sourceLineNo">889</span>    // TODO: can we use 
Collections.singletonMap(HConstants.ENSEMBLE_TABLE_NAME, ensemble)?<a 
name="line.889"></a>
+<span class="sourceLineNo">890</span>    final Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; result =<a 
name="line.890"></a>
+<span class="sourceLineNo">891</span>      new HashMap&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt;(1);<a name="line.891"></a>
+<span class="sourceLineNo">892</span>    
result.put(HConstants.ENSEMBLE_TABLE_NAME, ensemble);<a name="line.892"></a>
+<span class="sourceLineNo">893</span>    return result;<a name="line.893"></a>
+<span class="sourceLineNo">894</span>  }<a name="line.894"></a>
+<span class="sourceLineNo">895</span><a name="line.895"></a>
+<span class="sourceLineNo">896</span>  public Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; getAssignmentsByTable() {<a 
name="line.896"></a>
+<span class="sourceLineNo">897</span>    final Map&lt;TableName, 
Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; result = new 
HashMap&lt;&gt;();<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    for (RegionStateNode node: 
regionsMap.values()) {<a name="line.898"></a>
+<span class="sourceLineNo">899</span>      Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; tableResult = result.get(node.getTable());<a 
name="line.899"></a>
+<span class="sourceLineNo">900</span>      if (tableResult == null) {<a 
name="line.900"></a>
+<span class="sourceLineNo">901</span>        tableResult = new 
HashMap&lt;ServerName, List&lt;RegionInfo&gt;&gt;();<a name="line.901"></a>
+<span class="sourceLineNo">902</span>        result.put(node.getTable(), 
tableResult);<a name="line.902"></a>
 <span class="sourceLineNo">903</span>      }<a name="line.903"></a>
-<span class="sourceLineNo">904</span>      List&lt;RegionInfo&gt; serverResult 
= tableResult.get(serverName);<a name="line.904"></a>
-<span class="sourceLineNo">905</span>      if (serverResult == null) {<a 
name="line.905"></a>
-<span class="sourceLineNo">906</span>        serverResult = new 
ArrayList&lt;RegionInfo&gt;();<a name="line.906"></a>
-<span class="sourceLineNo">907</span>        tableResult.put(serverName, 
serverResult);<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      }<a name="line.908"></a>
-<span class="sourceLineNo">909</span><a name="line.909"></a>
-<span class="sourceLineNo">910</span>      
serverResult.add(node.getRegionInfo());<a name="line.910"></a>
-<span class="sourceLineNo">911</span>    }<a name="line.911"></a>
-<span class="sourceLineNo">912</span>    // Add online servers with no 
assignment for the table.<a name="line.912"></a>
-<span class="sourceLineNo">913</span>    for (Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; table: result.values()) {<a name="line.913"></a>
-<span class="sourceLineNo">914</span>        for (ServerName svr : 
serverMap.keySet()) {<a name="line.914"></a>
-<span class="sourceLineNo">915</span>          if (!table.containsKey(svr)) 
{<a name="line.915"></a>
-<span class="sourceLineNo">916</span>            table.put(svr, new 
ArrayList&lt;RegionInfo&gt;());<a name="line.916"></a>
-<span class="sourceLineNo">917</span>          }<a name="line.917"></a>
-<span class="sourceLineNo">918</span>        }<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    }<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    return result;<a name="line.920"></a>
-<span class="sourceLineNo">921</span>  }<a name="line.921"></a>
-<span class="sourceLineNo">922</span><a name="line.922"></a>
-<span class="sourceLineNo">923</span>  // 
==========================================================================<a 
name="line.923"></a>
-<span class="sourceLineNo">924</span>  //  Region in transition helpers<a 
name="line.924"></a>
-<span class="sourceLineNo">925</span>  // 
==========================================================================<a 
name="line.925"></a>
-<span class="sourceLineNo">926</span>  protected boolean 
addRegionInTransition(final RegionStateNode regionNode,<a name="line.926"></a>
-<span class="sourceLineNo">927</span>      final RegionTransitionProcedure 
procedure) {<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    if (procedure != null &amp;&amp; 
!regionNode.setProcedure(procedure)) return false;<a name="line.928"></a>
-<span class="sourceLineNo">929</span><a name="line.929"></a>
-<span class="sourceLineNo">930</span>    
regionInTransition.put(regionNode.getRegionInfo(), regionNode);<a 
name="line.930"></a>
-<span class="sourceLineNo">931</span>    return true;<a name="line.931"></a>
-<span class="sourceLineNo">932</span>  }<a name="line.932"></a>
-<span class="sourceLineNo">933</span><a name="line.933"></a>
-<span class="sourceLineNo">934</span>  protected void 
removeRegionInTransition(final RegionStateNode regionNode,<a 
name="line.934"></a>
-<span class="sourceLineNo">935</span>      final RegionTransitionProcedure 
procedure) {<a name="line.935"></a>
-<span class="sourceLineNo">936</span>    
regionInTransition.remove(regionNode.getRegionInfo());<a name="line.936"></a>
-<span class="sourceLineNo">937</span>    
regionNode.unsetProcedure(procedure);<a name="line.937"></a>
+<span class="sourceLineNo">904</span><a name="line.904"></a>
+<span class="sourceLineNo">905</span>      final ServerName serverName = 
node.getRegionLocation();<a name="line.905"></a>
+<span class="sourceLineNo">906</span>      if (serverName == null) {<a 
name="line.906"></a>
+<span class="sourceLineNo">907</span>        LOG.info("Skipping, no server for 
" + node);<a name="line.907"></a>
+<span class="sourceLineNo">908</span>        continue;<a name="line.908"></a>
+<span class="sourceLineNo">909</span>      }<a name="line.909"></a>
+<span class="sourceLineNo">910</span>      List&lt;RegionInfo&gt; serverResult 
= tableResult.get(serverName);<a name="line.910"></a>
+<span class="sourceLineNo">911</span>      if (serverResult == null) {<a 
name="line.911"></a>
+<span class="sourceLineNo">912</span>        serverResult = new 
ArrayList&lt;RegionInfo&gt;();<a name="line.912"></a>
+<span class="sourceLineNo">913</span>        tableResult.put(serverName, 
serverResult);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>      }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>      
serverResult.add(node.getRegionInfo());<a name="line.916"></a>
+<span class="sourceLineNo">917</span>    }<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    // Add online servers with no 
assignment for the table.<a name="line.918"></a>
+<span class="sourceLineNo">919</span>    for (Map&lt;ServerName, 
List&lt;RegionInfo&gt;&gt; table: result.values()) {<a name="line.919"></a>
+<span class="sourceLineNo">920</span>        for (ServerName svr : 
serverMap.keySet()) {<a name="line.920"></a>
+<span class="sourceLineNo">921</span>          if (!table.containsKey(svr)) 
{<a name="line.921"></a>
+<span class="sourceLineNo">922</span>            table.put(svr, new 
ArrayList&lt;RegionInfo&gt;());<a name="line.922"></a>
+<span class="sourceLineNo">923</span>          }<a name="line.923"></a>
+<span class="sourceLineNo">924</span>        }<a name="line.924"></a>
+<span class="sourceLineNo">925</span>    }<a name="line.925"></a>
+<span class="sourceLineNo">926</span>    return result;<a name="line.926"></a>
+<span class="sourceLineNo">927</span>  }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>  // 
==========================================================================<a 
name="line.929"></a>
+<span class="sourceLineNo">930</span>  //  Region in transition helpers<a 
name="line.930"></a>
+<span class="sourceLineNo">931</span>  // 
==========================================================================<a 
name="line.931"></a>
+<span class="sourceLineNo">932</span>  protected boolean 
addRegionInTransition(final RegionStateNode regionNode,<a name="line.932"></a>
+<span class="sourceLineNo">933</span>      final RegionTransitionProcedure 
procedure) {<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    if (procedure != null &amp;&amp; 
!regionNode.setProcedure(procedure)) return false;<a name="line.934"></a>
+<span class="sourceLineNo">935</span><a name="line.935"></a>
+<span class="sourceLineNo">936</span>    
regionInTransition.put(regionNode.getRegionInfo(), regionNode);<a 
name="line.936"></a>
+<span class="sourceLineNo">937</span>    return true;<a name="line.937"></a>
 <span class="sourceLineNo">938</span>  }<a name="line.938"></a>
 <span class="sourceLineNo">939</span><a name="line.939"></a>
-<span class="sourceLineNo">940</span>  public boolean hasRegionsInTransition() 
{<a name="line.940"></a>
-<span class="sourceLineNo">941</span>    return 
!regionInTransition.isEmpty();<a name="line.941"></a>
-<span class="sourceLineNo">942</span>  }<a name="line.942"></a>
-<span class="sourceLineNo">943</span><a name="line.943"></a>
-<span class="sourceLineNo">944</span>  public boolean 
isRegionInTransition(final RegionInfo regionInfo) {<a name="line.944"></a>
-<span class="sourceLineNo">945</span>    final RegionStateNode node = 
regionInTransition.get(regionInfo);<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    return node != null ? 
node.isInTransition() : false;<a name="line.946"></a>
-<span

<TRUNCATED>

Reply via email to