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 2017/10/12 15:13:29 UTC
[07/19] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TimeToLiveProcedureWALCleaner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TimeToLiveProcedureWALCleaner.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TimeToLiveProcedureWALCleaner.html
new file mode 100644
index 0000000..a110a71
--- /dev/null
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TimeToLiveProcedureWALCleaner.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership. The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License. You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master.cleaner;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.commons.logging.Log;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.commons.logging.LogFactory;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.fs.FileStatus;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureUtil;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>/**<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Procedure WAL cleaner that uses the timestamp of the Procedure WAL to determine if it should be<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * deleted. By default they are allowed to live for {@value #DEFAULT_TTL}<a name="line.31"></a>
+<span class="sourceLineNo">032</span> */<a name="line.32"></a>
+<span class="sourceLineNo">033</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.33"></a>
+<span class="sourceLineNo">034</span>public class TimeToLiveProcedureWALCleaner extends BaseFileCleanerDelegate {<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> private static final Log LOG = LogFactory.getLog(TimeToLiveProcedureWALCleaner.class.getName());<a name="line.36"></a>
+<span class="sourceLineNo">037</span> public static final String TTL_CONF_KEY = "hbase.master.procedurewalcleaner.ttl";<a name="line.37"></a>
+<span class="sourceLineNo">038</span> // default ttl = 7 days<a name="line.38"></a>
+<span class="sourceLineNo">039</span> public static final long DEFAULT_TTL = 604_800_000L;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> // Configured time a procedure log can be kept after it was moved to the archive<a name="line.40"></a>
+<span class="sourceLineNo">041</span> private long ttl;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private boolean stopped = false;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span> @Override<a name="line.44"></a>
+<span class="sourceLineNo">045</span> public void setConf(Configuration conf) {<a name="line.45"></a>
+<span class="sourceLineNo">046</span> this.ttl = conf.getLong(TTL_CONF_KEY, DEFAULT_TTL);<a name="line.46"></a>
+<span class="sourceLineNo">047</span> super.setConf(conf);<a name="line.47"></a>
+<span class="sourceLineNo">048</span> }<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span> @Override<a name="line.50"></a>
+<span class="sourceLineNo">051</span> public boolean isFileDeletable(FileStatus fStat) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> // Files are validated for the second time here,<a name="line.52"></a>
+<span class="sourceLineNo">053</span> // if it causes a bottleneck this logic needs refactored<a name="line.53"></a>
+<span class="sourceLineNo">054</span> if (!MasterProcedureUtil.validateProcedureWALFilename(fStat.getPath().getName())) {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> return true;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> long currentTime = EnvironmentEdgeManager.currentTime();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> long time = fStat.getModificationTime();<a name="line.59"></a>
+<span class="sourceLineNo">060</span> long life = currentTime - time;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> if (LOG.isTraceEnabled()) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> LOG.trace("Procedure log life:" + life + ", ttl:" + ttl + ", current:" + currentTime +<a name="line.62"></a>
+<span class="sourceLineNo">063</span> ", from: " + time);<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span> if (life < 0) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> LOG.warn("Found a procedure log (" + fStat.getPath() + ") newer than current time ("<a name="line.66"></a>
+<span class="sourceLineNo">067</span> + currentTime + " < " + time + "), probably a clock skew");<a name="line.67"></a>
+<span class="sourceLineNo">068</span> return false;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> }<a name="line.69"></a>
+<span class="sourceLineNo">070</span> return life > ttl;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span> public void stop(String why) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> this.stopped = true;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
+<span class="sourceLineNo">079</span> public boolean isStopped() {<a name="line.79"></a>
+<span class="sourceLineNo">080</span> return this.stopped;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>}<a name="line.82"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.NonceProcedureRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.NonceProcedureRunnable.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.NonceProcedureRunnable.html
index ba58ee0..777dc5c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.NonceProcedureRunnable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.NonceProcedureRunnable.html
@@ -27,129 +27,145 @@
<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.master.procedure;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RPCProtos.UserInformation;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.security.User;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.NonceKey;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.security.UserGroupInformation;<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>@InterfaceAudience.Private<a name="line.35"></a>
-<span class="sourceLineNo">036</span>@InterfaceStability.Evolving<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public final class MasterProcedureUtil {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> private static final Log LOG = LogFactory.getLog(MasterProcedureUtil.class);<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> private MasterProcedureUtil() {}<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span> public static UserInformation toProtoUserInfo(User user) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> UserInformation.Builder userInfoPB = UserInformation.newBuilder();<a name="line.43"></a>
-<span class="sourceLineNo">044</span> userInfoPB.setEffectiveUser(user.getName());<a name="line.44"></a>
-<span class="sourceLineNo">045</span> if (user.getUGI().getRealUser() != null) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span> userInfoPB.setRealUser(user.getUGI().getRealUser().getUserName());<a name="line.46"></a>
-<span class="sourceLineNo">047</span> }<a name="line.47"></a>
-<span class="sourceLineNo">048</span> return userInfoPB.build();<a name="line.48"></a>
-<span class="sourceLineNo">049</span> }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> public static User toUserInfo(UserInformation userInfoProto) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> if (userInfoProto.hasEffectiveUser()) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> String effectiveUser = userInfoProto.getEffectiveUser();<a name="line.53"></a>
-<span class="sourceLineNo">054</span> if (userInfoProto.hasRealUser()) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> String realUser = userInfoProto.getRealUser();<a name="line.55"></a>
-<span class="sourceLineNo">056</span> UserGroupInformation realUserUgi = UserGroupInformation.createRemoteUser(realUser);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> return User.create(UserGroupInformation.createProxyUser(effectiveUser, realUserUgi));<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> return User.create(UserGroupInformation.createRemoteUser(effectiveUser));<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span> return null;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * Helper Runnable used in conjunction with submitProcedure() to deal with<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * submitting procs with nonce.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * See submitProcedure() for an example.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> */<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public static abstract class NonceProcedureRunnable {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private final MasterServices master;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private final NonceKey nonceKey;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private Long procId;<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> public NonceProcedureRunnable(final MasterServices master,<a name="line.74"></a>
-<span class="sourceLineNo">075</span> final long nonceGroup, final long nonce) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.master = master;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.nonceKey = getProcedureExecutor().createNonceKey(nonceGroup, nonce);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> protected NonceKey getNonceKey() {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return nonceKey;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> protected MasterServices getMaster() {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> return master;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> protected ProcedureExecutor<MasterProcedureEnv> getProcedureExecutor() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return master.getMasterProcedureExecutor();<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> protected long getProcId() {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> return procId != null ? procId.longValue() : -1;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> protected long setProcId(final long procId) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> this.procId = procId;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return procId;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> protected abstract void run() throws IOException;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> protected abstract String getDescription();<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> protected long submitProcedure(final Procedure proc) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> assert procId == null : "submitProcedure() was already called, running procId=" + procId;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> procId = getProcedureExecutor().submitProcedure(proc, nonceKey);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return procId;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Helper used to deal with submitting procs with nonce.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * Internally the NonceProcedureRunnable.run() will be called only if no one else<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * registered the nonce. any Exception thrown by the run() method will be<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * collected/handled and rethrown.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <code><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * long procId = MasterProcedureUtil.submitProcedure(<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * new NonceProcedureRunnable(procExec, nonceGroup, nonce) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * {@literal @}Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * public void run() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * cpHost.preOperation();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * submitProcedure(new MyProc());<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * cpHost.postOperation();<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * });<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * </code><a name="line.126"></a>
-<span class="sourceLineNo">127</span> */<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public static long submitProcedure(final NonceProcedureRunnable runnable) throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> final ProcedureExecutor<MasterProcedureEnv> procExec = runnable.getProcedureExecutor();<a name="line.129"></a>
-<span class="sourceLineNo">130</span> final long procId = procExec.registerNonce(runnable.getNonceKey());<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (procId >= 0) return procId; // someone already registered the nonce<a name="line.131"></a>
-<span class="sourceLineNo">132</span> try {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> runnable.run();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> } catch (IOException e) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> procExec.setFailureResultForNonce(runnable.getNonceKey(),<a name="line.135"></a>
-<span class="sourceLineNo">136</span> runnable.getDescription(),<a name="line.136"></a>
-<span class="sourceLineNo">137</span> procExec.getEnvironment().getRequestUser(), e);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw e;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> } finally {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> procExec.unregisterNonceIfProcedureWasNotSubmitted(runnable.getNonceKey());<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return runnable.getProcId();<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">022</span>import java.util.regex.Pattern;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.logging.Log;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.logging.LogFactory;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RPCProtos.UserInformation;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.security.User;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.NonceKey;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.security.UserGroupInformation;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>@InterfaceAudience.Private<a name="line.36"></a>
+<span class="sourceLineNo">037</span>@InterfaceStability.Evolving<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public final class MasterProcedureUtil {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> private static final Log LOG = LogFactory.getLog(MasterProcedureUtil.class);<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> private MasterProcedureUtil() {}<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> public static UserInformation toProtoUserInfo(User user) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> UserInformation.Builder userInfoPB = UserInformation.newBuilder();<a name="line.44"></a>
+<span class="sourceLineNo">045</span> userInfoPB.setEffectiveUser(user.getName());<a name="line.45"></a>
+<span class="sourceLineNo">046</span> if (user.getUGI().getRealUser() != null) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span> userInfoPB.setRealUser(user.getUGI().getRealUser().getUserName());<a name="line.47"></a>
+<span class="sourceLineNo">048</span> }<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return userInfoPB.build();<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> public static User toUserInfo(UserInformation userInfoProto) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> if (userInfoProto.hasEffectiveUser()) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> String effectiveUser = userInfoProto.getEffectiveUser();<a name="line.54"></a>
+<span class="sourceLineNo">055</span> if (userInfoProto.hasRealUser()) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> String realUser = userInfoProto.getRealUser();<a name="line.56"></a>
+<span class="sourceLineNo">057</span> UserGroupInformation realUserUgi = UserGroupInformation.createRemoteUser(realUser);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> return User.create(UserGroupInformation.createProxyUser(effectiveUser, realUserUgi));<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span> return User.create(UserGroupInformation.createRemoteUser(effectiveUser));<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span> return null;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * Helper Runnable used in conjunction with submitProcedure() to deal with<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * submitting procs with nonce.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * See submitProcedure() for an example.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> */<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public static abstract class NonceProcedureRunnable {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final MasterServices master;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private final NonceKey nonceKey;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private Long procId;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> public NonceProcedureRunnable(final MasterServices master,<a name="line.75"></a>
+<span class="sourceLineNo">076</span> final long nonceGroup, final long nonce) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> this.master = master;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> this.nonceKey = getProcedureExecutor().createNonceKey(nonceGroup, nonce);<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> protected NonceKey getNonceKey() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return nonceKey;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> protected MasterServices getMaster() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return master;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> protected ProcedureExecutor<MasterProcedureEnv> getProcedureExecutor() {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return master.getMasterProcedureExecutor();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> protected long getProcId() {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> return procId != null ? procId.longValue() : -1;<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> protected long setProcId(final long procId) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> this.procId = procId;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return procId;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> protected abstract void run() throws IOException;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> protected abstract String getDescription();<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> protected long submitProcedure(final Procedure proc) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> assert procId == null : "submitProcedure() was already called, running procId=" + procId;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> procId = getProcedureExecutor().submitProcedure(proc, nonceKey);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return procId;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> /**<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * Helper used to deal with submitting procs with nonce.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * Internally the NonceProcedureRunnable.run() will be called only if no one else<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * registered the nonce. any Exception thrown by the run() method will be<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * collected/handled and rethrown.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <code><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * long procId = MasterProcedureUtil.submitProcedure(<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * new NonceProcedureRunnable(procExec, nonceGroup, nonce) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * {@literal @}Override<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * public void run() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * cpHost.preOperation();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * submitProcedure(new MyProc());<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * cpHost.postOperation();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * });<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * </code><a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static long submitProcedure(final NonceProcedureRunnable runnable) throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> final ProcedureExecutor<MasterProcedureEnv> procExec = runnable.getProcedureExecutor();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> final long procId = procExec.registerNonce(runnable.getNonceKey());<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (procId >= 0) return procId; // someone already registered the nonce<a name="line.132"></a>
+<span class="sourceLineNo">133</span> try {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> runnable.run();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> } catch (IOException e) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> procExec.setFailureResultForNonce(runnable.getNonceKey(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span> runnable.getDescription(),<a name="line.137"></a>
+<span class="sourceLineNo">138</span> procExec.getEnvironment().getRequestUser(), e);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> throw e;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> } finally {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> procExec.unregisterNonceIfProcedureWasNotSubmitted(runnable.getNonceKey());<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return runnable.getProcId();<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> * Pattern used to validate a Procedure WAL file name see<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * {@link #validateProcedureWALFilename(String)} for description.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> */<a name="line.149"></a>
+<span class="sourceLineNo">150</span> private static final Pattern pattern = Pattern.compile(".*pv-\\d{20}.log");<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * A Procedure WAL file name is of the format: pv-&lt;wal-id&gt;.log where wal-id is 20 digits.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * @param filename name of the file to validate<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * @return <tt>true</tt> if the filename matches a Procedure WAL, <tt>false</tt> otherwise<a name="line.155"></a>
+<span class="sourceLineNo">156</span> */<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public static boolean validateProcedureWALFilename(String filename) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return pattern.matcher(filename).matches();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>}<a name="line.160"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.html
index ba58ee0..777dc5c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureUtil.html
@@ -27,129 +27,145 @@
<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.master.procedure;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RPCProtos.UserInformation;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.security.User;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.NonceKey;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.security.UserGroupInformation;<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>@InterfaceAudience.Private<a name="line.35"></a>
-<span class="sourceLineNo">036</span>@InterfaceStability.Evolving<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public final class MasterProcedureUtil {<a name="line.37"></a>
-<span class="sourceLineNo">038</span> private static final Log LOG = LogFactory.getLog(MasterProcedureUtil.class);<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> private MasterProcedureUtil() {}<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span> public static UserInformation toProtoUserInfo(User user) {<a name="line.42"></a>
-<span class="sourceLineNo">043</span> UserInformation.Builder userInfoPB = UserInformation.newBuilder();<a name="line.43"></a>
-<span class="sourceLineNo">044</span> userInfoPB.setEffectiveUser(user.getName());<a name="line.44"></a>
-<span class="sourceLineNo">045</span> if (user.getUGI().getRealUser() != null) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span> userInfoPB.setRealUser(user.getUGI().getRealUser().getUserName());<a name="line.46"></a>
-<span class="sourceLineNo">047</span> }<a name="line.47"></a>
-<span class="sourceLineNo">048</span> return userInfoPB.build();<a name="line.48"></a>
-<span class="sourceLineNo">049</span> }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> public static User toUserInfo(UserInformation userInfoProto) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> if (userInfoProto.hasEffectiveUser()) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> String effectiveUser = userInfoProto.getEffectiveUser();<a name="line.53"></a>
-<span class="sourceLineNo">054</span> if (userInfoProto.hasRealUser()) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> String realUser = userInfoProto.getRealUser();<a name="line.55"></a>
-<span class="sourceLineNo">056</span> UserGroupInformation realUserUgi = UserGroupInformation.createRemoteUser(realUser);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> return User.create(UserGroupInformation.createProxyUser(effectiveUser, realUserUgi));<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span> return User.create(UserGroupInformation.createRemoteUser(effectiveUser));<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span> return null;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /**<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * Helper Runnable used in conjunction with submitProcedure() to deal with<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * submitting procs with nonce.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * See submitProcedure() for an example.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> */<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public static abstract class NonceProcedureRunnable {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private final MasterServices master;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private final NonceKey nonceKey;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private Long procId;<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> public NonceProcedureRunnable(final MasterServices master,<a name="line.74"></a>
-<span class="sourceLineNo">075</span> final long nonceGroup, final long nonce) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.master = master;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.nonceKey = getProcedureExecutor().createNonceKey(nonceGroup, nonce);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> protected NonceKey getNonceKey() {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return nonceKey;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> protected MasterServices getMaster() {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> return master;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> protected ProcedureExecutor<MasterProcedureEnv> getProcedureExecutor() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return master.getMasterProcedureExecutor();<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> protected long getProcId() {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> return procId != null ? procId.longValue() : -1;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> protected long setProcId(final long procId) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> this.procId = procId;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return procId;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> protected abstract void run() throws IOException;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> protected abstract String getDescription();<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> protected long submitProcedure(final Procedure proc) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> assert procId == null : "submitProcedure() was already called, running procId=" + procId;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> procId = getProcedureExecutor().submitProcedure(proc, nonceKey);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return procId;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * Helper used to deal with submitting procs with nonce.<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * Internally the NonceProcedureRunnable.run() will be called only if no one else<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * registered the nonce. any Exception thrown by the run() method will be<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * collected/handled and rethrown.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * <code><a name="line.116"></a>
-<span class="sourceLineNo">117</span> * long procId = MasterProcedureUtil.submitProcedure(<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * new NonceProcedureRunnable(procExec, nonceGroup, nonce) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * {@literal @}Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * public void run() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * cpHost.preOperation();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * submitProcedure(new MyProc());<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * cpHost.postOperation();<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * });<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * </code><a name="line.126"></a>
-<span class="sourceLineNo">127</span> */<a name="line.127"></a>
-<span class="sourceLineNo">128</span> public static long submitProcedure(final NonceProcedureRunnable runnable) throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> final ProcedureExecutor<MasterProcedureEnv> procExec = runnable.getProcedureExecutor();<a name="line.129"></a>
-<span class="sourceLineNo">130</span> final long procId = procExec.registerNonce(runnable.getNonceKey());<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (procId >= 0) return procId; // someone already registered the nonce<a name="line.131"></a>
-<span class="sourceLineNo">132</span> try {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> runnable.run();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> } catch (IOException e) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> procExec.setFailureResultForNonce(runnable.getNonceKey(),<a name="line.135"></a>
-<span class="sourceLineNo">136</span> runnable.getDescription(),<a name="line.136"></a>
-<span class="sourceLineNo">137</span> procExec.getEnvironment().getRequestUser(), e);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw e;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> } finally {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> procExec.unregisterNonceIfProcedureWasNotSubmitted(runnable.getNonceKey());<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return runnable.getProcId();<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">022</span>import java.util.regex.Pattern;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.logging.Log;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.logging.LogFactory;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RPCProtos.UserInformation;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.security.User;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.NonceKey;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.security.UserGroupInformation;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>@InterfaceAudience.Private<a name="line.36"></a>
+<span class="sourceLineNo">037</span>@InterfaceStability.Evolving<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public final class MasterProcedureUtil {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> private static final Log LOG = LogFactory.getLog(MasterProcedureUtil.class);<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> private MasterProcedureUtil() {}<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> public static UserInformation toProtoUserInfo(User user) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> UserInformation.Builder userInfoPB = UserInformation.newBuilder();<a name="line.44"></a>
+<span class="sourceLineNo">045</span> userInfoPB.setEffectiveUser(user.getName());<a name="line.45"></a>
+<span class="sourceLineNo">046</span> if (user.getUGI().getRealUser() != null) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span> userInfoPB.setRealUser(user.getUGI().getRealUser().getUserName());<a name="line.47"></a>
+<span class="sourceLineNo">048</span> }<a name="line.48"></a>
+<span class="sourceLineNo">049</span> return userInfoPB.build();<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> public static User toUserInfo(UserInformation userInfoProto) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> if (userInfoProto.hasEffectiveUser()) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> String effectiveUser = userInfoProto.getEffectiveUser();<a name="line.54"></a>
+<span class="sourceLineNo">055</span> if (userInfoProto.hasRealUser()) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> String realUser = userInfoProto.getRealUser();<a name="line.56"></a>
+<span class="sourceLineNo">057</span> UserGroupInformation realUserUgi = UserGroupInformation.createRemoteUser(realUser);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> return User.create(UserGroupInformation.createProxyUser(effectiveUser, realUserUgi));<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span> return User.create(UserGroupInformation.createRemoteUser(effectiveUser));<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span> return null;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * Helper Runnable used in conjunction with submitProcedure() to deal with<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * submitting procs with nonce.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * See submitProcedure() for an example.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> */<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public static abstract class NonceProcedureRunnable {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final MasterServices master;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private final NonceKey nonceKey;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private Long procId;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> public NonceProcedureRunnable(final MasterServices master,<a name="line.75"></a>
+<span class="sourceLineNo">076</span> final long nonceGroup, final long nonce) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> this.master = master;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> this.nonceKey = getProcedureExecutor().createNonceKey(nonceGroup, nonce);<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> protected NonceKey getNonceKey() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return nonceKey;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> protected MasterServices getMaster() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return master;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> protected ProcedureExecutor<MasterProcedureEnv> getProcedureExecutor() {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return master.getMasterProcedureExecutor();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> protected long getProcId() {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> return procId != null ? procId.longValue() : -1;<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> protected long setProcId(final long procId) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> this.procId = procId;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return procId;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> protected abstract void run() throws IOException;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> protected abstract String getDescription();<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> protected long submitProcedure(final Procedure proc) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> assert procId == null : "submitProcedure() was already called, running procId=" + procId;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> procId = getProcedureExecutor().submitProcedure(proc, nonceKey);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return procId;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> /**<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * Helper used to deal with submitting procs with nonce.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * Internally the NonceProcedureRunnable.run() will be called only if no one else<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * registered the nonce. any Exception thrown by the run() method will be<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * collected/handled and rethrown.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * <code><a name="line.117"></a>
+<span class="sourceLineNo">118</span> * long procId = MasterProcedureUtil.submitProcedure(<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * new NonceProcedureRunnable(procExec, nonceGroup, nonce) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * {@literal @}Override<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * public void run() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * cpHost.preOperation();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * submitProcedure(new MyProc());<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * cpHost.postOperation();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * });<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * </code><a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static long submitProcedure(final NonceProcedureRunnable runnable) throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> final ProcedureExecutor<MasterProcedureEnv> procExec = runnable.getProcedureExecutor();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> final long procId = procExec.registerNonce(runnable.getNonceKey());<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (procId >= 0) return procId; // someone already registered the nonce<a name="line.132"></a>
+<span class="sourceLineNo">133</span> try {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> runnable.run();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> } catch (IOException e) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> procExec.setFailureResultForNonce(runnable.getNonceKey(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span> runnable.getDescription(),<a name="line.137"></a>
+<span class="sourceLineNo">138</span> procExec.getEnvironment().getRequestUser(), e);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> throw e;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> } finally {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> procExec.unregisterNonceIfProcedureWasNotSubmitted(runnable.getNonceKey());<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return runnable.getProcId();<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> * Pattern used to validate a Procedure WAL file name see<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * {@link #validateProcedureWALFilename(String)} for description.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> */<a name="line.149"></a>
+<span class="sourceLineNo">150</span> private static final Pattern pattern = Pattern.compile(".*pv-\\d{20}.log");<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * A Procedure WAL file name is of the format: pv-&lt;wal-id&gt;.log where wal-id is 20 digits.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * @param filename name of the file to validate<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * @return <tt>true</tt> if the filename matches a Procedure WAL, <tt>false</tt> otherwise<a name="line.155"></a>
+<span class="sourceLineNo">156</span> */<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public static boolean validateProcedureWALFilename(String filename) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return pattern.matcher(filename).matches();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>}<a name="line.160"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.html
deleted file mode 100644
index bb329ec..0000000
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
-<span class="sourceLineNo">002</span> * Copyright The Apache Software Foundation<a name="line.2"></a>
-<span class="sourceLineNo">003</span> *<a name="line.3"></a>
-<span class="sourceLineNo">004</span> * Licensed to the Apache Software Foundation (ASF) under one or more<a name="line.4"></a>
-<span class="sourceLineNo">005</span> * contributor license agreements. See the NOTICE file distributed with this<a name="line.5"></a>
-<span class="sourceLineNo">006</span> * work for additional information regarding copyright ownership. The ASF<a name="line.6"></a>
-<span class="sourceLineNo">007</span> * licenses this file to you under the Apache License, Version 2.0 (the<a name="line.7"></a>
-<span class="sourceLineNo">008</span> * "License"); you may not use this file except in compliance with the License.<a name="line.8"></a>
-<span class="sourceLineNo">009</span> * You may obtain a copy of the License at<a name="line.9"></a>
-<span class="sourceLineNo">010</span> *<a name="line.10"></a>
-<span class="sourceLineNo">011</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a>
-<span class="sourceLineNo">012</span> *<a name="line.12"></a>
-<span class="sourceLineNo">013</span> * Unless required by applicable law or agreed to in writing, software<a name="line.13"></a>
-<span class="sourceLineNo">014</span> * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT<a name="line.14"></a>
-<span class="sourceLineNo">015</span> * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * License for the specific language governing permissions and limitations<a name="line.16"></a>
-<span class="sourceLineNo">017</span> * under the License.<a name="line.17"></a>
-<span class="sourceLineNo">018</span> */<a name="line.18"></a>
-<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.regionserver;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.security.PrivilegedAction;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.TableName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.regionserver.RegionServerServices.RegionStateTransitionContext;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.security.User;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>/**<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * Handles processing region merges. Put in a queue, owned by HRegionServer.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> */<a name="line.38"></a>
-<span class="sourceLineNo">039</span>// TODO:UNUSED: REMOVE!!!<a name="line.39"></a>
-<span class="sourceLineNo">040</span>@InterfaceAudience.Private<a name="line.40"></a>
-<span class="sourceLineNo">041</span>class RegionMergeRequest implements Runnable {<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private static final Log LOG = LogFactory.getLog(RegionMergeRequest.class);<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private final RegionInfo region_a;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private final RegionInfo region_b;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> private final HRegionServer server;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> private final boolean forcible;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> private final User user;<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span> RegionMergeRequest(Region a, Region b, HRegionServer hrs, boolean forcible,<a name="line.49"></a>
-<span class="sourceLineNo">050</span> long masterSystemTime, User user) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> Preconditions.checkNotNull(hrs);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> this.region_a = a.getRegionInfo();<a name="line.52"></a>
-<span class="sourceLineNo">053</span> this.region_b = b.getRegionInfo();<a name="line.53"></a>
-<span class="sourceLineNo">054</span> this.server = hrs;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> this.forcible = forcible;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> this.user = user;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public String toString() {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> return "MergeRequest,regions:" + region_a + ", " + region_b + ", forcible="<a name="line.61"></a>
-<span class="sourceLineNo">062</span> + forcible;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> private void doMerge() {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> boolean success = false;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> //server.metricsRegionServer.incrMergeRequest();<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (user != null && user.getUGI() != null) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> user.getUGI().doAs (new PrivilegedAction<Void>() {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> @Override<a name="line.71"></a>
-<span class="sourceLineNo">072</span> public Void run() {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> requestRegionMerge();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return null;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> });<a name="line.76"></a>
-<span class="sourceLineNo">077</span> } else {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> requestRegionMerge();<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> private void requestRegionMerge() {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> final TableName table = region_a.getTable();<a name="line.83"></a>
-<span class="sourceLineNo">084</span> if (!table.equals(region_b.getTable())) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> LOG.error("Can't merge regions from two different tables: " + region_a + ", " + region_b);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> return;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> // TODO: fake merged region for compat with the report protocol<a name="line.89"></a>
-<span class="sourceLineNo">090</span> final RegionInfo merged = RegionInfoBuilder.newBuilder(table).build();<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> // Send the split request to the master. the master will do the validation on the split-key.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> // The parent region will be unassigned and the two new regions will be assigned.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> // hri_a and hri_b objects may not reflect the regions that will be created, those objectes<a name="line.94"></a>
-<span class="sourceLineNo">095</span> // are created just to pass the information to the reportRegionStateTransition().<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (!server.reportRegionStateTransition(new RegionStateTransitionContext(<a name="line.96"></a>
-<span class="sourceLineNo">097</span> TransitionCode.READY_TO_MERGE, HConstants.NO_SEQNUM, -1, merged, region_a, region_b))) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> LOG.error("Unable to ask master to merge: " + region_a + ", " + region_b);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> @Override<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public void run() {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> if (this.server.isStopping() || this.server.isStopped()) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> LOG.debug("Skipping merge because server is stopping="<a name="line.105"></a>
-<span class="sourceLineNo">106</span> + this.server.isStopping() + " or stopped=" + this.server.isStopped());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> doMerge();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span>}<a name="line.112"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 447f3a5..7a65e57 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Export Control
@@ -336,7 +336,7 @@ for more details.</p>
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/dependencies.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependencies.html b/hbase-annotations/dependencies.html
index 1462a30..70e3ff8 100644
--- a/hbase-annotations/dependencies.html
+++ b/hbase-annotations/dependencies.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Dependencies</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -272,7 +272,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-convergence.html b/hbase-annotations/dependency-convergence.html
index 3e5f7a8..81c0907 100644
--- a/hbase-annotations/dependency-convergence.html
+++ b/hbase-annotations/dependency-convergence.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Reactor Dependency Convergence</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -724,7 +724,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/dependency-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-info.html b/hbase-annotations/dependency-info.html
index af64aa2..594c23a 100644
--- a/hbase-annotations/dependency-info.html
+++ b/hbase-annotations/dependency-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Dependency Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -147,7 +147,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/dependency-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-management.html b/hbase-annotations/dependency-management.html
index 39f2f21..4e9c8ef 100644
--- a/hbase-annotations/dependency-management.html
+++ b/hbase-annotations/dependency-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Dependency Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -772,7 +772,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/index.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/index.html b/hbase-annotations/index.html
index f94de8b..e267f29 100644
--- a/hbase-annotations/index.html
+++ b/hbase-annotations/index.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – About</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -119,7 +119,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/integration.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/integration.html b/hbase-annotations/integration.html
index 35cc707..62e3004 100644
--- a/hbase-annotations/integration.html
+++ b/hbase-annotations/integration.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – CI Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -126,7 +126,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/issue-tracking.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/issue-tracking.html b/hbase-annotations/issue-tracking.html
index 0a84907..630274f 100644
--- a/hbase-annotations/issue-tracking.html
+++ b/hbase-annotations/issue-tracking.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Issue Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -123,7 +123,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/license.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/license.html b/hbase-annotations/license.html
index ee34f05..aa0fdc5 100644
--- a/hbase-annotations/license.html
+++ b/hbase-annotations/license.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Licenses</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -326,7 +326,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/mail-lists.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/mail-lists.html b/hbase-annotations/mail-lists.html
index 71b44e4..100ab75 100644
--- a/hbase-annotations/mail-lists.html
+++ b/hbase-annotations/mail-lists.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -176,7 +176,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/plugin-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/plugin-management.html b/hbase-annotations/plugin-management.html
index efff164..63f5b96 100644
--- a/hbase-annotations/plugin-management.html
+++ b/hbase-annotations/plugin-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -271,7 +271,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/plugins.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/plugins.html b/hbase-annotations/plugins.html
index e4246b3..271b23a 100644
--- a/hbase-annotations/plugins.html
+++ b/hbase-annotations/plugins.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -222,7 +222,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4b918c22/hbase-annotations/project-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-info.html b/hbase-annotations/project-info.html
index 78b0f97..195e74c 100644
--- a/hbase-annotations/project-info.html
+++ b/hbase-annotations/project-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20171011" />
+ <meta name="Date-Revision-yyyymmdd" content="20171012" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase - Annotations – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -167,7 +167,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2017-10-11</li>
+ <li id="publishDate" class="pull-right">Last Published: 2017-10-12</li>
</p>
</div>