You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/09/26 15:05:52 UTC
[14/51] [partial] hbase-site git commit: Published site at
d7e08317d2f214e4cca7b67578aba0ed7a567d54.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/37cf49a6/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
index 207ebcc..c3ef37e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
@@ -28,330 +28,332 @@
<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import java.util.Collections;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.Cell;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.CellBuilderFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.CellBuilderType;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HConstants;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.RegionLocations;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.ServerName;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.Put;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.Result;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.Table;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.37"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.fs.FileSystem;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Cell;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.CellBuilderFactory;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.CellBuilderType;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HConstants;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.RegionLocations;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.ServerName;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.Put;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.Result;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Table;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.37"></a>
<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.38"></a>
<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.master.RegionState.State;<a name="line.39"></a>
<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.40"></a>
<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.procedure2.util.StringUtils;<a name="line.41"></a>
<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.42"></a>
<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.wal.WALSplitter;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.zookeeper.KeeperException;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * Store Region State to hbase:meta table.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>@InterfaceAudience.Private<a name="line.57"></a>
-<span class="sourceLineNo">058</span>public class RegionStateStore {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private static final Logger LOG = LoggerFactory.getLogger(RegionStateStore.class);<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> /** The delimiter for meta columns for replicaIds &gt; 0 */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> protected static final char META_REPLICA_ID_DELIMITER = '_';<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> private final MasterServices master;<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> public RegionStateStore(final MasterServices master) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> this.master = master;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> public interface RegionStateVisitor {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> void visitRegionState(Result result, RegionInfo regionInfo, State state,<a name="line.71"></a>
-<span class="sourceLineNo">072</span> ServerName regionLocation, ServerName lastHost, long openSeqNum);<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> public void visitMeta(final RegionStateVisitor visitor) throws IOException {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> MetaTableAccessor.fullScanRegions(master.getConnection(), new MetaTableAccessor.Visitor() {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> final boolean isDebugEnabled = LOG.isDebugEnabled();<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public boolean visit(final Result r) throws IOException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> if (r != null && !r.isEmpty()) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> long st = 0;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (LOG.isTraceEnabled()) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> st = System.currentTimeMillis();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span> visitMetaEntry(visitor, r);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> if (LOG.isTraceEnabled()) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> long et = System.currentTimeMillis();<a name="line.88"></a>
-<span class="sourceLineNo">089</span> LOG.trace("[T] LOAD META PERF " + StringUtils.humanTimeDiff(et - st));<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> } else if (isDebugEnabled) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> LOG.debug("NULL result from meta - ignoring but this is strange.");<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return true;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> });<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> private void visitMetaEntry(final RegionStateVisitor visitor, final Result result)<a name="line.99"></a>
-<span class="sourceLineNo">100</span> throws IOException {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final RegionLocations rl = MetaTableAccessor.getRegionLocations(result);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (rl == null) return;<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> final HRegionLocation[] locations = rl.getRegionLocations();<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (locations == null) return;<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> for (int i = 0; i < locations.length; ++i) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> final HRegionLocation hrl = locations[i];<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (hrl == null) continue;<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> final RegionInfo regionInfo = hrl.getRegion();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> if (regionInfo == null) continue;<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> final int replicaId = regionInfo.getReplicaId();<a name="line.114"></a>
-<span class="sourceLineNo">115</span> final State state = getRegionState(result, replicaId);<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> final ServerName lastHost = hrl.getServerName();<a name="line.117"></a>
-<span class="sourceLineNo">118</span> final ServerName regionLocation = getRegionServer(result, replicaId);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> final long openSeqNum = hrl.getSeqNum();<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> // TODO: move under trace, now is visible for debugging<a name="line.121"></a>
-<span class="sourceLineNo">122</span> LOG.info(<a name="line.122"></a>
-<span class="sourceLineNo">123</span> "Load hbase:meta entry region={}, regionState={}, lastHost={}, " +<a name="line.123"></a>
-<span class="sourceLineNo">124</span> "regionLocation={}, openSeqNum={}",<a name="line.124"></a>
-<span class="sourceLineNo">125</span> regionInfo.getEncodedName(), state, lastHost, regionLocation, openSeqNum);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> visitor.visitRegionState(result, regionInfo, state, regionLocation, lastHost, openSeqNum);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public void updateRegionLocation(RegionStateNode regionStateNode)<a name="line.130"></a>
-<span class="sourceLineNo">131</span> throws IOException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> if (regionStateNode.getRegionInfo().isMetaRegion()) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> updateMetaLocation(regionStateNode.getRegionInfo(), regionStateNode.getRegionLocation(),<a name="line.133"></a>
-<span class="sourceLineNo">134</span> regionStateNode.getState());<a name="line.134"></a>
-<span class="sourceLineNo">135</span> } else {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> long openSeqNum = regionStateNode.getState() == State.OPEN ? regionStateNode.getOpenSeqNum()<a name="line.136"></a>
-<span class="sourceLineNo">137</span> : HConstants.NO_SEQNUM;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> updateUserRegionLocation(regionStateNode.getRegionInfo(), regionStateNode.getState(),<a name="line.138"></a>
-<span class="sourceLineNo">139</span> regionStateNode.getRegionLocation(), openSeqNum,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> // The regionStateNode may have no procedure in a test scenario; allow for this.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> regionStateNode.getProcedure() != null ? regionStateNode.getProcedure().getProcId()<a name="line.141"></a>
-<span class="sourceLineNo">142</span> : Procedure.NO_PROC_ID);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> private void updateMetaLocation(RegionInfo regionInfo, ServerName serverName, State state)<a name="line.146"></a>
-<span class="sourceLineNo">147</span> throws IOException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> MetaTableLocator.setMetaLocation(master.getZooKeeper(), serverName, regionInfo.getReplicaId(),<a name="line.149"></a>
-<span class="sourceLineNo">150</span> state);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> } catch (KeeperException e) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> throw new IOException(e);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> private void updateUserRegionLocation(RegionInfo regionInfo, State state,<a name="line.156"></a>
-<span class="sourceLineNo">157</span> ServerName regionLocation, long openSeqNum,<a name="line.157"></a>
-<span class="sourceLineNo">158</span> long pid) throws IOException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> long time = EnvironmentEdgeManager.currentTime();<a name="line.159"></a>
-<span class="sourceLineNo">160</span> final int replicaId = regionInfo.getReplicaId();<a name="line.160"></a>
-<span class="sourceLineNo">161</span> final Put put = new Put(MetaTableAccessor.getMetaKeyForRegion(regionInfo), time);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> MetaTableAccessor.addRegionInfo(put, regionInfo);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> final StringBuilder info =<a name="line.163"></a>
-<span class="sourceLineNo">164</span> new StringBuilder("pid=").append(pid).append(" updating hbase:meta row=")<a name="line.164"></a>
-<span class="sourceLineNo">165</span> .append(regionInfo.getEncodedName()).append(", regionState=").append(state);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (openSeqNum >= 0) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> Preconditions.checkArgument(state == State.OPEN && regionLocation != null,<a name="line.167"></a>
-<span class="sourceLineNo">168</span> "Open region should be on a server");<a name="line.168"></a>
-<span class="sourceLineNo">169</span> MetaTableAccessor.addLocation(put, regionLocation, openSeqNum, replicaId);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> // only update replication barrier for default replica<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID &&<a name="line.171"></a>
-<span class="sourceLineNo">172</span> hasGlobalReplicationScope(regionInfo.getTable())) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> MetaTableAccessor.addReplicationBarrier(put, openSeqNum);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> info.append(", repBarrier=").append(openSeqNum);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> info.append(", openSeqNum=").append(openSeqNum);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> info.append(", regionLocation=").append(regionLocation);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> } else if (regionLocation != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // Ideally, if no regionLocation, write null to the hbase:meta but this will confuse clients<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // currently; they want a server to hit. TODO: Make clients wait if no location.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a name="line.181"></a>
-<span class="sourceLineNo">182</span> .setRow(put.getRow())<a name="line.182"></a>
-<span class="sourceLineNo">183</span> .setFamily(HConstants.CATALOG_FAMILY)<a name="line.183"></a>
-<span class="sourceLineNo">184</span> .setQualifier(getServerNameColumn(replicaId))<a name="line.184"></a>
-<span class="sourceLineNo">185</span> .setTimestamp(put.getTimestamp())<a name="line.185"></a>
-<span class="sourceLineNo">186</span> .setType(Cell.Type.Put)<a name="line.186"></a>
-<span class="sourceLineNo">187</span> .setValue(Bytes.toBytes(regionLocation.getServerName()))<a name="line.187"></a>
-<span class="sourceLineNo">188</span> .build());<a name="line.188"></a>
-<span class="sourceLineNo">189</span> info.append(", regionLocation=").append(regionLocation);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span> put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a name="line.191"></a>
-<span class="sourceLineNo">192</span> .setRow(put.getRow())<a name="line.192"></a>
-<span class="sourceLineNo">193</span> .setFamily(HConstants.CATALOG_FAMILY)<a name="line.193"></a>
-<span class="sourceLineNo">194</span> .setQualifier(getStateColumn(replicaId))<a name="line.194"></a>
-<span class="sourceLineNo">195</span> .setTimestamp(put.getTimestamp())<a name="line.195"></a>
-<span class="sourceLineNo">196</span> .setType(Cell.Type.Put)<a name="line.196"></a>
-<span class="sourceLineNo">197</span> .setValue(Bytes.toBytes(state.name()))<a name="line.197"></a>
-<span class="sourceLineNo">198</span> .build());<a name="line.198"></a>
-<span class="sourceLineNo">199</span> LOG.info(info.toString());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> updateRegionLocation(regionInfo, state, put);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> private void updateRegionLocation(RegionInfo regionInfo, State state, Put put)<a name="line.203"></a>
-<span class="sourceLineNo">204</span> throws IOException {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> try (Table table = master.getConnection().getTable(TableName.META_TABLE_NAME)) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> table.put(put);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> } catch (IOException e) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> // TODO: Revist!!!! Means that if a server is loaded, then we will abort our host!<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // In tests we abort the Master!<a name="line.209"></a>
-<span class="sourceLineNo">210</span> String msg = String.format("FAILED persisting region=%s state=%s",<a name="line.210"></a>
-<span class="sourceLineNo">211</span> regionInfo.getShortNameToLog(), state);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.error(msg, e);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> master.abort(msg, e);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> throw e;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> private long getOpenSeqNumForParentRegion(RegionInfo region) throws IOException {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> MasterFileSystem mfs = master.getMasterFileSystem();<a name="line.219"></a>
-<span class="sourceLineNo">220</span> long maxSeqId =<a name="line.220"></a>
-<span class="sourceLineNo">221</span> WALSplitter.getMaxRegionSequenceId(mfs.getFileSystem(), mfs.getRegionDir(region));<a name="line.221"></a>
-<span class="sourceLineNo">222</span> return maxSeqId > 0 ? maxSeqId + 1 : HConstants.NO_SEQNUM;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> // ============================================================================================<a name="line.225"></a>
-<span class="sourceLineNo">226</span> // Update Region Splitting State helpers<a name="line.226"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.wal.WALSplitter;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.zookeeper.KeeperException;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>/**<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * Store Region State to hbase:meta table.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>@InterfaceAudience.Private<a name="line.58"></a>
+<span class="sourceLineNo">059</span>public class RegionStateStore {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> private static final Logger LOG = LoggerFactory.getLogger(RegionStateStore.class);<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> /** The delimiter for meta columns for replicaIds &gt; 0 */<a name="line.62"></a>
+<span class="sourceLineNo">063</span> protected static final char META_REPLICA_ID_DELIMITER = '_';<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> private final MasterServices master;<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> public RegionStateStore(final MasterServices master) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> this.master = master;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> public interface RegionStateVisitor {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> void visitRegionState(Result result, RegionInfo regionInfo, State state,<a name="line.72"></a>
+<span class="sourceLineNo">073</span> ServerName regionLocation, ServerName lastHost, long openSeqNum);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> public void visitMeta(final RegionStateVisitor visitor) throws IOException {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> MetaTableAccessor.fullScanRegions(master.getConnection(), new MetaTableAccessor.Visitor() {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> final boolean isDebugEnabled = LOG.isDebugEnabled();<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public boolean visit(final Result r) throws IOException {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> if (r != null && !r.isEmpty()) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> long st = 0;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> if (LOG.isTraceEnabled()) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> st = System.currentTimeMillis();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span> visitMetaEntry(visitor, r);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> if (LOG.isTraceEnabled()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> long et = System.currentTimeMillis();<a name="line.89"></a>
+<span class="sourceLineNo">090</span> LOG.trace("[T] LOAD META PERF " + StringUtils.humanTimeDiff(et - st));<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> } else if (isDebugEnabled) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> LOG.debug("NULL result from meta - ignoring but this is strange.");<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span> return true;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span> });<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> private void visitMetaEntry(final RegionStateVisitor visitor, final Result result)<a name="line.100"></a>
+<span class="sourceLineNo">101</span> throws IOException {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> final RegionLocations rl = MetaTableAccessor.getRegionLocations(result);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (rl == null) return;<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> final HRegionLocation[] locations = rl.getRegionLocations();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (locations == null) return;<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> for (int i = 0; i < locations.length; ++i) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> final HRegionLocation hrl = locations[i];<a name="line.109"></a>
+<span class="sourceLineNo">110</span> if (hrl == null) continue;<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> final RegionInfo regionInfo = hrl.getRegion();<a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (regionInfo == null) continue;<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> final int replicaId = regionInfo.getReplicaId();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> final State state = getRegionState(result, replicaId);<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> final ServerName lastHost = hrl.getServerName();<a name="line.118"></a>
+<span class="sourceLineNo">119</span> final ServerName regionLocation = getRegionServer(result, replicaId);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> final long openSeqNum = hrl.getSeqNum();<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> // TODO: move under trace, now is visible for debugging<a name="line.122"></a>
+<span class="sourceLineNo">123</span> LOG.info(<a name="line.123"></a>
+<span class="sourceLineNo">124</span> "Load hbase:meta entry region={}, regionState={}, lastHost={}, " +<a name="line.124"></a>
+<span class="sourceLineNo">125</span> "regionLocation={}, openSeqNum={}",<a name="line.125"></a>
+<span class="sourceLineNo">126</span> regionInfo.getEncodedName(), state, lastHost, regionLocation, openSeqNum);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> visitor.visitRegionState(result, regionInfo, state, regionLocation, lastHost, openSeqNum);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> public void updateRegionLocation(RegionStateNode regionStateNode)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (regionStateNode.getRegionInfo().isMetaRegion()) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> updateMetaLocation(regionStateNode.getRegionInfo(), regionStateNode.getRegionLocation(),<a name="line.134"></a>
+<span class="sourceLineNo">135</span> regionStateNode.getState());<a name="line.135"></a>
+<span class="sourceLineNo">136</span> } else {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> long openSeqNum = regionStateNode.getState() == State.OPEN ? regionStateNode.getOpenSeqNum()<a name="line.137"></a>
+<span class="sourceLineNo">138</span> : HConstants.NO_SEQNUM;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> updateUserRegionLocation(regionStateNode.getRegionInfo(), regionStateNode.getState(),<a name="line.139"></a>
+<span class="sourceLineNo">140</span> regionStateNode.getRegionLocation(), openSeqNum,<a name="line.140"></a>
+<span class="sourceLineNo">141</span> // The regionStateNode may have no procedure in a test scenario; allow for this.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> regionStateNode.getProcedure() != null ? regionStateNode.getProcedure().getProcId()<a name="line.142"></a>
+<span class="sourceLineNo">143</span> : Procedure.NO_PROC_ID);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> private void updateMetaLocation(RegionInfo regionInfo, ServerName serverName, State state)<a name="line.147"></a>
+<span class="sourceLineNo">148</span> throws IOException {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> try {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> MetaTableLocator.setMetaLocation(master.getZooKeeper(), serverName, regionInfo.getReplicaId(),<a name="line.150"></a>
+<span class="sourceLineNo">151</span> state);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> } catch (KeeperException e) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> throw new IOException(e);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> private void updateUserRegionLocation(RegionInfo regionInfo, State state,<a name="line.157"></a>
+<span class="sourceLineNo">158</span> ServerName regionLocation, long openSeqNum,<a name="line.158"></a>
+<span class="sourceLineNo">159</span> long pid) throws IOException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> long time = EnvironmentEdgeManager.currentTime();<a name="line.160"></a>
+<span class="sourceLineNo">161</span> final int replicaId = regionInfo.getReplicaId();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> final Put put = new Put(MetaTableAccessor.getMetaKeyForRegion(regionInfo), time);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> MetaTableAccessor.addRegionInfo(put, regionInfo);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> final StringBuilder info =<a name="line.164"></a>
+<span class="sourceLineNo">165</span> new StringBuilder("pid=").append(pid).append(" updating hbase:meta row=")<a name="line.165"></a>
+<span class="sourceLineNo">166</span> .append(regionInfo.getEncodedName()).append(", regionState=").append(state);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> if (openSeqNum >= 0) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> Preconditions.checkArgument(state == State.OPEN && regionLocation != null,<a name="line.168"></a>
+<span class="sourceLineNo">169</span> "Open region should be on a server");<a name="line.169"></a>
+<span class="sourceLineNo">170</span> MetaTableAccessor.addLocation(put, regionLocation, openSeqNum, replicaId);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> // only update replication barrier for default replica<a name="line.171"></a>
+<span class="sourceLineNo">172</span> if (regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID &&<a name="line.172"></a>
+<span class="sourceLineNo">173</span> hasGlobalReplicationScope(regionInfo.getTable())) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> MetaTableAccessor.addReplicationBarrier(put, openSeqNum);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> info.append(", repBarrier=").append(openSeqNum);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span> info.append(", openSeqNum=").append(openSeqNum);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> info.append(", regionLocation=").append(regionLocation);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> } else if (regionLocation != null) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // Ideally, if no regionLocation, write null to the hbase:meta but this will confuse clients<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // currently; they want a server to hit. TODO: Make clients wait if no location.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a name="line.182"></a>
+<span class="sourceLineNo">183</span> .setRow(put.getRow())<a name="line.183"></a>
+<span class="sourceLineNo">184</span> .setFamily(HConstants.CATALOG_FAMILY)<a name="line.184"></a>
+<span class="sourceLineNo">185</span> .setQualifier(getServerNameColumn(replicaId))<a name="line.185"></a>
+<span class="sourceLineNo">186</span> .setTimestamp(put.getTimestamp())<a name="line.186"></a>
+<span class="sourceLineNo">187</span> .setType(Cell.Type.Put)<a name="line.187"></a>
+<span class="sourceLineNo">188</span> .setValue(Bytes.toBytes(regionLocation.getServerName()))<a name="line.188"></a>
+<span class="sourceLineNo">189</span> .build());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> info.append(", regionLocation=").append(regionLocation);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> put.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY)<a name="line.192"></a>
+<span class="sourceLineNo">193</span> .setRow(put.getRow())<a name="line.193"></a>
+<span class="sourceLineNo">194</span> .setFamily(HConstants.CATALOG_FAMILY)<a name="line.194"></a>
+<span class="sourceLineNo">195</span> .setQualifier(getStateColumn(replicaId))<a name="line.195"></a>
+<span class="sourceLineNo">196</span> .setTimestamp(put.getTimestamp())<a name="line.196"></a>
+<span class="sourceLineNo">197</span> .setType(Cell.Type.Put)<a name="line.197"></a>
+<span class="sourceLineNo">198</span> .setValue(Bytes.toBytes(state.name()))<a name="line.198"></a>
+<span class="sourceLineNo">199</span> .build());<a name="line.199"></a>
+<span class="sourceLineNo">200</span> LOG.info(info.toString());<a name="line.200"></a>
+<span class="sourceLineNo">201</span> updateRegionLocation(regionInfo, state, put);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> private void updateRegionLocation(RegionInfo regionInfo, State state, Put put)<a name="line.204"></a>
+<span class="sourceLineNo">205</span> throws IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> try (Table table = master.getConnection().getTable(TableName.META_TABLE_NAME)) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> table.put(put);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> } catch (IOException e) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> // TODO: Revist!!!! Means that if a server is loaded, then we will abort our host!<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // In tests we abort the Master!<a name="line.210"></a>
+<span class="sourceLineNo">211</span> String msg = String.format("FAILED persisting region=%s state=%s",<a name="line.211"></a>
+<span class="sourceLineNo">212</span> regionInfo.getShortNameToLog(), state);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> LOG.error(msg, e);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> master.abort(msg, e);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> throw e;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private long getOpenSeqNumForParentRegion(RegionInfo region) throws IOException {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> FileSystem walFS = master.getMasterWalManager().getFileSystem();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> long maxSeqId =<a name="line.221"></a>
+<span class="sourceLineNo">222</span> WALSplitter.getMaxRegionSequenceId(walFS, FSUtils.getWALRegionDir(<a name="line.222"></a>
+<span class="sourceLineNo">223</span> master.getConfiguration(), region.getTable(), region.getEncodedName()));<a name="line.223"></a>
+<span class="sourceLineNo">224</span> return maxSeqId > 0 ? maxSeqId + 1 : HConstants.NO_SEQNUM;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
<span class="sourceLineNo">227</span> // ============================================================================================<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public void splitRegion(RegionInfo parent, RegionInfo hriA, RegionInfo hriB,<a name="line.228"></a>
-<span class="sourceLineNo">229</span> ServerName serverName) throws IOException {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> TableDescriptor htd = getTableDescriptor(parent.getTable());<a name="line.230"></a>
-<span class="sourceLineNo">231</span> long parentOpenSeqNum = HConstants.NO_SEQNUM;<a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (htd.hasGlobalReplicationScope()) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> parentOpenSeqNum = getOpenSeqNumForParentRegion(parent);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> MetaTableAccessor.splitRegion(master.getConnection(), parent, parentOpenSeqNum, hriA, hriB,<a name="line.235"></a>
-<span class="sourceLineNo">236</span> serverName, getRegionReplication(htd));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> // ============================================================================================<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // Update Region Merging State helpers<a name="line.240"></a>
+<span class="sourceLineNo">228</span> // Update Region Splitting State helpers<a name="line.228"></a>
+<span class="sourceLineNo">229</span> // ============================================================================================<a name="line.229"></a>
+<span class="sourceLineNo">230</span> public void splitRegion(RegionInfo parent, RegionInfo hriA, RegionInfo hriB,<a name="line.230"></a>
+<span class="sourceLineNo">231</span> ServerName serverName) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> TableDescriptor htd = getTableDescriptor(parent.getTable());<a name="line.232"></a>
+<span class="sourceLineNo">233</span> long parentOpenSeqNum = HConstants.NO_SEQNUM;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (htd.hasGlobalReplicationScope()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> parentOpenSeqNum = getOpenSeqNumForParentRegion(parent);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> MetaTableAccessor.splitRegion(master.getConnection(), parent, parentOpenSeqNum, hriA, hriB,<a name="line.237"></a>
+<span class="sourceLineNo">238</span> serverName, getRegionReplication(htd));<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
<span class="sourceLineNo">241</span> // ============================================================================================<a name="line.241"></a>
-<span class="sourceLineNo">242</span> public void mergeRegions(RegionInfo child, RegionInfo hriA, RegionInfo hriB,<a name="line.242"></a>
-<span class="sourceLineNo">243</span> ServerName serverName) throws IOException {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> TableDescriptor htd = getTableDescriptor(child.getTable());<a name="line.244"></a>
-<span class="sourceLineNo">245</span> long regionAOpenSeqNum = -1L;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> long regionBOpenSeqNum = -1L;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (htd.hasGlobalReplicationScope()) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> regionAOpenSeqNum = getOpenSeqNumForParentRegion(hriA);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> regionBOpenSeqNum = getOpenSeqNumForParentRegion(hriB);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> MetaTableAccessor.mergeRegions(master.getConnection(), child, hriA, regionAOpenSeqNum, hriB,<a name="line.251"></a>
-<span class="sourceLineNo">252</span> regionBOpenSeqNum, serverName, getRegionReplication(htd));<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> // ============================================================================================<a name="line.255"></a>
-<span class="sourceLineNo">256</span> // Delete Region State helpers<a name="line.256"></a>
+<span class="sourceLineNo">242</span> // Update Region Merging State helpers<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // ============================================================================================<a name="line.243"></a>
+<span class="sourceLineNo">244</span> public void mergeRegions(RegionInfo child, RegionInfo hriA, RegionInfo hriB,<a name="line.244"></a>
+<span class="sourceLineNo">245</span> ServerName serverName) throws IOException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> TableDescriptor htd = getTableDescriptor(child.getTable());<a name="line.246"></a>
+<span class="sourceLineNo">247</span> long regionAOpenSeqNum = -1L;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> long regionBOpenSeqNum = -1L;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (htd.hasGlobalReplicationScope()) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> regionAOpenSeqNum = getOpenSeqNumForParentRegion(hriA);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> regionBOpenSeqNum = getOpenSeqNumForParentRegion(hriB);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> MetaTableAccessor.mergeRegions(master.getConnection(), child, hriA, regionAOpenSeqNum, hriB,<a name="line.253"></a>
+<span class="sourceLineNo">254</span> regionBOpenSeqNum, serverName, getRegionReplication(htd));<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
<span class="sourceLineNo">257</span> // ============================================================================================<a name="line.257"></a>
-<span class="sourceLineNo">258</span> public void deleteRegion(final RegionInfo regionInfo) throws IOException {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> deleteRegions(Collections.singletonList(regionInfo));<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> public void deleteRegions(final List<RegionInfo> regions) throws IOException {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> MetaTableAccessor.deleteRegions(master.getConnection(), regions);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> // ==========================================================================<a name="line.266"></a>
-<span class="sourceLineNo">267</span> // Table Descriptors helpers<a name="line.267"></a>
+<span class="sourceLineNo">258</span> // Delete Region State helpers<a name="line.258"></a>
+<span class="sourceLineNo">259</span> // ============================================================================================<a name="line.259"></a>
+<span class="sourceLineNo">260</span> public void deleteRegion(final RegionInfo regionInfo) throws IOException {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> deleteRegions(Collections.singletonList(regionInfo));<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> public void deleteRegions(final List<RegionInfo> regions) throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> MetaTableAccessor.deleteRegions(master.getConnection(), regions);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
<span class="sourceLineNo">268</span> // ==========================================================================<a name="line.268"></a>
-<span class="sourceLineNo">269</span> private boolean hasGlobalReplicationScope(TableName tableName) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return hasGlobalReplicationScope(getTableDescriptor(tableName));<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> private boolean hasGlobalReplicationScope(TableDescriptor htd) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> return htd != null ? htd.hasGlobalReplicationScope() : false;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> private int getRegionReplication(TableDescriptor htd) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> return htd != null ? htd.getRegionReplication() : 1;<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> private TableDescriptor getTableDescriptor(TableName tableName) throws IOException {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> return master.getTableDescriptors().get(tableName);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> // ==========================================================================<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // Server Name<a name="line.286"></a>
+<span class="sourceLineNo">269</span> // Table Descriptors helpers<a name="line.269"></a>
+<span class="sourceLineNo">270</span> // ==========================================================================<a name="line.270"></a>
+<span class="sourceLineNo">271</span> private boolean hasGlobalReplicationScope(TableName tableName) throws IOException {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return hasGlobalReplicationScope(getTableDescriptor(tableName));<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> private boolean hasGlobalReplicationScope(TableDescriptor htd) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return htd != null ? htd.hasGlobalReplicationScope() : false;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span> private int getRegionReplication(TableDescriptor htd) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> return htd != null ? htd.getRegionReplication() : 1;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> private TableDescriptor getTableDescriptor(TableName tableName) throws IOException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return master.getTableDescriptors().get(tableName);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
<span class="sourceLineNo">287</span> // ==========================================================================<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * Returns the {@link ServerName} from catalog table {@link Result}<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * where the region is transitioning. It should be the same as<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * {@link MetaTableAccessor#getServerName(Result,int)} if the server is at OPEN state.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * @param r Result to pull the transitioning server name from<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @return A ServerName instance or {@link MetaTableAccessor#getServerName(Result,int)}<a name="line.294"></a>
-<span class="sourceLineNo">295</span> * if necessary fields not found or empty.<a name="line.295"></a>
-<span class="sourceLineNo">296</span> */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> static ServerName getRegionServer(final Result r, int replicaId) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> final Cell cell = r.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.298"></a>
-<span class="sourceLineNo">299</span> getServerNameColumn(replicaId));<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (cell == null || cell.getValueLength() == 0) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(r);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> if (locations != null) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> HRegionLocation location = locations.getRegionLocation(replicaId);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (location != null) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return location.getServerName();<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return null;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return ServerName.parseServerName(Bytes.toString(cell.getValueArray(),<a name="line.310"></a>
-<span class="sourceLineNo">311</span> cell.getValueOffset(), cell.getValueLength()));<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> private static byte[] getServerNameColumn(int replicaId) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return replicaId == 0<a name="line.315"></a>
-<span class="sourceLineNo">316</span> ? HConstants.SERVERNAME_QUALIFIER<a name="line.316"></a>
-<span class="sourceLineNo">317</span> : Bytes.toBytes(HConstants.SERVERNAME_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a name="line.317"></a>
-<span class="sourceLineNo">318</span> + String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> // ==========================================================================<a name="line.321"></a>
-<span class="sourceLineNo">322</span> // Region State<a name="line.322"></a>
+<span class="sourceLineNo">288</span> // Server Name<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // ==========================================================================<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * Returns the {@link ServerName} from catalog table {@link Result}<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * where the region is transitioning. It should be the same as<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * {@link MetaTableAccessor#getServerName(Result,int)} if the server is at OPEN state.<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * @param r Result to pull the transitioning server name from<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * @return A ServerName instance or {@link MetaTableAccessor#getServerName(Result,int)}<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * if necessary fields not found or empty.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> static ServerName getRegionServer(final Result r, int replicaId) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> final Cell cell = r.getColumnLatestCell(HConstants.CATALOG_FAMILY,<a name="line.300"></a>
+<span class="sourceLineNo">301</span> getServerNameColumn(replicaId));<a name="line.301"></a>
+<span class="sourceLineNo">302</span> if (cell == null || cell.getValueLength() == 0) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(r);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> if (locations != null) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> HRegionLocation location = locations.getRegionLocation(replicaId);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> if (location != null) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> return location.getServerName();<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span> return null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return ServerName.parseServerName(Bytes.toString(cell.getValueArray(),<a name="line.312"></a>
+<span class="sourceLineNo">313</span> cell.getValueOffset(), cell.getValueLength()));<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> private static byte[] getServerNameColumn(int replicaId) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> return replicaId == 0<a name="line.317"></a>
+<span class="sourceLineNo">318</span> ? HConstants.SERVERNAME_QUALIFIER<a name="line.318"></a>
+<span class="sourceLineNo">319</span> : Bytes.toBytes(HConstants.SERVERNAME_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a name="line.319"></a>
+<span class="sourceLineNo">320</span> + String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
<span class="sourceLineNo">323</span> // ==========================================================================<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Pull the region state from a catalog table {@link Result}.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * @param r Result to pull the region state from<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @return the region state, or null if unknown.<a name="line.328"></a>
-<span class="sourceLineNo">329</span> */<a name="line.329"></a>
-<span class="sourceLineNo">330</span> @VisibleForTesting<a name="line.330"></a>
-<span class="sourceLineNo">331</span> public static State getRegionState(final Result r, int replicaId) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> Cell cell = r.getColumnLatestCell(HConstants.CATALOG_FAMILY, getStateColumn(replicaId));<a name="line.332"></a>
-<span class="sourceLineNo">333</span> if (cell == null || cell.getValueLength() == 0) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> return null;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return State.valueOf(Bytes.toString(cell.getValueArray(), cell.getValueOffset(),<a name="line.336"></a>
-<span class="sourceLineNo">337</span> cell.getValueLength()));<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> private static byte[] getStateColumn(int replicaId) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return replicaId == 0<a name="line.341"></a>
-<span class="sourceLineNo">342</span> ? HConstants.STATE_QUALIFIER<a name="line.342"></a>
-<span class="sourceLineNo">343</span> : Bytes.toBytes(HConstants.STATE_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a name="line.343"></a>
-<span class="sourceLineNo">344</span> + String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span>}<a name="line.346"></a>
+<span class="sourceLineNo">324</span> // Region State<a name="line.324"></a>
+<span class="sourceLineNo">325</span> // ==========================================================================<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * Pull the region state from a catalog table {@link Result}.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param r Result to pull the region state from<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @return the region state, or null if unknown.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> @VisibleForTesting<a name="line.332"></a>
+<span class="sourceLineNo">333</span> public static State getRegionState(final Result r, int replicaId) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> Cell cell = r.getColumnLatestCell(HConstants.CATALOG_FAMILY, getStateColumn(replicaId));<a name="line.334"></a>
+<span class="sourceLineNo">335</span> if (cell == null || cell.getValueLength() == 0) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> return null;<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span> return State.valueOf(Bytes.toString(cell.getValueArray(), cell.getValueOffset(),<a name="line.338"></a>
+<span class="sourceLineNo">339</span> cell.getValueLength()));<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> private static byte[] getStateColumn(int replicaId) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> return replicaId == 0<a name="line.343"></a>
+<span class="sourceLineNo">344</span> ? HConstants.STATE_QUALIFIER<a name="line.344"></a>
+<span class="sourceLineNo">345</span> : Bytes.toBytes(HConstants.STATE_QUALIFIER_STR + META_REPLICA_ID_DELIMITER<a name="line.345"></a>
+<span class="sourceLineNo">346</span> + String.format(RegionInfo.REPLICA_ID_FORMAT, replicaId));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>}<a name="line.348"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/37cf49a6/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
index 475f5b2..2736ca7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.StoreFileSplitter.html
@@ -836,35 +836,37 @@
<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> private void writeMaxSequenceIdFile(MasterProcedureEnv env) throws IOException {<a name="line.830"></a>
-<span class="sourceLineNo">831</span> FileSystem fs = env.getMasterServices().getMasterFileSystem().getFileSystem();<a name="line.831"></a>
+<span class="sourceLineNo">831</span> FileSystem walFS = env.getMasterServices().getMasterWalManager().getFileSystem();<a name="line.831"></a>
<span class="sourceLineNo">832</span> long maxSequenceId =<a name="line.832"></a>
-<span class="sourceLineNo">833</span> WALSplitter.getMaxRegionSequenceId(fs, getRegionDir(env, getParentRegion()));<a name="line.833"></a>
+<span class="sourceLineNo">833</span> WALSplitter.getMaxRegionSequenceId(walFS, getWALRegionDir(env, getParentRegion()));<a name="line.833"></a>
<span class="sourceLineNo">834</span> if (maxSequenceId > 0) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span> WALSplitter.writeRegionSequenceIdFile(fs, getRegionDir(env, daughter_1_RI), maxSequenceId);<a name="line.835"></a>
-<span class="sourceLineNo">836</span> WALSplitter.writeRegionSequenceIdFile(fs, getRegionDir(env, daughter_2_RI), maxSequenceId);<a name="line.836"></a>
-<span class="sourceLineNo">837</span> }<a name="line.837"></a>
-<span class="sourceLineNo">838</span> }<a name="line.838"></a>
-<span class="sourceLineNo">839</span><a name="line.839"></a>
-<span class="sourceLineNo">840</span> /**<a name="line.840"></a>
-<span class="sourceLineNo">841</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.841"></a>
-<span class="sourceLineNo">842</span> * retrieve it.<a name="line.842"></a>
-<span class="sourceLineNo">843</span> * @return traceEnabled<a name="line.843"></a>
-<span class="sourceLineNo">844</span> */<a name="line.844"></a>
-<span class="sourceLineNo">845</span> private boolean isTraceEnabled() {<a name="line.845"></a>
-<span class="sourceLineNo">846</span> if (traceEnabled == null) {<a name="line.846"></a>
-<span class="sourceLineNo">847</span> traceEnabled = LOG.isTraceEnabled();<a name="line.847"></a>
-<span class="sourceLineNo">848</span> }<a name="line.848"></a>
-<span class="sourceLineNo">849</span> return traceEnabled;<a name="line.849"></a>
-<span class="sourceLineNo">850</span> }<a name="line.850"></a>
-<span class="sourceLineNo">851</span><a name="line.851"></a>
-<span class="sourceLineNo">852</span> @Override<a name="line.852"></a>
-<span class="sourceLineNo">853</span> protected boolean abort(MasterProcedureEnv env) {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> // Abort means rollback. We can't rollback all steps. HBASE-18018 added abort to all<a name="line.854"></a>
-<span class="sourceLineNo">855</span> // Procedures. Here is a Procedure that has a PONR and cannot be aborted wants it enters this<a name="line.855"></a>
-<span class="sourceLineNo">856</span> // range of steps; what do we do for these should an operator want to cancel them? HBASE-20022.<a name="line.856"></a>
-<span class="sourceLineNo">857</span> return isRollbackSupported(getCurrentState())? super.abort(env): false;<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">835</span> WALSplitter.writeRegionSequenceIdFile(walFS, getWALRegionDir(env, daughter_1_RI),<a name="line.835"></a>
+<span class="sourceLineNo">836</span> maxSequenceId);<a name="line.836"></a>
+<span class="sourceLineNo">837</span> WALSplitter.writeRegionSequenceIdFile(walFS, getWALRegionDir(env, daughter_2_RI),<a name="line.837"></a>
+<span class="sourceLineNo">838</span> maxSequenceId);<a name="line.838"></a>
+<span class="sourceLineNo">839</span> }<a name="line.839"></a>
+<span class="sourceLineNo">840</span> }<a name="line.840"></a>
+<span class="sourceLineNo">841</span><a name="line.841"></a>
+<span class="sourceLineNo">842</span> /**<a name="line.842"></a>
+<span class="sourceLineNo">843</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.843"></a>
+<span class="sourceLineNo">844</span> * retrieve it.<a name="line.844"></a>
+<span class="sourceLineNo">845</span> * @return traceEnabled<a name="line.845"></a>
+<span class="sourceLineNo">846</span> */<a name="line.846"></a>
+<span class="sourceLineNo">847</span> private boolean isTraceEnabled() {<a name="line.847"></a>
+<span class="sourceLineNo">848</span> if (traceEnabled == null) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span> traceEnabled = LOG.isTraceEnabled();<a name="line.849"></a>
+<span class="sourceLineNo">850</span> }<a name="line.850"></a>
+<span class="sourceLineNo">851</span> return traceEnabled;<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> @Override<a name="line.854"></a>
+<span class="sourceLineNo">855</span> protected boolean abort(MasterProcedureEnv env) {<a name="line.855"></a>
+<span class="sourceLineNo">856</span> // Abort means rollback. We can't rollback all steps. HBASE-18018 added abort to all<a name="line.856"></a>
+<span class="sourceLineNo">857</span> // Procedures. Here is a Procedure that has a PONR and cannot be aborted wants it enters this<a name="line.857"></a>
+<span class="sourceLineNo">858</span> // range of steps; what do we do for these should an operator want to cancel them? HBASE-20022.<a name="line.858"></a>
+<span class="sourceLineNo">859</span> return isRollbackSupported(getCurrentState())? super.abort(env): false;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/37cf49a6/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
index 475f5b2..2736ca7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html
@@ -836,35 +836,37 @@
<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> private void writeMaxSequenceIdFile(MasterProcedureEnv env) throws IOException {<a name="line.830"></a>
-<span class="sourceLineNo">831</span> FileSystem fs = env.getMasterServices().getMasterFileSystem().getFileSystem();<a name="line.831"></a>
+<span class="sourceLineNo">831</span> FileSystem walFS = env.getMasterServices().getMasterWalManager().getFileSystem();<a name="line.831"></a>
<span class="sourceLineNo">832</span> long maxSequenceId =<a name="line.832"></a>
-<span class="sourceLineNo">833</span> WALSplitter.getMaxRegionSequenceId(fs, getRegionDir(env, getParentRegion()));<a name="line.833"></a>
+<span class="sourceLineNo">833</span> WALSplitter.getMaxRegionSequenceId(walFS, getWALRegionDir(env, getParentRegion()));<a name="line.833"></a>
<span class="sourceLineNo">834</span> if (maxSequenceId > 0) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span> WALSplitter.writeRegionSequenceIdFile(fs, getRegionDir(env, daughter_1_RI), maxSequenceId);<a name="line.835"></a>
-<span class="sourceLineNo">836</span> WALSplitter.writeRegionSequenceIdFile(fs, getRegionDir(env, daughter_2_RI), maxSequenceId);<a name="line.836"></a>
-<span class="sourceLineNo">837</span> }<a name="line.837"></a>
-<span class="sourceLineNo">838</span> }<a name="line.838"></a>
-<span class="sourceLineNo">839</span><a name="line.839"></a>
-<span class="sourceLineNo">840</span> /**<a name="line.840"></a>
-<span class="sourceLineNo">841</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.841"></a>
-<span class="sourceLineNo">842</span> * retrieve it.<a name="line.842"></a>
-<span class="sourceLineNo">843</span> * @return traceEnabled<a name="line.843"></a>
-<span class="sourceLineNo">844</span> */<a name="line.844"></a>
-<span class="sourceLineNo">845</span> private boolean isTraceEnabled() {<a name="line.845"></a>
-<span class="sourceLineNo">846</span> if (traceEnabled == null) {<a name="line.846"></a>
-<span class="sourceLineNo">847</span> traceEnabled = LOG.isTraceEnabled();<a name="line.847"></a>
-<span class="sourceLineNo">848</span> }<a name="line.848"></a>
-<span class="sourceLineNo">849</span> return traceEnabled;<a name="line.849"></a>
-<span class="sourceLineNo">850</span> }<a name="line.850"></a>
-<span class="sourceLineNo">851</span><a name="line.851"></a>
-<span class="sourceLineNo">852</span> @Override<a name="line.852"></a>
-<span class="sourceLineNo">853</span> protected boolean abort(MasterProcedureEnv env) {<a name="line.853"></a>
-<span class="sourceLineNo">854</span> // Abort means rollback. We can't rollback all steps. HBASE-18018 added abort to all<a name="line.854"></a>
-<span class="sourceLineNo">855</span> // Procedures. Here is a Procedure that has a PONR and cannot be aborted wants it enters this<a name="line.855"></a>
-<span class="sourceLineNo">856</span> // range of steps; what do we do for these should an operator want to cancel them? HBASE-20022.<a name="line.856"></a>
-<span class="sourceLineNo">857</span> return isRollbackSupported(getCurrentState())? super.abort(env): false;<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">835</span> WALSplitter.writeRegionSequenceIdFile(walFS, getWALRegionDir(env, daughter_1_RI),<a name="line.835"></a>
+<span class="sourceLineNo">836</span> maxSequenceId);<a name="line.836"></a>
+<span class="sourceLineNo">837</span> WALSplitter.writeRegionSequenceIdFile(walFS, getWALRegionDir(env, daughter_2_RI),<a name="line.837"></a>
+<span class="sourceLineNo">838</span> maxSequenceId);<a name="line.838"></a>
+<span class="sourceLineNo">839</span> }<a name="line.839"></a>
+<span class="sourceLineNo">840</span> }<a name="line.840"></a>
+<span class="sourceLineNo">841</span><a name="line.841"></a>
+<span class="sourceLineNo">842</span> /**<a name="line.842"></a>
+<span class="sourceLineNo">843</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.843"></a>
+<span class="sourceLineNo">844</span> * retrieve it.<a name="line.844"></a>
+<span class="sourceLineNo">845</span> * @return traceEnabled<a name="line.845"></a>
+<span class="sourceLineNo">846</span> */<a name="line.846"></a>
+<span class="sourceLineNo">847</span> private boolean isTraceEnabled() {<a name="line.847"></a>
+<span class="sourceLineNo">848</span> if (traceEnabled == null) {<a name="line.848"></a>
+<span class="sourceLineNo">849</span> traceEnabled = LOG.isTraceEnabled();<a name="line.849"></a>
+<span class="sourceLineNo">850</span> }<a name="line.850"></a>
+<span class="sourceLineNo">851</span> return traceEnabled;<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> @Override<a name="line.854"></a>
+<span class="sourceLineNo">855</span> protected boolean abort(MasterProcedureEnv env) {<a name="line.855"></a>
+<span class="sourceLineNo">856</span> // Abort means rollback. We can't rollback all steps. HBASE-18018 added abort to all<a name="line.856"></a>
+<span class="sourceLineNo">857</span> // Procedures. Here is a Procedure that has a PONR and cannot be aborted wants it enters this<a name="line.857"></a>
+<span class="sourceLineNo">858</span> // range of steps; what do we do for these should an operator want to cancel them? HBASE-20022.<a name="line.858"></a>
+<span class="sourceLineNo">859</span> return isRollbackSupported(getCurrentState())? super.abort(env): false;<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>