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/06/01 14:49:04 UTC
[15/33] hbase-site git commit: Published site at
d5ea926321d8339dbbb761b32bcdc043aed576ee.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ad0fa3b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.html
index 38c799c..b479b6b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.html
@@ -65,36 +65,36 @@
<span class="sourceLineNo">057</span> private final boolean securityEnabled;<a name="line.57"></a>
<span class="sourceLineNo">058</span> private final boolean doAsEnabled;<a name="line.58"></a>
<span class="sourceLineNo">059</span> private transient ThriftServerRunner.HBaseHandler hbaseHandler;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private String outToken;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> // HTTP Header related constants.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public static final String WWW_AUTHENTICATE = "WWW-Authenticate";<a name="line.63"></a>
-<span class="sourceLineNo">064</span> public static final String AUTHORIZATION = "Authorization";<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public static final String NEGOTIATE = "Negotiate";<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> public ThriftHttpServlet(TProcessor processor, TProtocolFactory protocolFactory,<a name="line.67"></a>
-<span class="sourceLineNo">068</span> UserGroupInformation realUser, Configuration conf, ThriftServerRunner.HBaseHandler<a name="line.68"></a>
-<span class="sourceLineNo">069</span> hbaseHandler, boolean securityEnabled, boolean doAsEnabled) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> super(processor, protocolFactory);<a name="line.70"></a>
-<span class="sourceLineNo">071</span> this.realUser = realUser;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> this.conf = conf;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> this.hbaseHandler = hbaseHandler;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> this.securityEnabled = securityEnabled;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> this.doAsEnabled = doAsEnabled;<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> protected void doPost(HttpServletRequest request, HttpServletResponse response)<a name="line.79"></a>
-<span class="sourceLineNo">080</span> throws ServletException, IOException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> String effectiveUser = request.getRemoteUser();<a name="line.81"></a>
-<span class="sourceLineNo">082</span> if (securityEnabled) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // As Thrift HTTP transport doesn't support SPNEGO yet (THRIFT-889),<a name="line.84"></a>
-<span class="sourceLineNo">085</span> // Kerberos authentication is being done at servlet level.<a name="line.85"></a>
-<span class="sourceLineNo">086</span> effectiveUser = doKerberosAuth(request);<a name="line.86"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> // HTTP Header related constants.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public static final String WWW_AUTHENTICATE = "WWW-Authenticate";<a name="line.62"></a>
+<span class="sourceLineNo">063</span> public static final String AUTHORIZATION = "Authorization";<a name="line.63"></a>
+<span class="sourceLineNo">064</span> public static final String NEGOTIATE = "Negotiate";<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> public ThriftHttpServlet(TProcessor processor, TProtocolFactory protocolFactory,<a name="line.66"></a>
+<span class="sourceLineNo">067</span> UserGroupInformation realUser, Configuration conf, ThriftServerRunner.HBaseHandler<a name="line.67"></a>
+<span class="sourceLineNo">068</span> hbaseHandler, boolean securityEnabled, boolean doAsEnabled) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> super(processor, protocolFactory);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> this.realUser = realUser;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> this.conf = conf;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> this.hbaseHandler = hbaseHandler;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> this.securityEnabled = securityEnabled;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> this.doAsEnabled = doAsEnabled;<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> @Override<a name="line.77"></a>
+<span class="sourceLineNo">078</span> protected void doPost(HttpServletRequest request, HttpServletResponse response)<a name="line.78"></a>
+<span class="sourceLineNo">079</span> throws ServletException, IOException {<a name="line.79"></a>
+<span class="sourceLineNo">080</span> String effectiveUser = request.getRemoteUser();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> if (securityEnabled) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> try {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> // As Thrift HTTP transport doesn't support SPNEGO yet (THRIFT-889),<a name="line.83"></a>
+<span class="sourceLineNo">084</span> // Kerberos authentication is being done at servlet level.<a name="line.84"></a>
+<span class="sourceLineNo">085</span> final RemoteUserIdentity identity = doKerberosAuth(request);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> effectiveUser = identity.principal;<a name="line.86"></a>
<span class="sourceLineNo">087</span> // It is standard for client applications expect this header.<a name="line.87"></a>
<span class="sourceLineNo">088</span> // Please see http://tools.ietf.org/html/rfc4559 for more details.<a name="line.88"></a>
-<span class="sourceLineNo">089</span> response.addHeader(WWW_AUTHENTICATE, NEGOTIATE + " " + outToken);<a name="line.89"></a>
+<span class="sourceLineNo">089</span> response.addHeader(WWW_AUTHENTICATE, NEGOTIATE + " " + identity.outToken);<a name="line.89"></a>
<span class="sourceLineNo">090</span> } catch (HttpAuthenticationException e) {<a name="line.90"></a>
<span class="sourceLineNo">091</span> LOG.error("Kerberos Authentication failed", e);<a name="line.91"></a>
<span class="sourceLineNo">092</span> // Send a 401 to the client<a name="line.92"></a>
@@ -135,103 +135,115 @@
<span class="sourceLineNo">127</span> * We already have a logged in subject in the form of serviceUGI,<a name="line.127"></a>
<span class="sourceLineNo">128</span> * which GSS-API will extract information from.<a name="line.128"></a>
<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> private String doKerberosAuth(HttpServletRequest request)<a name="line.130"></a>
+<span class="sourceLineNo">130</span> private RemoteUserIdentity doKerberosAuth(HttpServletRequest request)<a name="line.130"></a>
<span class="sourceLineNo">131</span> throws HttpAuthenticationException {<a name="line.131"></a>
<span class="sourceLineNo">132</span> HttpKerberosServerAction action = new HttpKerberosServerAction(request, realUser);<a name="line.132"></a>
<span class="sourceLineNo">133</span> try {<a name="line.133"></a>
<span class="sourceLineNo">134</span> String principal = realUser.doAs(action);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> outToken = action.outToken;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> return principal;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> } catch (Exception e) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> LOG.error("Failed to perform authentication");<a name="line.138"></a>
-<span class="sourceLineNo">139</span> throw new HttpAuthenticationException(e);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> private static class HttpKerberosServerAction implements PrivilegedExceptionAction<String> {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> HttpServletRequest request;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> UserGroupInformation serviceUGI;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> String outToken = null;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> HttpKerberosServerAction(HttpServletRequest request, UserGroupInformation serviceUGI) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> this.request = request;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> this.serviceUGI = serviceUGI;<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> @Override<a name="line.153"></a>
-<span class="sourceLineNo">154</span> public String run() throws HttpAuthenticationException {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // Get own Kerberos credentials for accepting connection<a name="line.155"></a>
-<span class="sourceLineNo">156</span> GSSManager manager = GSSManager.getInstance();<a name="line.156"></a>
-<span class="sourceLineNo">157</span> GSSContext gssContext = null;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> String serverPrincipal = SecurityUtil.getPrincipalWithoutRealm(serviceUGI.getUserName());<a name="line.158"></a>
-<span class="sourceLineNo">159</span> try {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> // This Oid for Kerberos GSS-API mechanism.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> Oid kerberosMechOid = new Oid("1.2.840.113554.1.2.2");<a name="line.161"></a>
-<span class="sourceLineNo">162</span> // Oid for SPNego GSS-API mechanism.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> Oid spnegoMechOid = new Oid("1.3.6.1.5.5.2");<a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Oid for kerberos principal name<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Oid krb5PrincipalOid = new Oid("1.2.840.113554.1.2.2.1");<a name="line.165"></a>
-<span class="sourceLineNo">166</span> // GSS name for server<a name="line.166"></a>
-<span class="sourceLineNo">167</span> GSSName serverName = manager.createName(serverPrincipal, krb5PrincipalOid);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> // GSS credentials for server<a name="line.168"></a>
-<span class="sourceLineNo">169</span> GSSCredential serverCreds = manager.createCredential(serverName,<a name="line.169"></a>
-<span class="sourceLineNo">170</span> GSSCredential.DEFAULT_LIFETIME,<a name="line.170"></a>
-<span class="sourceLineNo">171</span> new Oid[]{kerberosMechOid, spnegoMechOid},<a name="line.171"></a>
-<span class="sourceLineNo">172</span> GSSCredential.ACCEPT_ONLY);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> // Create a GSS context<a name="line.173"></a>
-<span class="sourceLineNo">174</span> gssContext = manager.createContext(serverCreds);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> // Get service ticket from the authorization header<a name="line.175"></a>
-<span class="sourceLineNo">176</span> String serviceTicketBase64 = getAuthHeader(request);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> byte[] inToken = Base64.decode(serviceTicketBase64);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> byte[] res = gssContext.acceptSecContext(inToken, 0, inToken.length);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> if(res != null) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> outToken = Base64.encodeBytes(res).replace("\n", "");<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // Authenticate or deny based on its context completion<a name="line.182"></a>
-<span class="sourceLineNo">183</span> if (!gssContext.isEstablished()) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> throw new HttpAuthenticationException("Kerberos authentication failed: " +<a name="line.184"></a>
-<span class="sourceLineNo">185</span> "unable to establish context with the service ticket " +<a name="line.185"></a>
-<span class="sourceLineNo">186</span> "provided by the client.");<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return SecurityUtil.getUserFromPrincipal(gssContext.getSrcName().toString());<a name="line.188"></a>
-<span class="sourceLineNo">189</span> } catch (GSSException e) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> throw new HttpAuthenticationException("Kerberos authentication failed: ", e);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> } finally {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> if (gssContext != null) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> try {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> gssContext.dispose();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> } catch (GSSException e) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> LOG.warn("Error while disposing GSS Context", e);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<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> * Returns the base64 encoded auth header payload<a name="line.203"></a>
-<span class="sourceLineNo">204</span> *<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * @throws HttpAuthenticationException if a remote or network exception occurs<a name="line.205"></a>
-<span class="sourceLineNo">206</span> */<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private String getAuthHeader(HttpServletRequest request)<a name="line.207"></a>
-<span class="sourceLineNo">208</span> throws HttpAuthenticationException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> String authHeader = request.getHeader(AUTHORIZATION);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // Each http request must have an Authorization header<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if (authHeader == null || authHeader.isEmpty()) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> throw new HttpAuthenticationException("Authorization header received " +<a name="line.212"></a>
-<span class="sourceLineNo">213</span> "from the client is empty.");<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span> String authHeaderBase64String;<a name="line.215"></a>
-<span class="sourceLineNo">216</span> int beginIndex = (NEGOTIATE + " ").length();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> authHeaderBase64String = authHeader.substring(beginIndex);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> // Authorization header must have a payload<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (authHeaderBase64String == null || authHeaderBase64String.isEmpty()) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> throw new HttpAuthenticationException("Authorization header received " +<a name="line.220"></a>
-<span class="sourceLineNo">221</span> "from the client does not contain any data.");<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span> return authHeaderBase64String;<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>}<a name="line.226"></a>
+<span class="sourceLineNo">135</span> return new RemoteUserIdentity(principal, action.outToken);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> } catch (Exception e) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> LOG.error("Failed to perform authentication");<a name="line.137"></a>
+<span class="sourceLineNo">138</span> throw new HttpAuthenticationException(e);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * Basic "struct" class to hold the final base64-encoded, authenticated GSSAPI token<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * for the user with the given principal talking to the Thrift server.<a name="line.144"></a>
+<span class="sourceLineNo">145</span> */<a name="line.145"></a>
+<span class="sourceLineNo">146</span> private static class RemoteUserIdentity {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> final String outToken;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> final String principal;<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> RemoteUserIdentity(String principal, String outToken) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> this.principal = principal;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> this.outToken = outToken;<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 static class HttpKerberosServerAction implements PrivilegedExceptionAction<String> {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> HttpServletRequest request;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> UserGroupInformation serviceUGI;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> String outToken = null;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> HttpKerberosServerAction(HttpServletRequest request, UserGroupInformation serviceUGI) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> this.request = request;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> this.serviceUGI = serviceUGI;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public String run() throws HttpAuthenticationException {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> // Get own Kerberos credentials for accepting connection<a name="line.167"></a>
+<span class="sourceLineNo">168</span> GSSManager manager = GSSManager.getInstance();<a name="line.168"></a>
+<span class="sourceLineNo">169</span> GSSContext gssContext = null;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> String serverPrincipal = SecurityUtil.getPrincipalWithoutRealm(serviceUGI.getUserName());<a name="line.170"></a>
+<span class="sourceLineNo">171</span> try {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // This Oid for Kerberos GSS-API mechanism.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> Oid kerberosMechOid = new Oid("1.2.840.113554.1.2.2");<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Oid for SPNego GSS-API mechanism.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> Oid spnegoMechOid = new Oid("1.3.6.1.5.5.2");<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // Oid for kerberos principal name<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Oid krb5PrincipalOid = new Oid("1.2.840.113554.1.2.2.1");<a name="line.177"></a>
+<span class="sourceLineNo">178</span> // GSS name for server<a name="line.178"></a>
+<span class="sourceLineNo">179</span> GSSName serverName = manager.createName(serverPrincipal, krb5PrincipalOid);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // GSS credentials for server<a name="line.180"></a>
+<span class="sourceLineNo">181</span> GSSCredential serverCreds = manager.createCredential(serverName,<a name="line.181"></a>
+<span class="sourceLineNo">182</span> GSSCredential.DEFAULT_LIFETIME,<a name="line.182"></a>
+<span class="sourceLineNo">183</span> new Oid[]{kerberosMechOid, spnegoMechOid},<a name="line.183"></a>
+<span class="sourceLineNo">184</span> GSSCredential.ACCEPT_ONLY);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> // Create a GSS context<a name="line.185"></a>
+<span class="sourceLineNo">186</span> gssContext = manager.createContext(serverCreds);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // Get service ticket from the authorization header<a name="line.187"></a>
+<span class="sourceLineNo">188</span> String serviceTicketBase64 = getAuthHeader(request);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> byte[] inToken = Base64.decode(serviceTicketBase64);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> byte[] res = gssContext.acceptSecContext(inToken, 0, inToken.length);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if(res != null) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> outToken = Base64.encodeBytes(res).replace("\n", "");<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span> // Authenticate or deny based on its context completion<a name="line.194"></a>
+<span class="sourceLineNo">195</span> if (!gssContext.isEstablished()) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> throw new HttpAuthenticationException("Kerberos authentication failed: " +<a name="line.196"></a>
+<span class="sourceLineNo">197</span> "unable to establish context with the service ticket " +<a name="line.197"></a>
+<span class="sourceLineNo">198</span> "provided by the client.");<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span> return SecurityUtil.getUserFromPrincipal(gssContext.getSrcName().toString());<a name="line.200"></a>
+<span class="sourceLineNo">201</span> } catch (GSSException e) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> throw new HttpAuthenticationException("Kerberos authentication failed: ", e);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> } finally {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> if (gssContext != null) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> try {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> gssContext.dispose();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> } catch (GSSException e) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> LOG.warn("Error while disposing GSS Context", e);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> /**<a name="line.214"></a>
+<span class="sourceLineNo">215</span> * Returns the base64 encoded auth header payload<a name="line.215"></a>
+<span class="sourceLineNo">216</span> *<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * @throws HttpAuthenticationException if a remote or network exception occurs<a name="line.217"></a>
+<span class="sourceLineNo">218</span> */<a name="line.218"></a>
+<span class="sourceLineNo">219</span> private String getAuthHeader(HttpServletRequest request)<a name="line.219"></a>
+<span class="sourceLineNo">220</span> throws HttpAuthenticationException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> String authHeader = request.getHeader(AUTHORIZATION);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> // Each http request must have an Authorization header<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (authHeader == null || authHeader.isEmpty()) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> throw new HttpAuthenticationException("Authorization header received " +<a name="line.224"></a>
+<span class="sourceLineNo">225</span> "from the client is empty.");<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> String authHeaderBase64String;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> int beginIndex = (NEGOTIATE + " ").length();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> authHeaderBase64String = authHeader.substring(beginIndex);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // Authorization header must have a payload<a name="line.230"></a>
+<span class="sourceLineNo">231</span> if (authHeaderBase64String == null || authHeaderBase64String.isEmpty()) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> throw new HttpAuthenticationException("Authorization header received " +<a name="line.232"></a>
+<span class="sourceLineNo">233</span> "from the client does not contain any data.");<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return authHeaderBase64String;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ad0fa3b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
index 63e7421..2fa8df1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
@@ -5147,143 +5147,142 @@
<span class="sourceLineNo">5139</span> private boolean isOptionsSupported(String[] args) {<a name="line.5139"></a>
<span class="sourceLineNo">5140</span> boolean result = true;<a name="line.5140"></a>
<span class="sourceLineNo">5141</span> String hbaseServerVersion = status.getHBaseVersion();<a name="line.5141"></a>
-<span class="sourceLineNo">5142</span> Object[] versionComponents = VersionInfo.getVersionComponents(hbaseServerVersion);<a name="line.5142"></a>
-<span class="sourceLineNo">5143</span> if (versionComponents[0] instanceof Integer && ((Integer) versionComponents[0]) >= 2) {<a name="line.5143"></a>
-<span class="sourceLineNo">5144</span> // Process command-line args.<a name="line.5144"></a>
-<span class="sourceLineNo">5145</span> for (String arg : args) {<a name="line.5145"></a>
-<span class="sourceLineNo">5146</span> if (unsupportedOptionsInV2.contains(arg)) {<a name="line.5146"></a>
-<span class="sourceLineNo">5147</span> errors.reportError(ERROR_CODE.UNSUPPORTED_OPTION,<a name="line.5147"></a>
-<span class="sourceLineNo">5148</span> "option '" + arg + "' is not " + "supportted!");<a name="line.5148"></a>
-<span class="sourceLineNo">5149</span> result = false;<a name="line.5149"></a>
-<span class="sourceLineNo">5150</span> break;<a name="line.5150"></a>
-<span class="sourceLineNo">5151</span> }<a name="line.5151"></a>
-<span class="sourceLineNo">5152</span> }<a name="line.5152"></a>
-<span class="sourceLineNo">5153</span> }<a name="line.5153"></a>
-<span class="sourceLineNo">5154</span> return result;<a name="line.5154"></a>
-<span class="sourceLineNo">5155</span> }<a name="line.5155"></a>
-<span class="sourceLineNo">5156</span><a name="line.5156"></a>
-<span class="sourceLineNo">5157</span> public void setCleanReplicationBarrierTable(String cleanReplicationBarrierTable) {<a name="line.5157"></a>
-<span class="sourceLineNo">5158</span> this.cleanReplicationBarrierTable = TableName.valueOf(cleanReplicationBarrierTable);<a name="line.5158"></a>
-<span class="sourceLineNo">5159</span> }<a name="line.5159"></a>
-<span class="sourceLineNo">5160</span><a name="line.5160"></a>
-<span class="sourceLineNo">5161</span> public void cleanReplicationBarrier() throws IOException {<a name="line.5161"></a>
-<span class="sourceLineNo">5162</span> if (!cleanReplicationBarrier || cleanReplicationBarrierTable == null) {<a name="line.5162"></a>
-<span class="sourceLineNo">5163</span> return;<a name="line.5163"></a>
-<span class="sourceLineNo">5164</span> }<a name="line.5164"></a>
-<span class="sourceLineNo">5165</span> if (cleanReplicationBarrierTable.isSystemTable()) {<a name="line.5165"></a>
-<span class="sourceLineNo">5166</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5166"></a>
-<span class="sourceLineNo">5167</span> "invalid table: " + cleanReplicationBarrierTable);<a name="line.5167"></a>
-<span class="sourceLineNo">5168</span> return;<a name="line.5168"></a>
-<span class="sourceLineNo">5169</span> }<a name="line.5169"></a>
-<span class="sourceLineNo">5170</span><a name="line.5170"></a>
-<span class="sourceLineNo">5171</span> boolean isGlobalScope = false;<a name="line.5171"></a>
-<span class="sourceLineNo">5172</span> try {<a name="line.5172"></a>
-<span class="sourceLineNo">5173</span> isGlobalScope = admin.getDescriptor(cleanReplicationBarrierTable).hasGlobalReplicationScope();<a name="line.5173"></a>
-<span class="sourceLineNo">5174</span> } catch (TableNotFoundException e) {<a name="line.5174"></a>
-<span class="sourceLineNo">5175</span> LOG.info("we may need to clean some erroneous data due to bugs");<a name="line.5175"></a>
-<span class="sourceLineNo">5176</span> }<a name="line.5176"></a>
-<span class="sourceLineNo">5177</span><a name="line.5177"></a>
-<span class="sourceLineNo">5178</span> if (isGlobalScope) {<a name="line.5178"></a>
-<span class="sourceLineNo">5179</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5179"></a>
-<span class="sourceLineNo">5180</span> "table's replication scope is global: " + cleanReplicationBarrierTable);<a name="line.5180"></a>
-<span class="sourceLineNo">5181</span> return;<a name="line.5181"></a>
-<span class="sourceLineNo">5182</span> }<a name="line.5182"></a>
-<span class="sourceLineNo">5183</span> List<byte[]> regionNames = new ArrayList<>();<a name="line.5183"></a>
-<span class="sourceLineNo">5184</span> Scan barrierScan = new Scan();<a name="line.5184"></a>
-<span class="sourceLineNo">5185</span> barrierScan.setCaching(100);<a name="line.5185"></a>
-<span class="sourceLineNo">5186</span> barrierScan.addFamily(HConstants.REPLICATION_BARRIER_FAMILY);<a name="line.5186"></a>
-<span class="sourceLineNo">5187</span> barrierScan<a name="line.5187"></a>
-<span class="sourceLineNo">5188</span> .withStartRow(MetaTableAccessor.getTableStartRowForMeta(cleanReplicationBarrierTable,<a name="line.5188"></a>
-<span class="sourceLineNo">5189</span> MetaTableAccessor.QueryType.REGION))<a name="line.5189"></a>
-<span class="sourceLineNo">5190</span> .withStopRow(MetaTableAccessor.getTableStopRowForMeta(cleanReplicationBarrierTable,<a name="line.5190"></a>
-<span class="sourceLineNo">5191</span> MetaTableAccessor.QueryType.REGION));<a name="line.5191"></a>
-<span class="sourceLineNo">5192</span> Result result;<a name="line.5192"></a>
-<span class="sourceLineNo">5193</span> try (ResultScanner scanner = meta.getScanner(barrierScan)) {<a name="line.5193"></a>
-<span class="sourceLineNo">5194</span> while ((result = scanner.next()) != null) {<a name="line.5194"></a>
-<span class="sourceLineNo">5195</span> regionNames.add(result.getRow());<a name="line.5195"></a>
-<span class="sourceLineNo">5196</span> }<a name="line.5196"></a>
-<span class="sourceLineNo">5197</span> }<a name="line.5197"></a>
-<span class="sourceLineNo">5198</span> if (regionNames.size() <= 0) {<a name="line.5198"></a>
-<span class="sourceLineNo">5199</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5199"></a>
-<span class="sourceLineNo">5200</span> "there is no barriers of this table: " + cleanReplicationBarrierTable);<a name="line.5200"></a>
-<span class="sourceLineNo">5201</span> return;<a name="line.5201"></a>
-<span class="sourceLineNo">5202</span> }<a name="line.5202"></a>
-<span class="sourceLineNo">5203</span> ReplicationQueueStorage queueStorage =<a name="line.5203"></a>
-<span class="sourceLineNo">5204</span> ReplicationStorageFactory.getReplicationQueueStorage(zkw, getConf());<a name="line.5204"></a>
-<span class="sourceLineNo">5205</span> List<ReplicationPeerDescription> peerDescriptions = admin.listReplicationPeers();<a name="line.5205"></a>
-<span class="sourceLineNo">5206</span> if (peerDescriptions != null && peerDescriptions.size() > 0) {<a name="line.5206"></a>
-<span class="sourceLineNo">5207</span> List<String> peers = peerDescriptions.stream()<a name="line.5207"></a>
-<span class="sourceLineNo">5208</span> .filter(peerConfig -> ReplicationUtils.contains(peerConfig.getPeerConfig(),<a name="line.5208"></a>
-<span class="sourceLineNo">5209</span> cleanReplicationBarrierTable))<a name="line.5209"></a>
-<span class="sourceLineNo">5210</span> .map(peerConfig -> peerConfig.getPeerId()).collect(Collectors.toList());<a name="line.5210"></a>
-<span class="sourceLineNo">5211</span> try {<a name="line.5211"></a>
-<span class="sourceLineNo">5212</span> List<String> batch = new ArrayList<>();<a name="line.5212"></a>
-<span class="sourceLineNo">5213</span> for (String peer : peers) {<a name="line.5213"></a>
-<span class="sourceLineNo">5214</span> for (byte[] regionName : regionNames) {<a name="line.5214"></a>
-<span class="sourceLineNo">5215</span> batch.add(RegionInfo.encodeRegionName(regionName));<a name="line.5215"></a>
-<span class="sourceLineNo">5216</span> if (batch.size() % 100 == 0) {<a name="line.5216"></a>
-<span class="sourceLineNo">5217</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5217"></a>
-<span class="sourceLineNo">5218</span> batch.clear();<a name="line.5218"></a>
-<span class="sourceLineNo">5219</span> }<a name="line.5219"></a>
-<span class="sourceLineNo">5220</span> }<a name="line.5220"></a>
-<span class="sourceLineNo">5221</span> if (batch.size() > 0) {<a name="line.5221"></a>
-<span class="sourceLineNo">5222</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5222"></a>
-<span class="sourceLineNo">5223</span> batch.clear();<a name="line.5223"></a>
-<span class="sourceLineNo">5224</span> }<a name="line.5224"></a>
-<span class="sourceLineNo">5225</span> }<a name="line.5225"></a>
-<span class="sourceLineNo">5226</span> } catch (ReplicationException re) {<a name="line.5226"></a>
-<span class="sourceLineNo">5227</span> throw new IOException(re);<a name="line.5227"></a>
-<span class="sourceLineNo">5228</span> }<a name="line.5228"></a>
-<span class="sourceLineNo">5229</span> }<a name="line.5229"></a>
-<span class="sourceLineNo">5230</span> for (byte[] regionName : regionNames) {<a name="line.5230"></a>
-<span class="sourceLineNo">5231</span> meta.delete(new Delete(regionName).addFamily(HConstants.REPLICATION_BARRIER_FAMILY));<a name="line.5231"></a>
-<span class="sourceLineNo">5232</span> }<a name="line.5232"></a>
-<span class="sourceLineNo">5233</span> setShouldRerun();<a name="line.5233"></a>
-<span class="sourceLineNo">5234</span> }<a name="line.5234"></a>
-<span class="sourceLineNo">5235</span><a name="line.5235"></a>
-<span class="sourceLineNo">5236</span> /**<a name="line.5236"></a>
-<span class="sourceLineNo">5237</span> * ls -r for debugging purposes<a name="line.5237"></a>
-<span class="sourceLineNo">5238</span> */<a name="line.5238"></a>
-<span class="sourceLineNo">5239</span> void debugLsr(Path p) throws IOException {<a name="line.5239"></a>
-<span class="sourceLineNo">5240</span> debugLsr(getConf(), p, errors);<a name="line.5240"></a>
-<span class="sourceLineNo">5241</span> }<a name="line.5241"></a>
-<span class="sourceLineNo">5242</span><a name="line.5242"></a>
-<span class="sourceLineNo">5243</span> /**<a name="line.5243"></a>
-<span class="sourceLineNo">5244</span> * ls -r for debugging purposes<a name="line.5244"></a>
-<span class="sourceLineNo">5245</span> */<a name="line.5245"></a>
-<span class="sourceLineNo">5246</span> public static void debugLsr(Configuration conf,<a name="line.5246"></a>
-<span class="sourceLineNo">5247</span> Path p) throws IOException {<a name="line.5247"></a>
-<span class="sourceLineNo">5248</span> debugLsr(conf, p, new PrintingErrorReporter());<a name="line.5248"></a>
-<span class="sourceLineNo">5249</span> }<a name="line.5249"></a>
-<span class="sourceLineNo">5250</span><a name="line.5250"></a>
-<span class="sourceLineNo">5251</span> /**<a name="line.5251"></a>
-<span class="sourceLineNo">5252</span> * ls -r for debugging purposes<a name="line.5252"></a>
-<span class="sourceLineNo">5253</span> */<a name="line.5253"></a>
-<span class="sourceLineNo">5254</span> public static void debugLsr(Configuration conf,<a name="line.5254"></a>
-<span class="sourceLineNo">5255</span> Path p, ErrorReporter errors) throws IOException {<a name="line.5255"></a>
-<span class="sourceLineNo">5256</span> if (!LOG.isDebugEnabled() || p == null) {<a name="line.5256"></a>
-<span class="sourceLineNo">5257</span> return;<a name="line.5257"></a>
-<span class="sourceLineNo">5258</span> }<a name="line.5258"></a>
-<span class="sourceLineNo">5259</span> FileSystem fs = p.getFileSystem(conf);<a name="line.5259"></a>
-<span class="sourceLineNo">5260</span><a name="line.5260"></a>
-<span class="sourceLineNo">5261</span> if (!fs.exists(p)) {<a name="line.5261"></a>
-<span class="sourceLineNo">5262</span> // nothing<a name="line.5262"></a>
-<span class="sourceLineNo">5263</span> return;<a name="line.5263"></a>
-<span class="sourceLineNo">5264</span> }<a name="line.5264"></a>
-<span class="sourceLineNo">5265</span> errors.print(p.toString());<a name="line.5265"></a>
-<span class="sourceLineNo">5266</span><a name="line.5266"></a>
-<span class="sourceLineNo">5267</span> if (fs.isFile(p)) {<a name="line.5267"></a>
-<span class="sourceLineNo">5268</span> return;<a name="line.5268"></a>
-<span class="sourceLineNo">5269</span> }<a name="line.5269"></a>
-<span class="sourceLineNo">5270</span><a name="line.5270"></a>
-<span class="sourceLineNo">5271</span> if (fs.getFileStatus(p).isDirectory()) {<a name="line.5271"></a>
-<span class="sourceLineNo">5272</span> FileStatus[] fss= fs.listStatus(p);<a name="line.5272"></a>
-<span class="sourceLineNo">5273</span> for (FileStatus status : fss) {<a name="line.5273"></a>
-<span class="sourceLineNo">5274</span> debugLsr(conf, status.getPath(), errors);<a name="line.5274"></a>
-<span class="sourceLineNo">5275</span> }<a name="line.5275"></a>
-<span class="sourceLineNo">5276</span> }<a name="line.5276"></a>
-<span class="sourceLineNo">5277</span> }<a name="line.5277"></a>
-<span class="sourceLineNo">5278</span>}<a name="line.5278"></a>
+<span class="sourceLineNo">5142</span> if (VersionInfo.compareVersion("2.any.any", hbaseServerVersion) < 0) {<a name="line.5142"></a>
+<span class="sourceLineNo">5143</span> // Process command-line args.<a name="line.5143"></a>
+<span class="sourceLineNo">5144</span> for (String arg : args) {<a name="line.5144"></a>
+<span class="sourceLineNo">5145</span> if (unsupportedOptionsInV2.contains(arg)) {<a name="line.5145"></a>
+<span class="sourceLineNo">5146</span> errors.reportError(ERROR_CODE.UNSUPPORTED_OPTION,<a name="line.5146"></a>
+<span class="sourceLineNo">5147</span> "option '" + arg + "' is not " + "supportted!");<a name="line.5147"></a>
+<span class="sourceLineNo">5148</span> result = false;<a name="line.5148"></a>
+<span class="sourceLineNo">5149</span> break;<a name="line.5149"></a>
+<span class="sourceLineNo">5150</span> }<a name="line.5150"></a>
+<span class="sourceLineNo">5151</span> }<a name="line.5151"></a>
+<span class="sourceLineNo">5152</span> }<a name="line.5152"></a>
+<span class="sourceLineNo">5153</span> return result;<a name="line.5153"></a>
+<span class="sourceLineNo">5154</span> }<a name="line.5154"></a>
+<span class="sourceLineNo">5155</span><a name="line.5155"></a>
+<span class="sourceLineNo">5156</span> public void setCleanReplicationBarrierTable(String cleanReplicationBarrierTable) {<a name="line.5156"></a>
+<span class="sourceLineNo">5157</span> this.cleanReplicationBarrierTable = TableName.valueOf(cleanReplicationBarrierTable);<a name="line.5157"></a>
+<span class="sourceLineNo">5158</span> }<a name="line.5158"></a>
+<span class="sourceLineNo">5159</span><a name="line.5159"></a>
+<span class="sourceLineNo">5160</span> public void cleanReplicationBarrier() throws IOException {<a name="line.5160"></a>
+<span class="sourceLineNo">5161</span> if (!cleanReplicationBarrier || cleanReplicationBarrierTable == null) {<a name="line.5161"></a>
+<span class="sourceLineNo">5162</span> return;<a name="line.5162"></a>
+<span class="sourceLineNo">5163</span> }<a name="line.5163"></a>
+<span class="sourceLineNo">5164</span> if (cleanReplicationBarrierTable.isSystemTable()) {<a name="line.5164"></a>
+<span class="sourceLineNo">5165</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5165"></a>
+<span class="sourceLineNo">5166</span> "invalid table: " + cleanReplicationBarrierTable);<a name="line.5166"></a>
+<span class="sourceLineNo">5167</span> return;<a name="line.5167"></a>
+<span class="sourceLineNo">5168</span> }<a name="line.5168"></a>
+<span class="sourceLineNo">5169</span><a name="line.5169"></a>
+<span class="sourceLineNo">5170</span> boolean isGlobalScope = false;<a name="line.5170"></a>
+<span class="sourceLineNo">5171</span> try {<a name="line.5171"></a>
+<span class="sourceLineNo">5172</span> isGlobalScope = admin.getDescriptor(cleanReplicationBarrierTable).hasGlobalReplicationScope();<a name="line.5172"></a>
+<span class="sourceLineNo">5173</span> } catch (TableNotFoundException e) {<a name="line.5173"></a>
+<span class="sourceLineNo">5174</span> LOG.info("we may need to clean some erroneous data due to bugs");<a name="line.5174"></a>
+<span class="sourceLineNo">5175</span> }<a name="line.5175"></a>
+<span class="sourceLineNo">5176</span><a name="line.5176"></a>
+<span class="sourceLineNo">5177</span> if (isGlobalScope) {<a name="line.5177"></a>
+<span class="sourceLineNo">5178</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5178"></a>
+<span class="sourceLineNo">5179</span> "table's replication scope is global: " + cleanReplicationBarrierTable);<a name="line.5179"></a>
+<span class="sourceLineNo">5180</span> return;<a name="line.5180"></a>
+<span class="sourceLineNo">5181</span> }<a name="line.5181"></a>
+<span class="sourceLineNo">5182</span> List<byte[]> regionNames = new ArrayList<>();<a name="line.5182"></a>
+<span class="sourceLineNo">5183</span> Scan barrierScan = new Scan();<a name="line.5183"></a>
+<span class="sourceLineNo">5184</span> barrierScan.setCaching(100);<a name="line.5184"></a>
+<span class="sourceLineNo">5185</span> barrierScan.addFamily(HConstants.REPLICATION_BARRIER_FAMILY);<a name="line.5185"></a>
+<span class="sourceLineNo">5186</span> barrierScan<a name="line.5186"></a>
+<span class="sourceLineNo">5187</span> .withStartRow(MetaTableAccessor.getTableStartRowForMeta(cleanReplicationBarrierTable,<a name="line.5187"></a>
+<span class="sourceLineNo">5188</span> MetaTableAccessor.QueryType.REGION))<a name="line.5188"></a>
+<span class="sourceLineNo">5189</span> .withStopRow(MetaTableAccessor.getTableStopRowForMeta(cleanReplicationBarrierTable,<a name="line.5189"></a>
+<span class="sourceLineNo">5190</span> MetaTableAccessor.QueryType.REGION));<a name="line.5190"></a>
+<span class="sourceLineNo">5191</span> Result result;<a name="line.5191"></a>
+<span class="sourceLineNo">5192</span> try (ResultScanner scanner = meta.getScanner(barrierScan)) {<a name="line.5192"></a>
+<span class="sourceLineNo">5193</span> while ((result = scanner.next()) != null) {<a name="line.5193"></a>
+<span class="sourceLineNo">5194</span> regionNames.add(result.getRow());<a name="line.5194"></a>
+<span class="sourceLineNo">5195</span> }<a name="line.5195"></a>
+<span class="sourceLineNo">5196</span> }<a name="line.5196"></a>
+<span class="sourceLineNo">5197</span> if (regionNames.size() <= 0) {<a name="line.5197"></a>
+<span class="sourceLineNo">5198</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5198"></a>
+<span class="sourceLineNo">5199</span> "there is no barriers of this table: " + cleanReplicationBarrierTable);<a name="line.5199"></a>
+<span class="sourceLineNo">5200</span> return;<a name="line.5200"></a>
+<span class="sourceLineNo">5201</span> }<a name="line.5201"></a>
+<span class="sourceLineNo">5202</span> ReplicationQueueStorage queueStorage =<a name="line.5202"></a>
+<span class="sourceLineNo">5203</span> ReplicationStorageFactory.getReplicationQueueStorage(zkw, getConf());<a name="line.5203"></a>
+<span class="sourceLineNo">5204</span> List<ReplicationPeerDescription> peerDescriptions = admin.listReplicationPeers();<a name="line.5204"></a>
+<span class="sourceLineNo">5205</span> if (peerDescriptions != null && peerDescriptions.size() > 0) {<a name="line.5205"></a>
+<span class="sourceLineNo">5206</span> List<String> peers = peerDescriptions.stream()<a name="line.5206"></a>
+<span class="sourceLineNo">5207</span> .filter(peerConfig -> ReplicationUtils.contains(peerConfig.getPeerConfig(),<a name="line.5207"></a>
+<span class="sourceLineNo">5208</span> cleanReplicationBarrierTable))<a name="line.5208"></a>
+<span class="sourceLineNo">5209</span> .map(peerConfig -> peerConfig.getPeerId()).collect(Collectors.toList());<a name="line.5209"></a>
+<span class="sourceLineNo">5210</span> try {<a name="line.5210"></a>
+<span class="sourceLineNo">5211</span> List<String> batch = new ArrayList<>();<a name="line.5211"></a>
+<span class="sourceLineNo">5212</span> for (String peer : peers) {<a name="line.5212"></a>
+<span class="sourceLineNo">5213</span> for (byte[] regionName : regionNames) {<a name="line.5213"></a>
+<span class="sourceLineNo">5214</span> batch.add(RegionInfo.encodeRegionName(regionName));<a name="line.5214"></a>
+<span class="sourceLineNo">5215</span> if (batch.size() % 100 == 0) {<a name="line.5215"></a>
+<span class="sourceLineNo">5216</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5216"></a>
+<span class="sourceLineNo">5217</span> batch.clear();<a name="line.5217"></a>
+<span class="sourceLineNo">5218</span> }<a name="line.5218"></a>
+<span class="sourceLineNo">5219</span> }<a name="line.5219"></a>
+<span class="sourceLineNo">5220</span> if (batch.size() > 0) {<a name="line.5220"></a>
+<span class="sourceLineNo">5221</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5221"></a>
+<span class="sourceLineNo">5222</span> batch.clear();<a name="line.5222"></a>
+<span class="sourceLineNo">5223</span> }<a name="line.5223"></a>
+<span class="sourceLineNo">5224</span> }<a name="line.5224"></a>
+<span class="sourceLineNo">5225</span> } catch (ReplicationException re) {<a name="line.5225"></a>
+<span class="sourceLineNo">5226</span> throw new IOException(re);<a name="line.5226"></a>
+<span class="sourceLineNo">5227</span> }<a name="line.5227"></a>
+<span class="sourceLineNo">5228</span> }<a name="line.5228"></a>
+<span class="sourceLineNo">5229</span> for (byte[] regionName : regionNames) {<a name="line.5229"></a>
+<span class="sourceLineNo">5230</span> meta.delete(new Delete(regionName).addFamily(HConstants.REPLICATION_BARRIER_FAMILY));<a name="line.5230"></a>
+<span class="sourceLineNo">5231</span> }<a name="line.5231"></a>
+<span class="sourceLineNo">5232</span> setShouldRerun();<a name="line.5232"></a>
+<span class="sourceLineNo">5233</span> }<a name="line.5233"></a>
+<span class="sourceLineNo">5234</span><a name="line.5234"></a>
+<span class="sourceLineNo">5235</span> /**<a name="line.5235"></a>
+<span class="sourceLineNo">5236</span> * ls -r for debugging purposes<a name="line.5236"></a>
+<span class="sourceLineNo">5237</span> */<a name="line.5237"></a>
+<span class="sourceLineNo">5238</span> void debugLsr(Path p) throws IOException {<a name="line.5238"></a>
+<span class="sourceLineNo">5239</span> debugLsr(getConf(), p, errors);<a name="line.5239"></a>
+<span class="sourceLineNo">5240</span> }<a name="line.5240"></a>
+<span class="sourceLineNo">5241</span><a name="line.5241"></a>
+<span class="sourceLineNo">5242</span> /**<a name="line.5242"></a>
+<span class="sourceLineNo">5243</span> * ls -r for debugging purposes<a name="line.5243"></a>
+<span class="sourceLineNo">5244</span> */<a name="line.5244"></a>
+<span class="sourceLineNo">5245</span> public static void debugLsr(Configuration conf,<a name="line.5245"></a>
+<span class="sourceLineNo">5246</span> Path p) throws IOException {<a name="line.5246"></a>
+<span class="sourceLineNo">5247</span> debugLsr(conf, p, new PrintingErrorReporter());<a name="line.5247"></a>
+<span class="sourceLineNo">5248</span> }<a name="line.5248"></a>
+<span class="sourceLineNo">5249</span><a name="line.5249"></a>
+<span class="sourceLineNo">5250</span> /**<a name="line.5250"></a>
+<span class="sourceLineNo">5251</span> * ls -r for debugging purposes<a name="line.5251"></a>
+<span class="sourceLineNo">5252</span> */<a name="line.5252"></a>
+<span class="sourceLineNo">5253</span> public static void debugLsr(Configuration conf,<a name="line.5253"></a>
+<span class="sourceLineNo">5254</span> Path p, ErrorReporter errors) throws IOException {<a name="line.5254"></a>
+<span class="sourceLineNo">5255</span> if (!LOG.isDebugEnabled() || p == null) {<a name="line.5255"></a>
+<span class="sourceLineNo">5256</span> return;<a name="line.5256"></a>
+<span class="sourceLineNo">5257</span> }<a name="line.5257"></a>
+<span class="sourceLineNo">5258</span> FileSystem fs = p.getFileSystem(conf);<a name="line.5258"></a>
+<span class="sourceLineNo">5259</span><a name="line.5259"></a>
+<span class="sourceLineNo">5260</span> if (!fs.exists(p)) {<a name="line.5260"></a>
+<span class="sourceLineNo">5261</span> // nothing<a name="line.5261"></a>
+<span class="sourceLineNo">5262</span> return;<a name="line.5262"></a>
+<span class="sourceLineNo">5263</span> }<a name="line.5263"></a>
+<span class="sourceLineNo">5264</span> errors.print(p.toString());<a name="line.5264"></a>
+<span class="sourceLineNo">5265</span><a name="line.5265"></a>
+<span class="sourceLineNo">5266</span> if (fs.isFile(p)) {<a name="line.5266"></a>
+<span class="sourceLineNo">5267</span> return;<a name="line.5267"></a>
+<span class="sourceLineNo">5268</span> }<a name="line.5268"></a>
+<span class="sourceLineNo">5269</span><a name="line.5269"></a>
+<span class="sourceLineNo">5270</span> if (fs.getFileStatus(p).isDirectory()) {<a name="line.5270"></a>
+<span class="sourceLineNo">5271</span> FileStatus[] fss= fs.listStatus(p);<a name="line.5271"></a>
+<span class="sourceLineNo">5272</span> for (FileStatus status : fss) {<a name="line.5272"></a>
+<span class="sourceLineNo">5273</span> debugLsr(conf, status.getPath(), errors);<a name="line.5273"></a>
+<span class="sourceLineNo">5274</span> }<a name="line.5274"></a>
+<span class="sourceLineNo">5275</span> }<a name="line.5275"></a>
+<span class="sourceLineNo">5276</span> }<a name="line.5276"></a>
+<span class="sourceLineNo">5277</span>}<a name="line.5277"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8ad0fa3b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
index 63e7421..2fa8df1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
@@ -5147,143 +5147,142 @@
<span class="sourceLineNo">5139</span> private boolean isOptionsSupported(String[] args) {<a name="line.5139"></a>
<span class="sourceLineNo">5140</span> boolean result = true;<a name="line.5140"></a>
<span class="sourceLineNo">5141</span> String hbaseServerVersion = status.getHBaseVersion();<a name="line.5141"></a>
-<span class="sourceLineNo">5142</span> Object[] versionComponents = VersionInfo.getVersionComponents(hbaseServerVersion);<a name="line.5142"></a>
-<span class="sourceLineNo">5143</span> if (versionComponents[0] instanceof Integer && ((Integer) versionComponents[0]) >= 2) {<a name="line.5143"></a>
-<span class="sourceLineNo">5144</span> // Process command-line args.<a name="line.5144"></a>
-<span class="sourceLineNo">5145</span> for (String arg : args) {<a name="line.5145"></a>
-<span class="sourceLineNo">5146</span> if (unsupportedOptionsInV2.contains(arg)) {<a name="line.5146"></a>
-<span class="sourceLineNo">5147</span> errors.reportError(ERROR_CODE.UNSUPPORTED_OPTION,<a name="line.5147"></a>
-<span class="sourceLineNo">5148</span> "option '" + arg + "' is not " + "supportted!");<a name="line.5148"></a>
-<span class="sourceLineNo">5149</span> result = false;<a name="line.5149"></a>
-<span class="sourceLineNo">5150</span> break;<a name="line.5150"></a>
-<span class="sourceLineNo">5151</span> }<a name="line.5151"></a>
-<span class="sourceLineNo">5152</span> }<a name="line.5152"></a>
-<span class="sourceLineNo">5153</span> }<a name="line.5153"></a>
-<span class="sourceLineNo">5154</span> return result;<a name="line.5154"></a>
-<span class="sourceLineNo">5155</span> }<a name="line.5155"></a>
-<span class="sourceLineNo">5156</span><a name="line.5156"></a>
-<span class="sourceLineNo">5157</span> public void setCleanReplicationBarrierTable(String cleanReplicationBarrierTable) {<a name="line.5157"></a>
-<span class="sourceLineNo">5158</span> this.cleanReplicationBarrierTable = TableName.valueOf(cleanReplicationBarrierTable);<a name="line.5158"></a>
-<span class="sourceLineNo">5159</span> }<a name="line.5159"></a>
-<span class="sourceLineNo">5160</span><a name="line.5160"></a>
-<span class="sourceLineNo">5161</span> public void cleanReplicationBarrier() throws IOException {<a name="line.5161"></a>
-<span class="sourceLineNo">5162</span> if (!cleanReplicationBarrier || cleanReplicationBarrierTable == null) {<a name="line.5162"></a>
-<span class="sourceLineNo">5163</span> return;<a name="line.5163"></a>
-<span class="sourceLineNo">5164</span> }<a name="line.5164"></a>
-<span class="sourceLineNo">5165</span> if (cleanReplicationBarrierTable.isSystemTable()) {<a name="line.5165"></a>
-<span class="sourceLineNo">5166</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5166"></a>
-<span class="sourceLineNo">5167</span> "invalid table: " + cleanReplicationBarrierTable);<a name="line.5167"></a>
-<span class="sourceLineNo">5168</span> return;<a name="line.5168"></a>
-<span class="sourceLineNo">5169</span> }<a name="line.5169"></a>
-<span class="sourceLineNo">5170</span><a name="line.5170"></a>
-<span class="sourceLineNo">5171</span> boolean isGlobalScope = false;<a name="line.5171"></a>
-<span class="sourceLineNo">5172</span> try {<a name="line.5172"></a>
-<span class="sourceLineNo">5173</span> isGlobalScope = admin.getDescriptor(cleanReplicationBarrierTable).hasGlobalReplicationScope();<a name="line.5173"></a>
-<span class="sourceLineNo">5174</span> } catch (TableNotFoundException e) {<a name="line.5174"></a>
-<span class="sourceLineNo">5175</span> LOG.info("we may need to clean some erroneous data due to bugs");<a name="line.5175"></a>
-<span class="sourceLineNo">5176</span> }<a name="line.5176"></a>
-<span class="sourceLineNo">5177</span><a name="line.5177"></a>
-<span class="sourceLineNo">5178</span> if (isGlobalScope) {<a name="line.5178"></a>
-<span class="sourceLineNo">5179</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5179"></a>
-<span class="sourceLineNo">5180</span> "table's replication scope is global: " + cleanReplicationBarrierTable);<a name="line.5180"></a>
-<span class="sourceLineNo">5181</span> return;<a name="line.5181"></a>
-<span class="sourceLineNo">5182</span> }<a name="line.5182"></a>
-<span class="sourceLineNo">5183</span> List<byte[]> regionNames = new ArrayList<>();<a name="line.5183"></a>
-<span class="sourceLineNo">5184</span> Scan barrierScan = new Scan();<a name="line.5184"></a>
-<span class="sourceLineNo">5185</span> barrierScan.setCaching(100);<a name="line.5185"></a>
-<span class="sourceLineNo">5186</span> barrierScan.addFamily(HConstants.REPLICATION_BARRIER_FAMILY);<a name="line.5186"></a>
-<span class="sourceLineNo">5187</span> barrierScan<a name="line.5187"></a>
-<span class="sourceLineNo">5188</span> .withStartRow(MetaTableAccessor.getTableStartRowForMeta(cleanReplicationBarrierTable,<a name="line.5188"></a>
-<span class="sourceLineNo">5189</span> MetaTableAccessor.QueryType.REGION))<a name="line.5189"></a>
-<span class="sourceLineNo">5190</span> .withStopRow(MetaTableAccessor.getTableStopRowForMeta(cleanReplicationBarrierTable,<a name="line.5190"></a>
-<span class="sourceLineNo">5191</span> MetaTableAccessor.QueryType.REGION));<a name="line.5191"></a>
-<span class="sourceLineNo">5192</span> Result result;<a name="line.5192"></a>
-<span class="sourceLineNo">5193</span> try (ResultScanner scanner = meta.getScanner(barrierScan)) {<a name="line.5193"></a>
-<span class="sourceLineNo">5194</span> while ((result = scanner.next()) != null) {<a name="line.5194"></a>
-<span class="sourceLineNo">5195</span> regionNames.add(result.getRow());<a name="line.5195"></a>
-<span class="sourceLineNo">5196</span> }<a name="line.5196"></a>
-<span class="sourceLineNo">5197</span> }<a name="line.5197"></a>
-<span class="sourceLineNo">5198</span> if (regionNames.size() <= 0) {<a name="line.5198"></a>
-<span class="sourceLineNo">5199</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5199"></a>
-<span class="sourceLineNo">5200</span> "there is no barriers of this table: " + cleanReplicationBarrierTable);<a name="line.5200"></a>
-<span class="sourceLineNo">5201</span> return;<a name="line.5201"></a>
-<span class="sourceLineNo">5202</span> }<a name="line.5202"></a>
-<span class="sourceLineNo">5203</span> ReplicationQueueStorage queueStorage =<a name="line.5203"></a>
-<span class="sourceLineNo">5204</span> ReplicationStorageFactory.getReplicationQueueStorage(zkw, getConf());<a name="line.5204"></a>
-<span class="sourceLineNo">5205</span> List<ReplicationPeerDescription> peerDescriptions = admin.listReplicationPeers();<a name="line.5205"></a>
-<span class="sourceLineNo">5206</span> if (peerDescriptions != null && peerDescriptions.size() > 0) {<a name="line.5206"></a>
-<span class="sourceLineNo">5207</span> List<String> peers = peerDescriptions.stream()<a name="line.5207"></a>
-<span class="sourceLineNo">5208</span> .filter(peerConfig -> ReplicationUtils.contains(peerConfig.getPeerConfig(),<a name="line.5208"></a>
-<span class="sourceLineNo">5209</span> cleanReplicationBarrierTable))<a name="line.5209"></a>
-<span class="sourceLineNo">5210</span> .map(peerConfig -> peerConfig.getPeerId()).collect(Collectors.toList());<a name="line.5210"></a>
-<span class="sourceLineNo">5211</span> try {<a name="line.5211"></a>
-<span class="sourceLineNo">5212</span> List<String> batch = new ArrayList<>();<a name="line.5212"></a>
-<span class="sourceLineNo">5213</span> for (String peer : peers) {<a name="line.5213"></a>
-<span class="sourceLineNo">5214</span> for (byte[] regionName : regionNames) {<a name="line.5214"></a>
-<span class="sourceLineNo">5215</span> batch.add(RegionInfo.encodeRegionName(regionName));<a name="line.5215"></a>
-<span class="sourceLineNo">5216</span> if (batch.size() % 100 == 0) {<a name="line.5216"></a>
-<span class="sourceLineNo">5217</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5217"></a>
-<span class="sourceLineNo">5218</span> batch.clear();<a name="line.5218"></a>
-<span class="sourceLineNo">5219</span> }<a name="line.5219"></a>
-<span class="sourceLineNo">5220</span> }<a name="line.5220"></a>
-<span class="sourceLineNo">5221</span> if (batch.size() > 0) {<a name="line.5221"></a>
-<span class="sourceLineNo">5222</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5222"></a>
-<span class="sourceLineNo">5223</span> batch.clear();<a name="line.5223"></a>
-<span class="sourceLineNo">5224</span> }<a name="line.5224"></a>
-<span class="sourceLineNo">5225</span> }<a name="line.5225"></a>
-<span class="sourceLineNo">5226</span> } catch (ReplicationException re) {<a name="line.5226"></a>
-<span class="sourceLineNo">5227</span> throw new IOException(re);<a name="line.5227"></a>
-<span class="sourceLineNo">5228</span> }<a name="line.5228"></a>
-<span class="sourceLineNo">5229</span> }<a name="line.5229"></a>
-<span class="sourceLineNo">5230</span> for (byte[] regionName : regionNames) {<a name="line.5230"></a>
-<span class="sourceLineNo">5231</span> meta.delete(new Delete(regionName).addFamily(HConstants.REPLICATION_BARRIER_FAMILY));<a name="line.5231"></a>
-<span class="sourceLineNo">5232</span> }<a name="line.5232"></a>
-<span class="sourceLineNo">5233</span> setShouldRerun();<a name="line.5233"></a>
-<span class="sourceLineNo">5234</span> }<a name="line.5234"></a>
-<span class="sourceLineNo">5235</span><a name="line.5235"></a>
-<span class="sourceLineNo">5236</span> /**<a name="line.5236"></a>
-<span class="sourceLineNo">5237</span> * ls -r for debugging purposes<a name="line.5237"></a>
-<span class="sourceLineNo">5238</span> */<a name="line.5238"></a>
-<span class="sourceLineNo">5239</span> void debugLsr(Path p) throws IOException {<a name="line.5239"></a>
-<span class="sourceLineNo">5240</span> debugLsr(getConf(), p, errors);<a name="line.5240"></a>
-<span class="sourceLineNo">5241</span> }<a name="line.5241"></a>
-<span class="sourceLineNo">5242</span><a name="line.5242"></a>
-<span class="sourceLineNo">5243</span> /**<a name="line.5243"></a>
-<span class="sourceLineNo">5244</span> * ls -r for debugging purposes<a name="line.5244"></a>
-<span class="sourceLineNo">5245</span> */<a name="line.5245"></a>
-<span class="sourceLineNo">5246</span> public static void debugLsr(Configuration conf,<a name="line.5246"></a>
-<span class="sourceLineNo">5247</span> Path p) throws IOException {<a name="line.5247"></a>
-<span class="sourceLineNo">5248</span> debugLsr(conf, p, new PrintingErrorReporter());<a name="line.5248"></a>
-<span class="sourceLineNo">5249</span> }<a name="line.5249"></a>
-<span class="sourceLineNo">5250</span><a name="line.5250"></a>
-<span class="sourceLineNo">5251</span> /**<a name="line.5251"></a>
-<span class="sourceLineNo">5252</span> * ls -r for debugging purposes<a name="line.5252"></a>
-<span class="sourceLineNo">5253</span> */<a name="line.5253"></a>
-<span class="sourceLineNo">5254</span> public static void debugLsr(Configuration conf,<a name="line.5254"></a>
-<span class="sourceLineNo">5255</span> Path p, ErrorReporter errors) throws IOException {<a name="line.5255"></a>
-<span class="sourceLineNo">5256</span> if (!LOG.isDebugEnabled() || p == null) {<a name="line.5256"></a>
-<span class="sourceLineNo">5257</span> return;<a name="line.5257"></a>
-<span class="sourceLineNo">5258</span> }<a name="line.5258"></a>
-<span class="sourceLineNo">5259</span> FileSystem fs = p.getFileSystem(conf);<a name="line.5259"></a>
-<span class="sourceLineNo">5260</span><a name="line.5260"></a>
-<span class="sourceLineNo">5261</span> if (!fs.exists(p)) {<a name="line.5261"></a>
-<span class="sourceLineNo">5262</span> // nothing<a name="line.5262"></a>
-<span class="sourceLineNo">5263</span> return;<a name="line.5263"></a>
-<span class="sourceLineNo">5264</span> }<a name="line.5264"></a>
-<span class="sourceLineNo">5265</span> errors.print(p.toString());<a name="line.5265"></a>
-<span class="sourceLineNo">5266</span><a name="line.5266"></a>
-<span class="sourceLineNo">5267</span> if (fs.isFile(p)) {<a name="line.5267"></a>
-<span class="sourceLineNo">5268</span> return;<a name="line.5268"></a>
-<span class="sourceLineNo">5269</span> }<a name="line.5269"></a>
-<span class="sourceLineNo">5270</span><a name="line.5270"></a>
-<span class="sourceLineNo">5271</span> if (fs.getFileStatus(p).isDirectory()) {<a name="line.5271"></a>
-<span class="sourceLineNo">5272</span> FileStatus[] fss= fs.listStatus(p);<a name="line.5272"></a>
-<span class="sourceLineNo">5273</span> for (FileStatus status : fss) {<a name="line.5273"></a>
-<span class="sourceLineNo">5274</span> debugLsr(conf, status.getPath(), errors);<a name="line.5274"></a>
-<span class="sourceLineNo">5275</span> }<a name="line.5275"></a>
-<span class="sourceLineNo">5276</span> }<a name="line.5276"></a>
-<span class="sourceLineNo">5277</span> }<a name="line.5277"></a>
-<span class="sourceLineNo">5278</span>}<a name="line.5278"></a>
+<span class="sourceLineNo">5142</span> if (VersionInfo.compareVersion("2.any.any", hbaseServerVersion) < 0) {<a name="line.5142"></a>
+<span class="sourceLineNo">5143</span> // Process command-line args.<a name="line.5143"></a>
+<span class="sourceLineNo">5144</span> for (String arg : args) {<a name="line.5144"></a>
+<span class="sourceLineNo">5145</span> if (unsupportedOptionsInV2.contains(arg)) {<a name="line.5145"></a>
+<span class="sourceLineNo">5146</span> errors.reportError(ERROR_CODE.UNSUPPORTED_OPTION,<a name="line.5146"></a>
+<span class="sourceLineNo">5147</span> "option '" + arg + "' is not " + "supportted!");<a name="line.5147"></a>
+<span class="sourceLineNo">5148</span> result = false;<a name="line.5148"></a>
+<span class="sourceLineNo">5149</span> break;<a name="line.5149"></a>
+<span class="sourceLineNo">5150</span> }<a name="line.5150"></a>
+<span class="sourceLineNo">5151</span> }<a name="line.5151"></a>
+<span class="sourceLineNo">5152</span> }<a name="line.5152"></a>
+<span class="sourceLineNo">5153</span> return result;<a name="line.5153"></a>
+<span class="sourceLineNo">5154</span> }<a name="line.5154"></a>
+<span class="sourceLineNo">5155</span><a name="line.5155"></a>
+<span class="sourceLineNo">5156</span> public void setCleanReplicationBarrierTable(String cleanReplicationBarrierTable) {<a name="line.5156"></a>
+<span class="sourceLineNo">5157</span> this.cleanReplicationBarrierTable = TableName.valueOf(cleanReplicationBarrierTable);<a name="line.5157"></a>
+<span class="sourceLineNo">5158</span> }<a name="line.5158"></a>
+<span class="sourceLineNo">5159</span><a name="line.5159"></a>
+<span class="sourceLineNo">5160</span> public void cleanReplicationBarrier() throws IOException {<a name="line.5160"></a>
+<span class="sourceLineNo">5161</span> if (!cleanReplicationBarrier || cleanReplicationBarrierTable == null) {<a name="line.5161"></a>
+<span class="sourceLineNo">5162</span> return;<a name="line.5162"></a>
+<span class="sourceLineNo">5163</span> }<a name="line.5163"></a>
+<span class="sourceLineNo">5164</span> if (cleanReplicationBarrierTable.isSystemTable()) {<a name="line.5164"></a>
+<span class="sourceLineNo">5165</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5165"></a>
+<span class="sourceLineNo">5166</span> "invalid table: " + cleanReplicationBarrierTable);<a name="line.5166"></a>
+<span class="sourceLineNo">5167</span> return;<a name="line.5167"></a>
+<span class="sourceLineNo">5168</span> }<a name="line.5168"></a>
+<span class="sourceLineNo">5169</span><a name="line.5169"></a>
+<span class="sourceLineNo">5170</span> boolean isGlobalScope = false;<a name="line.5170"></a>
+<span class="sourceLineNo">5171</span> try {<a name="line.5171"></a>
+<span class="sourceLineNo">5172</span> isGlobalScope = admin.getDescriptor(cleanReplicationBarrierTable).hasGlobalReplicationScope();<a name="line.5172"></a>
+<span class="sourceLineNo">5173</span> } catch (TableNotFoundException e) {<a name="line.5173"></a>
+<span class="sourceLineNo">5174</span> LOG.info("we may need to clean some erroneous data due to bugs");<a name="line.5174"></a>
+<span class="sourceLineNo">5175</span> }<a name="line.5175"></a>
+<span class="sourceLineNo">5176</span><a name="line.5176"></a>
+<span class="sourceLineNo">5177</span> if (isGlobalScope) {<a name="line.5177"></a>
+<span class="sourceLineNo">5178</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5178"></a>
+<span class="sourceLineNo">5179</span> "table's replication scope is global: " + cleanReplicationBarrierTable);<a name="line.5179"></a>
+<span class="sourceLineNo">5180</span> return;<a name="line.5180"></a>
+<span class="sourceLineNo">5181</span> }<a name="line.5181"></a>
+<span class="sourceLineNo">5182</span> List<byte[]> regionNames = new ArrayList<>();<a name="line.5182"></a>
+<span class="sourceLineNo">5183</span> Scan barrierScan = new Scan();<a name="line.5183"></a>
+<span class="sourceLineNo">5184</span> barrierScan.setCaching(100);<a name="line.5184"></a>
+<span class="sourceLineNo">5185</span> barrierScan.addFamily(HConstants.REPLICATION_BARRIER_FAMILY);<a name="line.5185"></a>
+<span class="sourceLineNo">5186</span> barrierScan<a name="line.5186"></a>
+<span class="sourceLineNo">5187</span> .withStartRow(MetaTableAccessor.getTableStartRowForMeta(cleanReplicationBarrierTable,<a name="line.5187"></a>
+<span class="sourceLineNo">5188</span> MetaTableAccessor.QueryType.REGION))<a name="line.5188"></a>
+<span class="sourceLineNo">5189</span> .withStopRow(MetaTableAccessor.getTableStopRowForMeta(cleanReplicationBarrierTable,<a name="line.5189"></a>
+<span class="sourceLineNo">5190</span> MetaTableAccessor.QueryType.REGION));<a name="line.5190"></a>
+<span class="sourceLineNo">5191</span> Result result;<a name="line.5191"></a>
+<span class="sourceLineNo">5192</span> try (ResultScanner scanner = meta.getScanner(barrierScan)) {<a name="line.5192"></a>
+<span class="sourceLineNo">5193</span> while ((result = scanner.next()) != null) {<a name="line.5193"></a>
+<span class="sourceLineNo">5194</span> regionNames.add(result.getRow());<a name="line.5194"></a>
+<span class="sourceLineNo">5195</span> }<a name="line.5195"></a>
+<span class="sourceLineNo">5196</span> }<a name="line.5196"></a>
+<span class="sourceLineNo">5197</span> if (regionNames.size() <= 0) {<a name="line.5197"></a>
+<span class="sourceLineNo">5198</span> errors.reportError(ERROR_CODE.INVALID_TABLE,<a name="line.5198"></a>
+<span class="sourceLineNo">5199</span> "there is no barriers of this table: " + cleanReplicationBarrierTable);<a name="line.5199"></a>
+<span class="sourceLineNo">5200</span> return;<a name="line.5200"></a>
+<span class="sourceLineNo">5201</span> }<a name="line.5201"></a>
+<span class="sourceLineNo">5202</span> ReplicationQueueStorage queueStorage =<a name="line.5202"></a>
+<span class="sourceLineNo">5203</span> ReplicationStorageFactory.getReplicationQueueStorage(zkw, getConf());<a name="line.5203"></a>
+<span class="sourceLineNo">5204</span> List<ReplicationPeerDescription> peerDescriptions = admin.listReplicationPeers();<a name="line.5204"></a>
+<span class="sourceLineNo">5205</span> if (peerDescriptions != null && peerDescriptions.size() > 0) {<a name="line.5205"></a>
+<span class="sourceLineNo">5206</span> List<String> peers = peerDescriptions.stream()<a name="line.5206"></a>
+<span class="sourceLineNo">5207</span> .filter(peerConfig -> ReplicationUtils.contains(peerConfig.getPeerConfig(),<a name="line.5207"></a>
+<span class="sourceLineNo">5208</span> cleanReplicationBarrierTable))<a name="line.5208"></a>
+<span class="sourceLineNo">5209</span> .map(peerConfig -> peerConfig.getPeerId()).collect(Collectors.toList());<a name="line.5209"></a>
+<span class="sourceLineNo">5210</span> try {<a name="line.5210"></a>
+<span class="sourceLineNo">5211</span> List<String> batch = new ArrayList<>();<a name="line.5211"></a>
+<span class="sourceLineNo">5212</span> for (String peer : peers) {<a name="line.5212"></a>
+<span class="sourceLineNo">5213</span> for (byte[] regionName : regionNames) {<a name="line.5213"></a>
+<span class="sourceLineNo">5214</span> batch.add(RegionInfo.encodeRegionName(regionName));<a name="line.5214"></a>
+<span class="sourceLineNo">5215</span> if (batch.size() % 100 == 0) {<a name="line.5215"></a>
+<span class="sourceLineNo">5216</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5216"></a>
+<span class="sourceLineNo">5217</span> batch.clear();<a name="line.5217"></a>
+<span class="sourceLineNo">5218</span> }<a name="line.5218"></a>
+<span class="sourceLineNo">5219</span> }<a name="line.5219"></a>
+<span class="sourceLineNo">5220</span> if (batch.size() > 0) {<a name="line.5220"></a>
+<span class="sourceLineNo">5221</span> queueStorage.removeLastSequenceIds(peer, batch);<a name="line.5221"></a>
+<span class="sourceLineNo">5222</span> batch.clear();<a name="line.5222"></a>
+<span class="sourceLineNo">5223</span> }<a name="line.5223"></a>
+<span class="sourceLineNo">5224</span> }<a name="line.5224"></a>
+<span class="sourceLineNo">5225</span> } catch (ReplicationException re) {<a name="line.5225"></a>
+<span class="sourceLineNo">5226</span> throw new IOException(re);<a name="line.5226"></a>
+<span class="sourceLineNo">5227</span> }<a name="line.5227"></a>
+<span class="sourceLineNo">5228</span> }<a name="line.5228"></a>
+<span class="sourceLineNo">5229</span> for (byte[] regionName : regionNames) {<a name="line.5229"></a>
+<span class="sourceLineNo">5230</span> meta.delete(new Delete(regionName).addFamily(HConstants.REPLICATION_BARRIER_FAMILY));<a name="line.5230"></a>
+<span class="sourceLineNo">5231</span> }<a name="line.5231"></a>
+<span class="sourceLineNo">5232</span> setShouldRerun();<a name="line.5232"></a>
+<span class="sourceLineNo">5233</span> }<a name="line.5233"></a>
+<span class="sourceLineNo">5234</span><a name="line.5234"></a>
+<span class="sourceLineNo">5235</span> /**<a name="line.5235"></a>
+<span class="sourceLineNo">5236</span> * ls -r for debugging purposes<a name="line.5236"></a>
+<span class="sourceLineNo">5237</span> */<a name="line.5237"></a>
+<span class="sourceLineNo">5238</span> void debugLsr(Path p) throws IOException {<a name="line.5238"></a>
+<span class="sourceLineNo">5239</span> debugLsr(getConf(), p, errors);<a name="line.5239"></a>
+<span class="sourceLineNo">5240</span> }<a name="line.5240"></a>
+<span class="sourceLineNo">5241</span><a name="line.5241"></a>
+<span class="sourceLineNo">5242</span> /**<a name="line.5242"></a>
+<span class="sourceLineNo">5243</span> * ls -r for debugging purposes<a name="line.5243"></a>
+<span class="sourceLineNo">5244</span> */<a name="line.5244"></a>
+<span class="sourceLineNo">5245</span> public static void debugLsr(Configuration conf,<a name="line.5245"></a>
+<span class="sourceLineNo">5246</span> Path p) throws IOException {<a name="line.5246"></a>
+<span class="sourceLineNo">5247</span> debugLsr(conf, p, new PrintingErrorReporter());<a name="line.5247"></a>
+<span class="sourceLineNo">5248</span> }<a name="line.5248"></a>
+<span class="sourceLineNo">5249</span><a name="line.5249"></a>
+<span class="sourceLineNo">5250</span> /**<a name="line.5250"></a>
+<span class="sourceLineNo">5251</span> * ls -r for debugging purposes<a name="line.5251"></a>
+<span class="sourceLineNo">5252</span> */<a name="line.5252"></a>
+<span class="sourceLineNo">5253</span> public static void debugLsr(Configuration conf,<a name="line.5253"></a>
+<span class="sourceLineNo">5254</span> Path p, ErrorReporter errors) throws IOException {<a name="line.5254"></a>
+<span class="sourceLineNo">5255</span> if (!LOG.isDebugEnabled() || p == null) {<a name="line.5255"></a>
+<span class="sourceLineNo">5256</span> return;<a name="line.5256"></a>
+<span class="sourceLineNo">5257</span> }<a name="line.5257"></a>
+<span class="sourceLineNo">5258</span> FileSystem fs = p.getFileSystem(conf);<a name="line.5258"></a>
+<span class="sourceLineNo">5259</span><a name="line.5259"></a>
+<span class="sourceLineNo">5260</span> if (!fs.exists(p)) {<a name="line.5260"></a>
+<span class="sourceLineNo">5261</span> // nothing<a name="line.5261"></a>
+<span class="sourceLineNo">5262</span> return;<a name="line.5262"></a>
+<span class="sourceLineNo">5263</span> }<a name="line.5263"></a>
+<span class="sourceLineNo">5264</span> errors.print(p.toString());<a name="line.5264"></a>
+<span class="sourceLineNo">5265</span><a name="line.5265"></a>
+<span class="sourceLineNo">5266</span> if (fs.isFile(p)) {<a name="line.5266"></a>
+<span class="sourceLineNo">5267</span> return;<a name="line.5267"></a>
+<span class="sourceLineNo">5268</span> }<a name="line.5268"></a>
+<span class="sourceLineNo">5269</span><a name="line.5269"></a>
+<span class="sourceLineNo">5270</span> if (fs.getFileStatus(p).isDirectory()) {<a name="line.5270"></a>
+<span class="sourceLineNo">5271</span> FileStatus[] fss= fs.listStatus(p);<a name="line.5271"></a>
+<span class="sourceLineNo">5272</span> for (FileStatus status : fss) {<a name="line.5272"></a>
+<span class="sourceLineNo">5273</span> debugLsr(conf, status.getPath(), errors);<a name="line.5273"></a>
+<span class="sourceLineNo">5274</span> }<a name="line.5274"></a>
+<span class="sourceLineNo">5275</span> }<a name="line.5275"></a>
+<span class="sourceLineNo">5276</span> }<a name="line.5276"></a>
+<span class="sourceLineNo">5277</span>}<a name="line.5277"></a>