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/05/11 14:48:00 UTC

[01/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site a972bfc45 -> 039fa0b54


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index 722e8e0..e98fffc 100644
--- a/downloads.html
+++ b/downloads.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase Downloads</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index fd74cce..f817cae 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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Export Control
@@ -331,7 +331,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: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 5ee7ed8..c40cfec 100644
--- a/index.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase™ Home</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -409,7 +409,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index 290db29..ae465be 100644
--- a/integration.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; CI Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -291,7 +291,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 7f301cd..a2d4a0c 100644
--- a/issue-tracking.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Issue Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -288,7 +288,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index fe6495c..29f0eca 100644
--- a/license.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Licenses</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -491,7 +491,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index dafaac4..3002d24 100644
--- a/mail-lists.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Mailing Lists</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -341,7 +341,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index 1e6bda4..0d3a23b 100644
--- a/metrics.html
+++ b/metrics.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) Metrics
@@ -459,7 +459,7 @@ export HBASE_REGIONSERVER_OPTS=&quot;$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index dea9f69..8e550b3 100644
--- a/old_news.html
+++ b/old_news.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Old Apache HBase (TM) News
@@ -440,7 +440,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index e5d3269..ae2a59d 100644
--- a/plugin-management.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Plugin Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 686c1fa..5e6f392 100644
--- a/plugins.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Plugins</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -375,7 +375,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 571dbbd..a790226 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Powered By Apache HBase™</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -769,7 +769,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index bbac2e8..40d4643 100644
--- a/project-info.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -335,7 +335,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index 6281bd2..9a2601e 100644
--- a/project-reports.html
+++ b/project-reports.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Generated Reports</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -305,7 +305,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index cf2d8a6..0cbb7c7 100644
--- a/project-summary.html
+++ b/project-summary.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Summary</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index fa3afca..80ecf34 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
 Running Apache HBase (TM) in pseudo-distributed mode
@@ -308,7 +308,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index 8242ab7..8c01fee 100644
--- a/replication.html
+++ b/replication.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Apache HBase (TM) Replication
@@ -303,7 +303,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index a4bcbfa..9a7530e 100644
--- a/resources.html
+++ b/resources.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Other Apache HBase (TM) Resources</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index b94ccc1..da1670a 100644
--- a/source-repository.html
+++ b/source-repository.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Source Code Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -299,7 +299,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index c8bb2c2..0dc4bd9 100644
--- a/sponsors.html
+++ b/sponsors.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase™ Sponsors</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -333,7 +333,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index d097c45..6363a22 100644
--- a/supportingprojects.html
+++ b/supportingprojects.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Supporting Projects</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -520,7 +520,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index ef237f1..287e5a5 100644
--- a/team-list.html
+++ b/team-list.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Team</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -730,7 +730,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.html
index 93020d6..15f7719 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.html
@@ -101,7 +101,7 @@
 <span class="sourceLineNo">093</span>    conf.set(RESTServer.REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY, ".*");<a name="line.93"></a>
 <span class="sourceLineNo">094</span>    RESTServer.addCSRFFilter(ctxHandler, conf);<a name="line.94"></a>
 <span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.96"></a>
+<span class="sourceLineNo">096</span>    HttpServerUtil.constrainHttpMethods(ctxHandler, true);<a name="line.96"></a>
 <span class="sourceLineNo">097</span><a name="line.97"></a>
 <span class="sourceLineNo">098</span>    // start the server<a name="line.98"></a>
 <span class="sourceLineNo">099</span>    server.start();<a name="line.99"></a>


[08/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
index aaef58f..339bdad 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
@@ -137,7 +137,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.2004">ThriftServerRunner.IOErrorWithCause</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.2008">ThriftServerRunner.IOErrorWithCause</a>
 extends org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -273,7 +273,7 @@ extends org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>cause</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2005">cause</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2009">cause</a></pre>
 </li>
 </ul>
 </li>
@@ -290,7 +290,7 @@ extends org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>IOErrorWithCause</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2006">IOErrorWithCause</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2010">IOErrorWithCause</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
 </li>
 </ul>
 </li>
@@ -307,7 +307,7 @@ extends org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCause</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2011">getCause</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2015">getCause</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a></code></dd>
@@ -320,7 +320,7 @@ extends org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2016">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;other)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2020">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;other)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>equals</code>&nbsp;in class&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.IOError</code></dd>
@@ -333,7 +333,7 @@ extends org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>hashCode</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2030">hashCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html#line.2034">hashCode</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>hashCode</code>&nbsp;in class&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.IOError</code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
index 3aa763c..bd67afa 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.228">ThriftServerRunner.ImplType</a>
+<pre>public static enum <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.231">ThriftServerRunner.ImplType</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&gt;</pre>
 <div class="block">An enum of server implementation selections</div>
 </li>
@@ -289,7 +289,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>HS_HA</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.229">HS_HA</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.232">HS_HA</a></pre>
 </li>
 </ul>
 <a name="NONBLOCKING">
@@ -298,7 +298,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>NONBLOCKING</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.230">NONBLOCKING</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.233">NONBLOCKING</a></pre>
 </li>
 </ul>
 <a name="THREAD_POOL">
@@ -307,7 +307,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>THREAD_POOL</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.231">THREAD_POOL</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.234">THREAD_POOL</a></pre>
 </li>
 </ul>
 <a name="THREADED_SELECTOR">
@@ -316,7 +316,7 @@ the order they are declared.</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>THREADED_SELECTOR</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.232">THREADED_SELECTOR</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.235">THREADED_SELECTOR</a></pre>
 </li>
 </ul>
 </li>
@@ -333,7 +333,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.235">DEFAULT</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.238">DEFAULT</a></pre>
 </li>
 </ul>
 <a name="option">
@@ -342,7 +342,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>option</h4>
-<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.237">option</a></pre>
+<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.240">option</a></pre>
 </li>
 </ul>
 <a name="isAlwaysFramed">
@@ -351,7 +351,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>isAlwaysFramed</h4>
-<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.238">isAlwaysFramed</a></pre>
+<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.241">isAlwaysFramed</a></pre>
 </li>
 </ul>
 <a name="serverClass">
@@ -360,7 +360,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>serverClass</h4>
-<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.thrift.server.TServer&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.239">serverClass</a></pre>
+<pre>final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.apache.thrift.server.TServer&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.242">serverClass</a></pre>
 </li>
 </ul>
 <a name="canSpecifyBindIP">
@@ -369,7 +369,7 @@ the order they are declared.</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>canSpecifyBindIP</h4>
-<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.240">canSpecifyBindIP</a></pre>
+<pre>final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.243">canSpecifyBindIP</a></pre>
 </li>
 </ul>
 </li>
@@ -386,7 +386,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.228">values</a>()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>[]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.231">values</a>()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
@@ -406,7 +406,7 @@ for (ThriftServerRunner.ImplType c : ThriftServerRunner.ImplType.values())
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.228">valueOf</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.231">valueOf</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -428,7 +428,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.255">toString</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.258">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&gt;</code></dd>
@@ -444,7 +444,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOption</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.259">getOption</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.262">getOption</a>()</pre>
 </li>
 </ul>
 <a name="isAlwaysFramed--">
@@ -453,7 +453,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>isAlwaysFramed</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.263">isAlwaysFramed</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.266">isAlwaysFramed</a>()</pre>
 </li>
 </ul>
 <a name="getDescription--">
@@ -462,7 +462,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>getDescription</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.267">getDescription</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.270">getDescription</a>()</pre>
 </li>
 </ul>
 <a name="createOptionGroup--">
@@ -471,7 +471,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>createOptionGroup</h4>
-<pre>static&nbsp;org.apache.hbase.thirdparty.org.apache.commons.cli.OptionGroup&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.279">createOptionGroup</a>()</pre>
+<pre>static&nbsp;org.apache.hbase.thirdparty.org.apache.commons.cli.OptionGroup&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.282">createOptionGroup</a>()</pre>
 </li>
 </ul>
 <a name="getServerImpl-org.apache.hadoop.conf.Configuration-">
@@ -480,7 +480,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>getServerImpl</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.287">getServerImpl</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ImplType</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.290">getServerImpl</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 <a name="setServerImpl-org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine-org.apache.hadoop.conf.Configuration-">
@@ -489,7 +489,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>setServerImpl</h4>
-<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.297">setServerImpl</a>(org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine&nbsp;cmd,
+<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.300">setServerImpl</a>(org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine&nbsp;cmd,
                           org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
@@ -499,7 +499,7 @@ not permitted.)</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>simpleClassName</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.317">simpleClassName</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.320">simpleClassName</a>()</pre>
 </li>
 </ul>
 <a name="serversThatCannotSpecifyBindIP--">
@@ -508,7 +508,7 @@ not permitted.)</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>serversThatCannotSpecifyBindIP</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.321">serversThatCannotSpecifyBindIP</a>()</pre>
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html#line.324">serversThatCannotSpecifyBindIP</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
index 4215cd5..e19d867 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>protected static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.715">ThriftServerRunner.ResultScannerWrapper</a>
+<pre>protected static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.719">ThriftServerRunner.ResultScannerWrapper</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -210,7 +210,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>scanner</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.717">scanner</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.721">scanner</a></pre>
 </li>
 </ul>
 <a name="sortColumns">
@@ -219,7 +219,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>sortColumns</h4>
-<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.718">sortColumns</a></pre>
+<pre>private final&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.722">sortColumns</a></pre>
 </li>
 </ul>
 </li>
@@ -236,7 +236,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ResultScannerWrapper</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.719">ResultScannerWrapper</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;resultScanner,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.723">ResultScannerWrapper</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;resultScanner,
                             boolean&nbsp;sortResultColumns)</pre>
 </li>
 </ul>
@@ -254,7 +254,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getScanner</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.725">getScanner</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.729">getScanner</a>()</pre>
 </li>
 </ul>
 <a name="isColumnSorted--">
@@ -263,7 +263,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isColumnSorted</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.729">isColumnSorted</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html#line.733">isColumnSorted</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
index afabfdf..5ed293d 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
@@ -283,6 +283,14 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>(package private) static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_HTTP_ALLOW_OPTIONS_METHOD">THRIFT_HTTP_ALLOW_OPTIONS_METHOD</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT">THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_QOP_KEY">THRIFT_QOP_KEY</a></span></code>
 <div class="block">Thrift quality of protection configuration key.</div>
 </td>
@@ -929,12 +937,30 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <a name="pauseMonitor">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>pauseMonitor</h4>
 <pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/JvmPauseMonitor.html" title="class in org.apache.hadoop.hbase.util">JvmPauseMonitor</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.225">pauseMonitor</a></pre>
 </li>
 </ul>
+<a name="THRIFT_HTTP_ALLOW_OPTIONS_METHOD">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>THRIFT_HTTP_ALLOW_OPTIONS_METHOD</h4>
+<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.227">THRIFT_HTTP_ALLOW_OPTIONS_METHOD</a></pre>
+</li>
+</ul>
+<a name="THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</h4>
+<pre>private static&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.228">THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</a></pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -949,7 +975,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ThriftServerRunner</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.333">ThriftServerRunner</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.336">ThriftServerRunner</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -971,7 +997,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>checkHttpSecurity</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.383">checkHttpSecurity</a>(<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security">SaslUtil.QualityOfProtection</a>&nbsp;qop,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.386">checkHttpSecurity</a>(<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security">SaslUtil.QualityOfProtection</a>&nbsp;qop,
                                org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
@@ -981,7 +1007,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.396">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.399">run</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
@@ -994,7 +1020,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>shutdown</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.421">shutdown</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.424">shutdown</a>()</pre>
 </li>
 </ul>
 <a name="setupHTTPServer--">
@@ -1003,7 +1029,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>setupHTTPServer</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.440">setupHTTPServer</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.443">setupHTTPServer</a>()
                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1017,7 +1043,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>setupServer</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.533">setupServer</a>()
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.537">setupServer</a>()
                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Setting up the thrift TServer</div>
 <dl>
@@ -1032,7 +1058,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>getProtocolFactory</h4>
-<pre>private&nbsp;org.apache.thrift.protocol.TProtocolFactory&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.684">getProtocolFactory</a>()</pre>
+<pre>private&nbsp;org.apache.thrift.protocol.TProtocolFactory&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.688">getProtocolFactory</a>()</pre>
 </li>
 </ul>
 <a name="createExecutor-java.util.concurrent.BlockingQueue-int-int-">
@@ -1041,7 +1067,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>createExecutor</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.698">createExecutor</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a>&gt;&nbsp;callQueue,
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.702">createExecutor</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a>&gt;&nbsp;callQueue,
                                int&nbsp;minWorkers,
                                int&nbsp;maxWorkers)</pre>
 </li>
@@ -1052,7 +1078,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>getBindAddress</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.709">getBindAddress</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/net/InetAddress.html?is-external=true" title="class or interface in java.net">InetAddress</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.713">getBindAddress</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/net/UnknownHostException.html?is-external=true" title="class or interface in java.net">UnknownHostException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1066,7 +1092,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>getIOError</h4>
-<pre>private static&nbsp;org.apache.hadoop.hbase.thrift.generated.IOError&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1968">getIOError</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;throwable)</pre>
+<pre>private static&nbsp;org.apache.hadoop.hbase.thrift.generated.IOError&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1972">getIOError</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;throwable)</pre>
 </li>
 </ul>
 <a name="addAttributes-org.apache.hadoop.hbase.client.OperationWithAttributes-java.util.Map-">
@@ -1075,7 +1101,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockList">
 <li class="blockList">
 <h4>addAttributes</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1977">addAttributes</a>(<a href="../../../../../org/apache/hadoop/hbase/client/OperationWithAttributes.html" title="class in org.apache.hadoop.hbase.client">OperationWithAttributes</a>&nbsp;op,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1981">addAttributes</a>(<a href="../../../../../org/apache/hadoop/hbase/client/OperationWithAttributes.html" title="class in org.apache.hadoop.hbase.client">OperationWithAttributes</a>&nbsp;op,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)</pre>
 <div class="block">Adds all the attributes into the Operation object</div>
 </li>
@@ -1086,7 +1112,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable
 <ul class="blockListLast">
 <li class="blockList">
 <h4>registerFilters</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1989">registerFilters</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.1993">registerFilters</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 474f541..41c2191 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -198,9 +198,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index b5a93b5..0ccc11d 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -532,14 +532,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index c0e28b4..9ec5b35 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -189,8 +189,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">RegionGroupingProvider.Strategies</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALFactory.Providers</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">RegionGroupingProvider.Strategies</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 3e44858..8265bd5 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
 <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
 <span class="sourceLineNo">010</span>  public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span>  public static final String revision = "8ba2a7eeb967a80d04020e30b2fe8e8652ea1758";<a name="line.11"></a>
+<span class="sourceLineNo">011</span>  public static final String revision = "c60578d9829f29cf77b250d238a9e38dc0b513d7";<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String date = "Thu May 10 14:39:10 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String date = "Fri May 11 14:39:32 UTC 2018";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String srcChecksum = "c0e2dabb9168862e94db0866785192b1";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String srcChecksum = "f948e99b537d772f2a2c6e0d3117cb36";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>}<a name="line.16"></a>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html
index e89e28b..5ea47b1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html
@@ -39,29 +39,35 @@
 <span class="sourceLineNo">031</span>  /**<a name="line.31"></a>
 <span class="sourceLineNo">032</span>   * Add constraints to a Jetty Context to disallow undesirable Http methods.<a name="line.32"></a>
 <span class="sourceLineNo">033</span>   * @param ctxHandler The context to modify<a name="line.33"></a>
-<span class="sourceLineNo">034</span>   */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>  public static void constrainHttpMethods(ServletContextHandler ctxHandler) {<a name="line.35"></a>
-<span class="sourceLineNo">036</span>    Constraint c = new Constraint();<a name="line.36"></a>
-<span class="sourceLineNo">037</span>    c.setAuthenticate(true);<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>    ConstraintMapping cmt = new ConstraintMapping();<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    cmt.setConstraint(c);<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    cmt.setMethod("TRACE");<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    cmt.setPathSpec("/*");<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>    ConstraintMapping cmo = new ConstraintMapping();<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    cmo.setConstraint(c);<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    cmo.setMethod("OPTIONS");<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    cmo.setPathSpec("/*");<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>    ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    securityHandler.setConstraintMappings(new ConstraintMapping[]{ cmt, cmo });<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>    ctxHandler.setSecurityHandler(securityHandler);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  private HttpServerUtil() {}<a name="line.55"></a>
-<span class="sourceLineNo">056</span>}<a name="line.56"></a>
+<span class="sourceLineNo">034</span>   * @param allowOptionsMethod if true then OPTIONS method will not be set in constraint mapping<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>  public static void constrainHttpMethods(ServletContextHandler ctxHandler,<a name="line.36"></a>
+<span class="sourceLineNo">037</span>      boolean allowOptionsMethod) {<a name="line.37"></a>
+<span class="sourceLineNo">038</span>    Constraint c = new Constraint();<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    c.setAuthenticate(true);<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>    ConstraintMapping cmt = new ConstraintMapping();<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    cmt.setConstraint(c);<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    cmt.setMethod("TRACE");<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    cmt.setPathSpec("/*");<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>    ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>    if (!allowOptionsMethod) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      ConstraintMapping cmo = new ConstraintMapping();<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      cmo.setConstraint(c);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      cmo.setMethod("OPTIONS");<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      cmo.setPathSpec("/*");<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      securityHandler.setConstraintMappings(new ConstraintMapping[] { cmt, cmo });<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    } else {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      securityHandler.setConstraintMappings(new ConstraintMapping[] { cmt });<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>    ctxHandler.setSecurityHandler(securityHandler);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private HttpServerUtil() {}<a name="line.61"></a>
+<span class="sourceLineNo">062</span>}<a name="line.62"></a>
 
 
 


[03/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
index 021207f..3f84557 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html
@@ -232,1816 +232,1820 @@
 <span class="sourceLineNo">224</span><a name="line.224"></a>
 <span class="sourceLineNo">225</span>  private final JvmPauseMonitor pauseMonitor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** An enum of server implementation selections */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public enum ImplType {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    THREADED_SELECTOR(<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    final String option;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    final boolean isAlwaysFramed;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    final boolean canSpecifyBindIP;<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      this.option = option;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      this.serverClass = serverClass;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     *         {@link #values()}<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    @Override<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    public String toString() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return "-" + option;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public String getOption() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return option;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    public boolean isAlwaysFramed() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      return isAlwaysFramed;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    public String getDescription() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.268"></a>
-<span class="sourceLineNo">269</span>          serverClass.getSimpleName());<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (isAlwaysFramed) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        sb.append(" This implies the framed transport.");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (this == DEFAULT) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        sb.append("This is the default.");<a name="line.274"></a>
+<span class="sourceLineNo">227</span>  static String THRIFT_HTTP_ALLOW_OPTIONS_METHOD = "hbase.thrift.http.allow.options.method";<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static boolean THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT = false;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  /** An enum of server implementation selections */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  public enum ImplType {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    THREADED_SELECTOR(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    final String option;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    final boolean isAlwaysFramed;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    final boolean canSpecifyBindIP;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      this.option = option;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      this.serverClass = serverClass;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     *         {@link #values()}<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public String toString() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return "-" + option;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    public String getOption() {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return option;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    public boolean isAlwaysFramed() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      return isAlwaysFramed;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    public String getDescription() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.271"></a>
+<span class="sourceLineNo">272</span>          serverClass.getSimpleName());<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (isAlwaysFramed) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        sb.append(" This implies the framed transport.");<a name="line.274"></a>
 <span class="sourceLineNo">275</span>      }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      return sb.toString();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    static OptionGroup createOptionGroup() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      OptionGroup group = new OptionGroup();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      for (ImplType t : values()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return group;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      for (ImplType t : values()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        if (confType.equals(t.option)) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          return t;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      ImplType chosenType = null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      int numChosen = 0;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      for (ImplType t : values()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if (cmd.hasOption(t.option)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          chosenType = t;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          ++numChosen;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      if (numChosen &lt; 1) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        LOG.info("Using default thrift server type");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        chosenType = DEFAULT;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } else if (numChosen &gt; 1) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        throw new AssertionError("Exactly one option out of " +<a name="line.310"></a>
-<span class="sourceLineNo">311</span>          Arrays.toString(values()) + " has to be specified");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      }<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>    public String simpleClassName() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      return serverClass.getSimpleName();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      for (ImplType t : values()) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        if (!t.canSpecifyBindIP) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>          l.add(t.simpleClassName());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      return l;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    // login the server principal (if using secure Hadoop)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    if (securityEnabled) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        "hbase.thrift.kerberos.principal", host);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      hbaseHandler, metrics, conf);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    if (strQop != null) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (doAsEnabled) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                "configured ");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    if (qop != null) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                              THRIFT_QOP_KEY,<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      checkHttpSecurity(qop, conf);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (!securityEnabled) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        throw new IOException("Thrift server must"<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          + " run in secure mode to support authentication");<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  /*<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * Runs the Thrift server<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public void run() {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      public Object run() {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          pauseMonitor.start();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            setupHTTPServer();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            httpServer.start();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            httpServer.join();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>          } else {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>            setupServer();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            tserver.serve();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        } catch (Exception e) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>          // Crash the process if the ThriftServer is not running<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          System.exit(-1);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        return null;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    });<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  public void shutdown() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    if (pauseMonitor != null) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      pauseMonitor.stop();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (tserver != null) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      tserver.stop();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      tserver = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    if (httpServer != null) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        httpServer.stop();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        httpServer = null;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      } catch (Exception e) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      httpServer = null;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  private void setupHTTPServer() throws IOException {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // Set the default max thread number to 100 to limit<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    //<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    threadPool.setMinThreads(minThreads);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    httpServer = new Server(threadPool);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    // Context handler<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            ServletContextHandler.SESSIONS);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    // set up Jetty and run the embedded server<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    httpConfig.setSecureScheme("https");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    httpConfig.setSecurePort(listenPort);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    httpConfig.setSendServerVersion(false);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    httpConfig.setSendDateHeader(false);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    ServerConnector serverConnector;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>      String[] excludeCiphers = conf.getStrings(<a name="line.488"></a>
-<span class="sourceLineNo">489</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      if (excludeCiphers.length != 0) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      String[] includeCiphers = conf.getStrings(<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      if (includeCiphers.length != 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      String[] excludeProtocols = conf.getStrings(<a name="line.500"></a>
-<span class="sourceLineNo">501</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (excludeProtocols.length != 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      String[] includeProtocols = conf.getStrings(<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      if (includeProtocols.length != 0) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>      serverConnector = new ServerConnector(httpServer,<a name="line.511"></a>
-<span class="sourceLineNo">512</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.512"></a>
-<span class="sourceLineNo">513</span>          new HttpConnectionFactory(httpsConfig));<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    } else {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    serverConnector.setPort(listenPort);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    serverConnector.setHost(host);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    httpServer.addConnector(serverConnector);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    httpServer.setStopAtShutdown(true);<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    if (doAsEnabled) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
+<span class="sourceLineNo">276</span>      if (this == DEFAULT) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        sb.append("This is the default.");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return sb.toString();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    static OptionGroup createOptionGroup() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      OptionGroup group = new OptionGroup();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      for (ImplType t : values()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return group;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      for (ImplType t : values()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        if (confType.equals(t.option)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          return t;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      ImplType chosenType = null;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      int numChosen = 0;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      for (ImplType t : values()) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if (cmd.hasOption(t.option)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          chosenType = t;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ++numChosen;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      if (numChosen &lt; 1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        LOG.info("Using default thrift server type");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        chosenType = DEFAULT;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } else if (numChosen &gt; 1) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        throw new AssertionError("Exactly one option out of " +<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          Arrays.toString(values()) + " has to be specified");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public String simpleClassName() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      return serverClass.getSimpleName();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      for (ImplType t : values()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        if (!t.canSpecifyBindIP) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>          l.add(t.simpleClassName());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      return l;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // login the server principal (if using secure Hadoop)<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (securityEnabled) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        "hbase.thrift.kerberos.principal", host);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      hbaseHandler, metrics, conf);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (strQop != null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    if (doAsEnabled) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                "configured ");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    if (qop != null) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.372"></a>
+<span class="sourceLineNo">373</span>                              THRIFT_QOP_KEY,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.374"></a>
+<span class="sourceLineNo">375</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      checkHttpSecurity(qop, conf);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      if (!securityEnabled) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        throw new IOException("Thrift server must"<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          + " run in secure mode to support authentication");<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /*<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Runs the Thrift server<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  public void run() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      @Override<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      public Object run() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        try {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          pauseMonitor.start();<a name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>            setupHTTPServer();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            httpServer.start();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>            httpServer.join();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          } else {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            setupServer();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            tserver.serve();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>          }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        } catch (Exception e) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>          // Crash the process if the ThriftServer is not running<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          System.exit(-1);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        return null;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    });<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  public void shutdown() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    if (pauseMonitor != null) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      pauseMonitor.stop();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (tserver != null) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      tserver.stop();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      tserver = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    if (httpServer != null) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        httpServer.stop();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        httpServer = null;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      } catch (Exception e) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      httpServer = null;<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  private void setupHTTPServer() throws IOException {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Set the default max thread number to 100 to limit<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    //<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    threadPool.setMinThreads(minThreads);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    httpServer = new Server(threadPool);<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    // Context handler<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            ServletContextHandler.SESSIONS);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    HttpServerUtil.constrainHttpMethods(ctxHandler,<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      conf.getBoolean(THRIFT_HTTP_ALLOW_OPTIONS_METHOD, THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT));<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>    // set up Jetty and run the embedded server<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    httpConfig.setSecureScheme("https");<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    httpConfig.setSecurePort(listenPort);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    httpConfig.setSendServerVersion(false);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    httpConfig.setSendDateHeader(false);<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ServerConnector serverConnector;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>      String[] excludeCiphers = conf.getStrings(<a name="line.492"></a>
+<span class="sourceLineNo">493</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (excludeCiphers.length != 0) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      }<a name="line.496"></a>
+<span class="sourceLineNo">497</span>      String[] includeCiphers = conf.getStrings(<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      if (includeCiphers.length != 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      String[] excludeProtocols = conf.getStrings(<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      if (excludeProtocols.length != 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      String[] includeProtocols = conf.getStrings(<a name="line.509"></a>
+<span class="sourceLineNo">510</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      if (includeProtocols.length != 0) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.516"></a>
+<span class="sourceLineNo">517</span>          new HttpConnectionFactory(httpsConfig));<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    } else {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    serverConnector.setPort(listenPort);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    serverConnector.setHost(host);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    httpServer.addConnector(serverConnector);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    httpServer.setStopAtShutdown(true);<a name="line.525"></a>
 <span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * Setting up the thrift TServer<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  private void setupServer() throws Exception {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    // Construct correct ProtocolFactory<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    TProcessor processor = p;<a name="line.539"></a>
+<span class="sourceLineNo">527</span>    if (doAsEnabled) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.531"></a>
+<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>  /**<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * Setting up the thrift TServer<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   */<a name="line.536"></a>
+<span class="sourceLineNo">537</span>  private void setupServer() throws Exception {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    // Construct correct ProtocolFactory<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>    // Construct correct TransportFactory<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    TTransportFactory transportFactory;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      if (qop != null) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        throw new RuntimeException("Thrift server authentication"<a name="line.545"></a>
-<span class="sourceLineNo">546</span>          + " doesn't work with framed transport yet");<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      transportFactory = new TFramedTransport.Factory(<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      LOG.debug("Using framed transport");<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    } else if (qop == null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      transportFactory = new TTransportFactory();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    } else {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      // Extract the name from the principal<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        new SaslGssCallbackHandler() {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>          @Override<a name="line.561"></a>
-<span class="sourceLineNo">562</span>          public void handle(Callback[] callbacks)<a name="line.562"></a>
-<span class="sourceLineNo">563</span>              throws UnsupportedCallbackException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            AuthorizeCallback ac = null;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            for (Callback callback : callbacks) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>              if (callback instanceof AuthorizeCallback) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                ac = (AuthorizeCallback) callback;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>              } else {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>                throw new UnsupportedCallbackException(callback,<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.570"></a>
-<span class="sourceLineNo">571</span>              }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>            if (ac != null) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              String authid = ac.getAuthenticationID();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>              String authzid = ac.getAuthorizationID();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>              if (!authid.equals(authzid)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>                ac.setAuthorized(false);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>              } else {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>                ac.setAuthorized(true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>                LOG.info("Effective user: " + userName);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                ac.setAuthorizedID(userName);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>              }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        });<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      transportFactory = saslFactory;<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>      // Create a processor wrapper, to get the caller<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      processor = new TProcessor() {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>        @Override<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        public boolean process(TProtocol inProt,<a name="line.592"></a>
-<span class="sourceLineNo">593</span>            TProtocol outProt) throws TException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>          TSaslServerTransport saslServerTransport =<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.595"></a>
-<span class="sourceLineNo">596</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>          String principal = saslServer.getAuthorizationID();<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>          return p.process(inProt, outProt);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      };<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.605"></a>
-<span class="sourceLineNo">606</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.606"></a>
-<span class="sourceLineNo">607</span>          "address binding at the moment. See " +<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      throw new RuntimeException(<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.616"></a>
-<span class="sourceLineNo">617</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        TNonblockingServer.Args serverArgs =<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            new TNonblockingServer.Args(serverTransport);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        serverArgs.processor(processor)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>                  .transportFactory(transportFactory)<a name="line.626"></a>
-<span class="sourceLineNo">627</span>                  .protocolFactory(protocolFactory);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      } else if (implType == ImplType.HS_HA) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        ExecutorService executorService = createExecutor(<a name="line.632"></a>
-<span class="sourceLineNo">633</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.634"></a>
-<span class="sourceLineNo">635</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        tserver = new THsHaServer(serverArgs);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      } else { // THREADED_SELECTOR<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        ExecutorService executorService = createExecutor(<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.643"></a>
-<span class="sourceLineNo">644</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      LOG.info("starting HBase " + implType.simpleClassName() +<a name="line.647"></a>
-<span class="sourceLineNo">648</span>          " server on " + Integer.toString(listenPort));<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (implType == ImplType.THREAD_POOL) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      // Thread pool server. Get the IP address to bind to.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      int readTimeout = conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      TServerTransport serverTransport = new TServerSocket(<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          new TServerSocket.ServerSocketTransportArgs().<a name="line.655"></a>
-<span class="sourceLineNo">656</span>              bindAddr(new InetSocketAddress(listenAddress, listenPort)).backlog(backlog).<a name="line.656"></a>
-<span class="sourceLineNo">657</span>              clientTimeout(readTimeout));<a name="line.657"></a>
-<span class="sourceLineNo">658</span><a name="line.658"></a>
-<span class="sourceLineNo">659</span>      TBoundedThreadPoolServer.Args serverArgs =<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          new TBoundedThreadPoolServer.Args(serverTransport, conf);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      serverArgs.processor(processor).transportFactory(transportFactory)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>              .protocolFactory(protocolFactory);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      LOG.info("starting " + ImplType.THREAD_POOL.simpleClassName() + " on "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + listenAddress + ":" + Integer.toString(listenPort)<a name="line.664"></a>
-<span class="sourceLineNo">665</span>          + " with readTimeout " + readTimeout + "ms; " + serverArgs);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      this.tserver = new TBoundedThreadPoolServer(serverArgs, metrics);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    } else {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      throw new AssertionError("Unsupported Thrift server implementation: " +<a name="line.668"></a>
-<span class="sourceLineNo">669</span>          implType.simpleClassName());<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>    // A sanity check that we instantiated the right type of server.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    if (tserver.getClass() != implType.serverClass) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      throw new AssertionError("Expected to create Thrift server class " +<a name="line.674"></a>
-<span class="sourceLineNo">675</span>          implType.serverClass.getName() + " but got " +<a name="line.675"></a>
-<span class="sourceLineNo">676</span>          tserver.getClass().getName());<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>    registerFilters(conf);<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">541</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    TProcessor processor = p;<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>    // Construct correct TransportFactory<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    TTransportFactory transportFactory;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      if (qop != null) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>        throw new RuntimeException("Thrift server authentication"<a name="line.549"></a>
+<span class="sourceLineNo">550</span>          + " doesn't work with framed transport yet");<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      }<a name="line.551"></a>
+<span class="sourceLineNo">552</span>      transportFactory = new TFramedTransport.Factory(<a name="line.552"></a>
+<span class="sourceLineNo">553</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>      LOG.debug("Using framed transport");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    } else if (qop == null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      transportFactory = new TTransportFactory();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    } else {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      // Extract the name from the principal<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.559"></a>
+<span class="sourceLineNo">560</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        new SaslGssCallbackHandler() {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>          @Override<a name="line.565"></a>
+<span class="sourceLineNo">566</span>          public void handle(Callback[] callbacks)<a name="line.566"></a>
+<span class="sourceLineNo">567</span>              throws UnsupportedCallbackException {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            AuthorizeCallback ac = null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span>            for (Callback callback : callbacks) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>              if (callback instanceof AuthorizeCallback) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>                ac = (AuthorizeCallback) callback;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>              } else {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>                throw new UnsupportedCallbackException(callback,<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              }<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>            if (ac != null) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>              String authid = ac.getAuthenticationID();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>              String authzid = ac.getAuthorizationID();<a name="line.579"></a>
+<span class="sourceLineNo">580</span>              if (!authid.equals(authzid)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>                ac.setAuthorized(false);<a name="line.581"></a>
+<span class="sourceLineNo">582</span>              } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                ac.setAuthorized(true);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>                LOG.info("Effective user: " + userName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                ac.setAuthorizedID(userName);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>              }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>            }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>          }<a name="line.589"></a>
+<span class="sourceLineNo">590</span>        });<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      transportFactory = saslFactory;<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>      // Create a processor wrapper, to get the caller<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      processor = new TProcessor() {<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        public boolean process(TProtocol inProt,<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            TProtocol outProt) throws TException {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>          TSaslServerTransport saslServerTransport =<a name="line.598"></a>
+<span class="sourceLineNo">599</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.599"></a>
+<span class="sourceLineNo">600</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>          String principal = saslServer.getAuthorizationID();<a name="line.601"></a>
+<span class="sourceLineNo">602</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>          return p.process(inProt, outProt);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      };<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    }<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.609"></a>
+<span class="sourceLineNo">610</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.610"></a>
+<span class="sourceLineNo">611</span>          "address binding at the moment. See " +<a name="line.611"></a>
+<span class="sourceLineNo">612</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      throw new RuntimeException(<a name="line.613"></a>
+<span class="sourceLineNo">614</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.623"></a>
+<span class="sourceLineNo">624</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>        TNonblockingServer.Args serverArgs =<a name="line.627"></a>
+<span class="sourceLineNo">628</span>            new TNonblockingServer.Args(serverTransport);<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        serverArgs.processor(processor)<a name="line.629"></a>
+<span class="sourceLineNo">630</span>                  .transportFactory(transportFactory)<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  .protocolFactory(protocolFactory);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } else if (implType == ImplType.HS_HA) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        ExecutorService executorService = createExecutor(<a name="line.636"></a>
+<span class="sourceLineNo">637</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.638"></a>
+<span class="sourceLineNo">639</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        tserver = new THsHaServer(serverArgs);<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      } else { // THREADED_SELECTOR<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        ExecutorService executorService = createExecutor(<a name="line.645"></a>
+<span class="sourceLineNo">646</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.646"></a>
+<span class="sourceLineNo">647</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      }<a name="lin

<TRUNCATED>

[05/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
index 021207f..3f84557 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.IOErrorWithCause.html
@@ -232,1816 +232,1820 @@
 <span class="sourceLineNo">224</span><a name="line.224"></a>
 <span class="sourceLineNo">225</span>  private final JvmPauseMonitor pauseMonitor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** An enum of server implementation selections */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public enum ImplType {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    THREADED_SELECTOR(<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    final String option;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    final boolean isAlwaysFramed;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    final boolean canSpecifyBindIP;<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      this.option = option;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      this.serverClass = serverClass;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     *         {@link #values()}<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    @Override<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    public String toString() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return "-" + option;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public String getOption() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return option;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    public boolean isAlwaysFramed() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      return isAlwaysFramed;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    public String getDescription() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.268"></a>
-<span class="sourceLineNo">269</span>          serverClass.getSimpleName());<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (isAlwaysFramed) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        sb.append(" This implies the framed transport.");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (this == DEFAULT) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        sb.append("This is the default.");<a name="line.274"></a>
+<span class="sourceLineNo">227</span>  static String THRIFT_HTTP_ALLOW_OPTIONS_METHOD = "hbase.thrift.http.allow.options.method";<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static boolean THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT = false;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  /** An enum of server implementation selections */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  public enum ImplType {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    THREADED_SELECTOR(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    final String option;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    final boolean isAlwaysFramed;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    final boolean canSpecifyBindIP;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      this.option = option;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      this.serverClass = serverClass;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     *         {@link #values()}<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public String toString() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return "-" + option;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    public String getOption() {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return option;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    public boolean isAlwaysFramed() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      return isAlwaysFramed;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    public String getDescription() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.271"></a>
+<span class="sourceLineNo">272</span>          serverClass.getSimpleName());<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (isAlwaysFramed) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        sb.append(" This implies the framed transport.");<a name="line.274"></a>
 <span class="sourceLineNo">275</span>      }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      return sb.toString();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    static OptionGroup createOptionGroup() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      OptionGroup group = new OptionGroup();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      for (ImplType t : values()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return group;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      for (ImplType t : values()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        if (confType.equals(t.option)) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          return t;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      ImplType chosenType = null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      int numChosen = 0;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      for (ImplType t : values()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if (cmd.hasOption(t.option)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          chosenType = t;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          ++numChosen;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      if (numChosen &lt; 1) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        LOG.info("Using default thrift server type");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        chosenType = DEFAULT;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } else if (numChosen &gt; 1) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        throw new AssertionError("Exactly one option out of " +<a name="line.310"></a>
-<span class="sourceLineNo">311</span>          Arrays.toString(values()) + " has to be specified");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      }<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>    public String simpleClassName() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      return serverClass.getSimpleName();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      for (ImplType t : values()) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        if (!t.canSpecifyBindIP) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>          l.add(t.simpleClassName());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      return l;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    // login the server principal (if using secure Hadoop)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    if (securityEnabled) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        "hbase.thrift.kerberos.principal", host);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      hbaseHandler, metrics, conf);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    if (strQop != null) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (doAsEnabled) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                "configured ");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    if (qop != null) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                              THRIFT_QOP_KEY,<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      checkHttpSecurity(qop, conf);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (!securityEnabled) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        throw new IOException("Thrift server must"<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          + " run in secure mode to support authentication");<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  /*<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * Runs the Thrift server<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public void run() {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      public Object run() {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          pauseMonitor.start();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            setupHTTPServer();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            httpServer.start();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            httpServer.join();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>          } else {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>            setupServer();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            tserver.serve();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        } catch (Exception e) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>          // Crash the process if the ThriftServer is not running<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          System.exit(-1);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        return null;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    });<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  public void shutdown() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    if (pauseMonitor != null) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      pauseMonitor.stop();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (tserver != null) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      tserver.stop();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      tserver = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    if (httpServer != null) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        httpServer.stop();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        httpServer = null;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      } catch (Exception e) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      httpServer = null;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  private void setupHTTPServer() throws IOException {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // Set the default max thread number to 100 to limit<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    //<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    threadPool.setMinThreads(minThreads);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    httpServer = new Server(threadPool);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    // Context handler<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            ServletContextHandler.SESSIONS);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    // set up Jetty and run the embedded server<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    httpConfig.setSecureScheme("https");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    httpConfig.setSecurePort(listenPort);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    httpConfig.setSendServerVersion(false);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    httpConfig.setSendDateHeader(false);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    ServerConnector serverConnector;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>      String[] excludeCiphers = conf.getStrings(<a name="line.488"></a>
-<span class="sourceLineNo">489</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      if (excludeCiphers.length != 0) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      String[] includeCiphers = conf.getStrings(<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      if (includeCiphers.length != 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      String[] excludeProtocols = conf.getStrings(<a name="line.500"></a>
-<span class="sourceLineNo">501</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (excludeProtocols.length != 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      String[] includeProtocols = conf.getStrings(<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      if (includeProtocols.length != 0) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>      serverConnector = new ServerConnector(httpServer,<a name="line.511"></a>
-<span class="sourceLineNo">512</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.512"></a>
-<span class="sourceLineNo">513</span>          new HttpConnectionFactory(httpsConfig));<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    } else {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    serverConnector.setPort(listenPort);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    serverConnector.setHost(host);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    httpServer.addConnector(serverConnector);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    httpServer.setStopAtShutdown(true);<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    if (doAsEnabled) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
+<span class="sourceLineNo">276</span>      if (this == DEFAULT) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        sb.append("This is the default.");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return sb.toString();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    static OptionGroup createOptionGroup() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      OptionGroup group = new OptionGroup();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      for (ImplType t : values()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return group;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      for (ImplType t : values()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        if (confType.equals(t.option)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          return t;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      ImplType chosenType = null;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      int numChosen = 0;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      for (ImplType t : values()) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if (cmd.hasOption(t.option)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          chosenType = t;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ++numChosen;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      if (numChosen &lt; 1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        LOG.info("Using default thrift server type");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        chosenType = DEFAULT;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } else if (numChosen &gt; 1) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        throw new AssertionError("Exactly one option out of " +<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          Arrays.toString(values()) + " has to be specified");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public String simpleClassName() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      return serverClass.getSimpleName();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      for (ImplType t : values()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        if (!t.canSpecifyBindIP) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>          l.add(t.simpleClassName());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      return l;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // login the server principal (if using secure Hadoop)<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (securityEnabled) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        "hbase.thrift.kerberos.principal", host);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      hbaseHandler, metrics, conf);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (strQop != null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    if (doAsEnabled) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                "configured ");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    if (qop != null) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.372"></a>
+<span class="sourceLineNo">373</span>                              THRIFT_QOP_KEY,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.374"></a>
+<span class="sourceLineNo">375</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      checkHttpSecurity(qop, conf);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      if (!securityEnabled) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        throw new IOException("Thrift server must"<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          + " run in secure mode to support authentication");<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /*<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Runs the Thrift server<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  public void run() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      @Override<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      public Object run() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        try {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          pauseMonitor.start();<a name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>            setupHTTPServer();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            httpServer.start();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>            httpServer.join();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          } else {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            setupServer();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            tserver.serve();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>          }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        } catch (Exception e) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>          // Crash the process if the ThriftServer is not running<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          System.exit(-1);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        return null;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    });<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  public void shutdown() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    if (pauseMonitor != null) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      pauseMonitor.stop();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (tserver != null) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      tserver.stop();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      tserver = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    if (httpServer != null) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        httpServer.stop();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        httpServer = null;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      } catch (Exception e) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      httpServer = null;<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  private void setupHTTPServer() throws IOException {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Set the default max thread number to 100 to limit<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    //<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    threadPool.setMinThreads(minThreads);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    httpServer = new Server(threadPool);<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    // Context handler<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            ServletContextHandler.SESSIONS);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    HttpServerUtil.constrainHttpMethods(ctxHandler,<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      conf.getBoolean(THRIFT_HTTP_ALLOW_OPTIONS_METHOD, THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT));<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>    // set up Jetty and run the embedded server<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    httpConfig.setSecureScheme("https");<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    httpConfig.setSecurePort(listenPort);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    httpConfig.setSendServerVersion(false);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    httpConfig.setSendDateHeader(false);<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ServerConnector serverConnector;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>      String[] excludeCiphers = conf.getStrings(<a name="line.492"></a>
+<span class="sourceLineNo">493</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (excludeCiphers.length != 0) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      }<a name="line.496"></a>
+<span class="sourceLineNo">497</span>      String[] includeCiphers = conf.getStrings(<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      if (includeCiphers.length != 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      String[] excludeProtocols = conf.getStrings(<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      if (excludeProtocols.length != 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      String[] includeProtocols = conf.getStrings(<a name="line.509"></a>
+<span class="sourceLineNo">510</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      if (includeProtocols.length != 0) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.516"></a>
+<span class="sourceLineNo">517</span>          new HttpConnectionFactory(httpsConfig));<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    } else {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    serverConnector.setPort(listenPort);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    serverConnector.setHost(host);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    httpServer.addConnector(serverConnector);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    httpServer.setStopAtShutdown(true);<a name="line.525"></a>
 <span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * Setting up the thrift TServer<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  private void setupServer() throws Exception {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    // Construct correct ProtocolFactory<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    TProcessor processor = p;<a name="line.539"></a>
+<span class="sourceLineNo">527</span>    if (doAsEnabled) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.531"></a>
+<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>  /**<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * Setting up the thrift TServer<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   */<a name="line.536"></a>
+<span class="sourceLineNo">537</span>  private void setupServer() throws Exception {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    // Construct correct ProtocolFactory<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>    // Construct correct TransportFactory<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    TTransportFactory transportFactory;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      if (qop != null) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        throw new RuntimeException("Thrift server authentication"<a name="line.545"></a>
-<span class="sourceLineNo">546</span>          + " doesn't work with framed transport yet");<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      transportFactory = new TFramedTransport.Factory(<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      LOG.debug("Using framed transport");<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    } else if (qop == null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      transportFactory = new TTransportFactory();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    } else {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      // Extract the name from the principal<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        new SaslGssCallbackHandler() {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>          @Override<a name="line.561"></a>
-<span class="sourceLineNo">562</span>          public void handle(Callback[] callbacks)<a name="line.562"></a>
-<span class="sourceLineNo">563</span>              throws UnsupportedCallbackException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            AuthorizeCallback ac = null;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            for (Callback callback : callbacks) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>              if (callback instanceof AuthorizeCallback) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                ac = (AuthorizeCallback) callback;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>              } else {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>                throw new UnsupportedCallbackException(callback,<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.570"></a>
-<span class="sourceLineNo">571</span>              }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>            if (ac != null) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              String authid = ac.getAuthenticationID();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>              String authzid = ac.getAuthorizationID();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>              if (!authid.equals(authzid)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>                ac.setAuthorized(false);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>              } else {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>                ac.setAuthorized(true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>                LOG.info("Effective user: " + userName);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                ac.setAuthorizedID(userName);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>              }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        });<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      transportFactory = saslFactory;<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>      // Create a processor wrapper, to get the caller<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      processor = new TProcessor() {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>        @Override<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        public boolean process(TProtocol inProt,<a name="line.592"></a>
-<span class="sourceLineNo">593</span>            TProtocol outProt) throws TException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>          TSaslServerTransport saslServerTransport =<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.595"></a>
-<span class="sourceLineNo">596</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>          String principal = saslServer.getAuthorizationID();<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>          return p.process(inProt, outProt);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      };<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.605"></a>
-<span class="sourceLineNo">606</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.606"></a>
-<span class="sourceLineNo">607</span>          "address binding at the moment. See " +<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      throw new RuntimeException(<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.616"></a>
-<span class="sourceLineNo">617</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        TNonblockingServer.Args serverArgs =<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            new TNonblockingServer.Args(serverTransport);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        serverArgs.processor(processor)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>                  .transportFactory(transportFactory)<a name="line.626"></a>
-<span class="sourceLineNo">627</span>                  .protocolFactory(protocolFactory);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      } else if (implType == ImplType.HS_HA) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        ExecutorService executorService = createExecutor(<a name="line.632"></a>
-<span class="sourceLineNo">633</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.634"></a>
-<span class="sourceLineNo">635</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        tserver = new THsHaServer(serverArgs);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      } else { // THREADED_SELECTOR<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        ExecutorService executorService = createExecutor(<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.643"></a>
-<span class="sourceLineNo">644</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      LOG.info("starting HBase " + implType.simpleClassName() +<a name="line.647"></a>
-<span class="sourceLineNo">648</span>          " server on " + Integer.toString(listenPort));<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (implType == ImplType.THREAD_POOL) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      // Thread pool server. Get the IP address to bind to.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      int readTimeout = conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      TServerTransport serverTransport = new TServerSocket(<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          new TServerSocket.ServerSocketTransportArgs().<a name="line.655"></a>
-<span class="sourceLineNo">656</span>              bindAddr(new InetSocketAddress(listenAddress, listenPort)).backlog(backlog).<a name="line.656"></a>
-<span class="sourceLineNo">657</span>              clientTimeout(readTimeout));<a name="line.657"></a>
-<span class="sourceLineNo">658</span><a name="line.658"></a>
-<span class="sourceLineNo">659</span>      TBoundedThreadPoolServer.Args serverArgs =<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          new TBoundedThreadPoolServer.Args(serverTransport, conf);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      serverArgs.processor(processor).transportFactory(transportFactory)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>              .protocolFactory(protocolFactory);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      LOG.info("starting " + ImplType.THREAD_POOL.simpleClassName() + " on "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + listenAddress + ":" + Integer.toString(listenPort)<a name="line.664"></a>
-<span class="sourceLineNo">665</span>          + " with readTimeout " + readTimeout + "ms; " + serverArgs);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      this.tserver = new TBoundedThreadPoolServer(serverArgs, metrics);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    } else {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      throw new AssertionError("Unsupported Thrift server implementation: " +<a name="line.668"></a>
-<span class="sourceLineNo">669</span>          implType.simpleClassName());<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>    // A sanity check that we instantiated the right type of server.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    if (tserver.getClass() != implType.serverClass) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      throw new AssertionError("Expected to create Thrift server class " +<a name="line.674"></a>
-<span class="sourceLineNo">675</span>          implType.serverClass.getName() + " but got " +<a name="line.675"></a>
-<span class="sourceLineNo">676</span>          tserver.getClass().getName());<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>    registerFilters(conf);<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">541</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    TProcessor processor = p;<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>    // Construct correct TransportFactory<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    TTransportFactory transportFactory;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      if (qop != null) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>        throw new RuntimeException("Thrift server authentication"<a name="line.549"></a>
+<span class="sourceLineNo">550</span>          + " doesn't work with framed transport yet");<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      }<a name="line.551"></a>
+<span class="sourceLineNo">552</span>      transportFactory = new TFramedTransport.Factory(<a name="line.552"></a>
+<span class="sourceLineNo">553</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>      LOG.debug("Using framed transport");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    } else if (qop == null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      transportFactory = new TTransportFactory();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    } else {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      // Extract the name from the principal<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.559"></a>
+<span class="sourceLineNo">560</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        new SaslGssCallbackHandler() {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>          @Override<a name="line.565"></a>
+<span class="sourceLineNo">566</span>          public void handle(Callback[] callbacks)<a name="line.566"></a>
+<span class="sourceLineNo">567</span>              throws UnsupportedCallbackException {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            AuthorizeCallback ac = null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span>            for (Callback callback : callbacks) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>              if (callback instanceof AuthorizeCallback) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>                ac = (AuthorizeCallback) callback;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>              } else {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>                throw new UnsupportedCallbackException(callback,<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              }<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>            if (ac != null) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>              String authid = ac.getAuthenticationID();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>              String authzid = ac.getAuthorizationID();<a name="line.579"></a>
+<span class="sourceLineNo">580</span>              if (!authid.equals(authzid)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>                ac.setAuthorized(false);<a name="line.581"></a>
+<span class="sourceLineNo">582</span>              } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                ac.setAuthorized(true);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>                LOG.info("Effective user: " + userName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                ac.setAuthorizedID(userName);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>              }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>            }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>          }<a name="line.589"></a>
+<span class="sourceLineNo">590</span>        });<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      transportFactory = saslFactory;<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>      // Create a processor wrapper, to get the caller<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      processor = new TProcessor() {<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        public boolean process(TProtocol inProt,<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            TProtocol outProt) throws TException {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>          TSaslServerTransport saslServerTransport =<a name="line.598"></a>
+<span class="sourceLineNo">599</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.599"></a>
+<span class="sourceLineNo">600</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>          String principal = saslServer.getAuthorizationID();<a name="line.601"></a>
+<span class="sourceLineNo">602</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>          return p.process(inProt, outProt);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      };<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    }<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.609"></a>
+<span class="sourceLineNo">610</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.610"></a>
+<span class="sourceLineNo">611</span>          "address binding at the moment. See " +<a name="line.611"></a>
+<span class="sourceLineNo">612</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      throw new RuntimeException(<a name="line.613"></a>
+<span class="sourceLineNo">614</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.623"></a>
+<span class="sourceLineNo">624</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>        TNonblockingServer.Args serverArgs =<a name="line.627"></a>
+<span class="sourceLineNo">628</span>            new TNonblockingServer.Args(serverTransport);<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        serverArgs.processor(processor)<a name="line.629"></a>
+<span class="sourceLineNo">630</span>                  .transportFactory(transportFactory)<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  .protocolFactory(protocolFactory);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } else if (implType == ImplType.HS_HA) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        ExecutorService executorService = createExecutor(<a name="line.636"></a>
+<span class="sourceLineNo">637</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.638"></a>
+<span class="sourceLineNo">639</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        tserver = new THsHaServer(serverArgs);<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      } else { // THREADED_SELECTOR<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        ExecutorService executorService = createExecutor(<a name="line.645"></a>
+<span class="sourceLineNo">646</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.646"></a>
+<span class="sourceLineNo">647</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      }<a name="line.650"></a>
+<span c

<TRUNCATED>

[06/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
index 021207f..3f84557 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
@@ -232,1816 +232,1820 @@
 <span class="sourceLineNo">224</span><a name="line.224"></a>
 <span class="sourceLineNo">225</span>  private final JvmPauseMonitor pauseMonitor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** An enum of server implementation selections */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public enum ImplType {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    THREADED_SELECTOR(<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    final String option;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    final boolean isAlwaysFramed;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    final boolean canSpecifyBindIP;<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      this.option = option;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      this.serverClass = serverClass;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     *         {@link #values()}<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    @Override<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    public String toString() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return "-" + option;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public String getOption() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return option;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    public boolean isAlwaysFramed() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      return isAlwaysFramed;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    public String getDescription() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.268"></a>
-<span class="sourceLineNo">269</span>          serverClass.getSimpleName());<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (isAlwaysFramed) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        sb.append(" This implies the framed transport.");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (this == DEFAULT) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        sb.append("This is the default.");<a name="line.274"></a>
+<span class="sourceLineNo">227</span>  static String THRIFT_HTTP_ALLOW_OPTIONS_METHOD = "hbase.thrift.http.allow.options.method";<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static boolean THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT = false;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  /** An enum of server implementation selections */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  public enum ImplType {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    THREADED_SELECTOR(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    final String option;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    final boolean isAlwaysFramed;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    final boolean canSpecifyBindIP;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      this.option = option;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      this.serverClass = serverClass;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     *         {@link #values()}<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public String toString() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return "-" + option;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    public String getOption() {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return option;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    public boolean isAlwaysFramed() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      return isAlwaysFramed;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    public String getDescription() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.271"></a>
+<span class="sourceLineNo">272</span>          serverClass.getSimpleName());<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (isAlwaysFramed) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        sb.append(" This implies the framed transport.");<a name="line.274"></a>
 <span class="sourceLineNo">275</span>      }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      return sb.toString();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    static OptionGroup createOptionGroup() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      OptionGroup group = new OptionGroup();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      for (ImplType t : values()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return group;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      for (ImplType t : values()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        if (confType.equals(t.option)) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          return t;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      ImplType chosenType = null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      int numChosen = 0;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      for (ImplType t : values()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if (cmd.hasOption(t.option)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          chosenType = t;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          ++numChosen;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      if (numChosen &lt; 1) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        LOG.info("Using default thrift server type");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        chosenType = DEFAULT;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } else if (numChosen &gt; 1) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        throw new AssertionError("Exactly one option out of " +<a name="line.310"></a>
-<span class="sourceLineNo">311</span>          Arrays.toString(values()) + " has to be specified");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      }<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>    public String simpleClassName() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      return serverClass.getSimpleName();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      for (ImplType t : values()) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        if (!t.canSpecifyBindIP) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>          l.add(t.simpleClassName());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      return l;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    // login the server principal (if using secure Hadoop)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    if (securityEnabled) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        "hbase.thrift.kerberos.principal", host);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      hbaseHandler, metrics, conf);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    if (strQop != null) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (doAsEnabled) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                "configured ");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    if (qop != null) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                              THRIFT_QOP_KEY,<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      checkHttpSecurity(qop, conf);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (!securityEnabled) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        throw new IOException("Thrift server must"<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          + " run in secure mode to support authentication");<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  /*<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * Runs the Thrift server<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public void run() {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      public Object run() {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          pauseMonitor.start();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            setupHTTPServer();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            httpServer.start();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            httpServer.join();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>          } else {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>            setupServer();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            tserver.serve();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        } catch (Exception e) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>          // Crash the process if the ThriftServer is not running<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          System.exit(-1);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        return null;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    });<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  public void shutdown() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    if (pauseMonitor != null) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      pauseMonitor.stop();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (tserver != null) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      tserver.stop();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      tserver = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    if (httpServer != null) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        httpServer.stop();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        httpServer = null;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      } catch (Exception e) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      httpServer = null;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  private void setupHTTPServer() throws IOException {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // Set the default max thread number to 100 to limit<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    //<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    threadPool.setMinThreads(minThreads);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    httpServer = new Server(threadPool);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    // Context handler<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            ServletContextHandler.SESSIONS);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    // set up Jetty and run the embedded server<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    httpConfig.setSecureScheme("https");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    httpConfig.setSecurePort(listenPort);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    httpConfig.setSendServerVersion(false);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    httpConfig.setSendDateHeader(false);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    ServerConnector serverConnector;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>      String[] excludeCiphers = conf.getStrings(<a name="line.488"></a>
-<span class="sourceLineNo">489</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      if (excludeCiphers.length != 0) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      String[] includeCiphers = conf.getStrings(<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      if (includeCiphers.length != 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      String[] excludeProtocols = conf.getStrings(<a name="line.500"></a>
-<span class="sourceLineNo">501</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (excludeProtocols.length != 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      String[] includeProtocols = conf.getStrings(<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      if (includeProtocols.length != 0) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>      serverConnector = new ServerConnector(httpServer,<a name="line.511"></a>
-<span class="sourceLineNo">512</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.512"></a>
-<span class="sourceLineNo">513</span>          new HttpConnectionFactory(httpsConfig));<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    } else {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    serverConnector.setPort(listenPort);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    serverConnector.setHost(host);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    httpServer.addConnector(serverConnector);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    httpServer.setStopAtShutdown(true);<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    if (doAsEnabled) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
+<span class="sourceLineNo">276</span>      if (this == DEFAULT) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        sb.append("This is the default.");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return sb.toString();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    static OptionGroup createOptionGroup() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      OptionGroup group = new OptionGroup();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      for (ImplType t : values()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return group;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      for (ImplType t : values()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        if (confType.equals(t.option)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          return t;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      ImplType chosenType = null;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      int numChosen = 0;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      for (ImplType t : values()) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if (cmd.hasOption(t.option)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          chosenType = t;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ++numChosen;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      if (numChosen &lt; 1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        LOG.info("Using default thrift server type");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        chosenType = DEFAULT;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } else if (numChosen &gt; 1) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        throw new AssertionError("Exactly one option out of " +<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          Arrays.toString(values()) + " has to be specified");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public String simpleClassName() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      return serverClass.getSimpleName();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      for (ImplType t : values()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        if (!t.canSpecifyBindIP) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>          l.add(t.simpleClassName());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      return l;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // login the server principal (if using secure Hadoop)<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (securityEnabled) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        "hbase.thrift.kerberos.principal", host);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      hbaseHandler, metrics, conf);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (strQop != null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    if (doAsEnabled) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                "configured ");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    if (qop != null) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.372"></a>
+<span class="sourceLineNo">373</span>                              THRIFT_QOP_KEY,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.374"></a>
+<span class="sourceLineNo">375</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      checkHttpSecurity(qop, conf);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      if (!securityEnabled) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        throw new IOException("Thrift server must"<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          + " run in secure mode to support authentication");<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /*<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Runs the Thrift server<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  public void run() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      @Override<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      public Object run() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        try {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          pauseMonitor.start();<a name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>            setupHTTPServer();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            httpServer.start();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>            httpServer.join();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          } else {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            setupServer();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            tserver.serve();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>          }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        } catch (Exception e) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>          // Crash the process if the ThriftServer is not running<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          System.exit(-1);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        return null;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    });<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  public void shutdown() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    if (pauseMonitor != null) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      pauseMonitor.stop();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (tserver != null) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      tserver.stop();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      tserver = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    if (httpServer != null) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        httpServer.stop();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        httpServer = null;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      } catch (Exception e) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      httpServer = null;<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  private void setupHTTPServer() throws IOException {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Set the default max thread number to 100 to limit<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    //<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    threadPool.setMinThreads(minThreads);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    httpServer = new Server(threadPool);<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    // Context handler<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            ServletContextHandler.SESSIONS);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    HttpServerUtil.constrainHttpMethods(ctxHandler,<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      conf.getBoolean(THRIFT_HTTP_ALLOW_OPTIONS_METHOD, THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT));<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>    // set up Jetty and run the embedded server<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    httpConfig.setSecureScheme("https");<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    httpConfig.setSecurePort(listenPort);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    httpConfig.setSendServerVersion(false);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    httpConfig.setSendDateHeader(false);<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ServerConnector serverConnector;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>      String[] excludeCiphers = conf.getStrings(<a name="line.492"></a>
+<span class="sourceLineNo">493</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (excludeCiphers.length != 0) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      }<a name="line.496"></a>
+<span class="sourceLineNo">497</span>      String[] includeCiphers = conf.getStrings(<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      if (includeCiphers.length != 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      String[] excludeProtocols = conf.getStrings(<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      if (excludeProtocols.length != 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      String[] includeProtocols = conf.getStrings(<a name="line.509"></a>
+<span class="sourceLineNo">510</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      if (includeProtocols.length != 0) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.516"></a>
+<span class="sourceLineNo">517</span>          new HttpConnectionFactory(httpsConfig));<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    } else {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    serverConnector.setPort(listenPort);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    serverConnector.setHost(host);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    httpServer.addConnector(serverConnector);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    httpServer.setStopAtShutdown(true);<a name="line.525"></a>
 <span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * Setting up the thrift TServer<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  private void setupServer() throws Exception {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    // Construct correct ProtocolFactory<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    TProcessor processor = p;<a name="line.539"></a>
+<span class="sourceLineNo">527</span>    if (doAsEnabled) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.531"></a>
+<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>  /**<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * Setting up the thrift TServer<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   */<a name="line.536"></a>
+<span class="sourceLineNo">537</span>  private void setupServer() throws Exception {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    // Construct correct ProtocolFactory<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>    // Construct correct TransportFactory<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    TTransportFactory transportFactory;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      if (qop != null) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        throw new RuntimeException("Thrift server authentication"<a name="line.545"></a>
-<span class="sourceLineNo">546</span>          + " doesn't work with framed transport yet");<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      transportFactory = new TFramedTransport.Factory(<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      LOG.debug("Using framed transport");<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    } else if (qop == null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      transportFactory = new TTransportFactory();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    } else {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      // Extract the name from the principal<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        new SaslGssCallbackHandler() {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>          @Override<a name="line.561"></a>
-<span class="sourceLineNo">562</span>          public void handle(Callback[] callbacks)<a name="line.562"></a>
-<span class="sourceLineNo">563</span>              throws UnsupportedCallbackException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            AuthorizeCallback ac = null;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            for (Callback callback : callbacks) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>              if (callback instanceof AuthorizeCallback) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                ac = (AuthorizeCallback) callback;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>              } else {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>                throw new UnsupportedCallbackException(callback,<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.570"></a>
-<span class="sourceLineNo">571</span>              }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>            if (ac != null) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              String authid = ac.getAuthenticationID();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>              String authzid = ac.getAuthorizationID();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>              if (!authid.equals(authzid)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>                ac.setAuthorized(false);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>              } else {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>                ac.setAuthorized(true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>                LOG.info("Effective user: " + userName);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                ac.setAuthorizedID(userName);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>              }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        });<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      transportFactory = saslFactory;<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>      // Create a processor wrapper, to get the caller<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      processor = new TProcessor() {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>        @Override<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        public boolean process(TProtocol inProt,<a name="line.592"></a>
-<span class="sourceLineNo">593</span>            TProtocol outProt) throws TException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>          TSaslServerTransport saslServerTransport =<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.595"></a>
-<span class="sourceLineNo">596</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>          String principal = saslServer.getAuthorizationID();<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>          return p.process(inProt, outProt);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      };<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.605"></a>
-<span class="sourceLineNo">606</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.606"></a>
-<span class="sourceLineNo">607</span>          "address binding at the moment. See " +<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      throw new RuntimeException(<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.616"></a>
-<span class="sourceLineNo">617</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        TNonblockingServer.Args serverArgs =<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            new TNonblockingServer.Args(serverTransport);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        serverArgs.processor(processor)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>                  .transportFactory(transportFactory)<a name="line.626"></a>
-<span class="sourceLineNo">627</span>                  .protocolFactory(protocolFactory);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      } else if (implType == ImplType.HS_HA) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        ExecutorService executorService = createExecutor(<a name="line.632"></a>
-<span class="sourceLineNo">633</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.634"></a>
-<span class="sourceLineNo">635</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        tserver = new THsHaServer(serverArgs);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      } else { // THREADED_SELECTOR<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        ExecutorService executorService = createExecutor(<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.643"></a>
-<span class="sourceLineNo">644</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      LOG.info("starting HBase " + implType.simpleClassName() +<a name="line.647"></a>
-<span class="sourceLineNo">648</span>          " server on " + Integer.toString(listenPort));<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (implType == ImplType.THREAD_POOL) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      // Thread pool server. Get the IP address to bind to.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      int readTimeout = conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      TServerTransport serverTransport = new TServerSocket(<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          new TServerSocket.ServerSocketTransportArgs().<a name="line.655"></a>
-<span class="sourceLineNo">656</span>              bindAddr(new InetSocketAddress(listenAddress, listenPort)).backlog(backlog).<a name="line.656"></a>
-<span class="sourceLineNo">657</span>              clientTimeout(readTimeout));<a name="line.657"></a>
-<span class="sourceLineNo">658</span><a name="line.658"></a>
-<span class="sourceLineNo">659</span>      TBoundedThreadPoolServer.Args serverArgs =<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          new TBoundedThreadPoolServer.Args(serverTransport, conf);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      serverArgs.processor(processor).transportFactory(transportFactory)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>              .protocolFactory(protocolFactory);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      LOG.info("starting " + ImplType.THREAD_POOL.simpleClassName() + " on "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + listenAddress + ":" + Integer.toString(listenPort)<a name="line.664"></a>
-<span class="sourceLineNo">665</span>          + " with readTimeout " + readTimeout + "ms; " + serverArgs);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      this.tserver = new TBoundedThreadPoolServer(serverArgs, metrics);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    } else {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      throw new AssertionError("Unsupported Thrift server implementation: " +<a name="line.668"></a>
-<span class="sourceLineNo">669</span>          implType.simpleClassName());<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>    // A sanity check that we instantiated the right type of server.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    if (tserver.getClass() != implType.serverClass) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      throw new AssertionError("Expected to create Thrift server class " +<a name="line.674"></a>
-<span class="sourceLineNo">675</span>          implType.serverClass.getName() + " but got " +<a name="line.675"></a>
-<span class="sourceLineNo">676</span>          tserver.getClass().getName());<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>    registerFilters(conf);<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">541</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    TProcessor processor = p;<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>    // Construct correct TransportFactory<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    TTransportFactory transportFactory;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      if (qop != null) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>        throw new RuntimeException("Thrift server authentication"<a name="line.549"></a>
+<span class="sourceLineNo">550</span>          + " doesn't work with framed transport yet");<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      }<a name="line.551"></a>
+<span class="sourceLineNo">552</span>      transportFactory = new TFramedTransport.Factory(<a name="line.552"></a>
+<span class="sourceLineNo">553</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>      LOG.debug("Using framed transport");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    } else if (qop == null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      transportFactory = new TTransportFactory();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    } else {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      // Extract the name from the principal<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.559"></a>
+<span class="sourceLineNo">560</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        new SaslGssCallbackHandler() {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>          @Override<a name="line.565"></a>
+<span class="sourceLineNo">566</span>          public void handle(Callback[] callbacks)<a name="line.566"></a>
+<span class="sourceLineNo">567</span>              throws UnsupportedCallbackException {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            AuthorizeCallback ac = null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span>            for (Callback callback : callbacks) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>              if (callback instanceof AuthorizeCallback) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>                ac = (AuthorizeCallback) callback;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>              } else {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>                throw new UnsupportedCallbackException(callback,<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              }<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>            if (ac != null) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>              String authid = ac.getAuthenticationID();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>              String authzid = ac.getAuthorizationID();<a name="line.579"></a>
+<span class="sourceLineNo">580</span>              if (!authid.equals(authzid)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>                ac.setAuthorized(false);<a name="line.581"></a>
+<span class="sourceLineNo">582</span>              } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                ac.setAuthorized(true);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>                LOG.info("Effective user: " + userName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                ac.setAuthorizedID(userName);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>              }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>            }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>          }<a name="line.589"></a>
+<span class="sourceLineNo">590</span>        });<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      transportFactory = saslFactory;<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>      // Create a processor wrapper, to get the caller<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      processor = new TProcessor() {<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        public boolean process(TProtocol inProt,<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            TProtocol outProt) throws TException {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>          TSaslServerTransport saslServerTransport =<a name="line.598"></a>
+<span class="sourceLineNo">599</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.599"></a>
+<span class="sourceLineNo">600</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>          String principal = saslServer.getAuthorizationID();<a name="line.601"></a>
+<span class="sourceLineNo">602</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>          return p.process(inProt, outProt);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      };<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    }<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.609"></a>
+<span class="sourceLineNo">610</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.610"></a>
+<span class="sourceLineNo">611</span>          "address binding at the moment. See " +<a name="line.611"></a>
+<span class="sourceLineNo">612</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      throw new RuntimeException(<a name="line.613"></a>
+<span class="sourceLineNo">614</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.623"></a>
+<span class="sourceLineNo">624</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>        TNonblockingServer.Args serverArgs =<a name="line.627"></a>
+<span class="sourceLineNo">628</span>            new TNonblockingServer.Args(serverTransport);<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        serverArgs.processor(processor)<a name="line.629"></a>
+<span class="sourceLineNo">630</span>                  .transportFactory(transportFactory)<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  .protocolFactory(protocolFactory);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } else if (implType == ImplType.HS_HA) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        ExecutorService executorService = createExecutor(<a name="line.636"></a>
+<span class="sourceLineNo">637</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.638"></a>
+<span class="sourceLineNo">639</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        tserver = new THsHaServer(serverArgs);<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      } else { // THREADED_SELECTOR<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        ExecutorService executorService = createExecutor(<a name="line.645"></a>
+<span class="sourceLineNo">646</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.646"></a>
+<span class="sourceLineNo">647</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      }<a name="line.650"></a>
+<span class="sourceLineNo">

<TRUNCATED>

[11/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/039fa0b5
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/039fa0b5
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/039fa0b5

Branch: refs/heads/asf-site
Commit: 039fa0b5484e16471a00e51aa1e3302ba936f412
Parents: a972bfc
Author: jenkins <bu...@apache.org>
Authored: Fri May 11 14:47:46 2018 +0000
Committer: jenkins <bu...@apache.org>
Committed: Fri May 11 14:47:46 2018 +0000

----------------------------------------------------------------------
 acid-semantics.html                             |    4 +-
 apache_hbase_reference_guide.pdf                |    4 +-
 book.html                                       |    2 +-
 bulk-loads.html                                 |    4 +-
 checkstyle-aggregate.html                       |   12 +-
 coc.html                                        |    4 +-
 dependencies.html                               |    4 +-
 dependency-convergence.html                     |    4 +-
 dependency-info.html                            |    4 +-
 dependency-management.html                      |    4 +-
 devapidocs/constant-values.html                 |    6 +-
 devapidocs/index-all.html                       |   10 +-
 .../hadoop/hbase/backup/package-tree.html       |    2 +-
 .../hadoop/hbase/client/package-tree.html       |   24 +-
 .../hadoop/hbase/filter/package-tree.html       |    8 +-
 .../hadoop/hbase/http/HttpServerUtil.html       |   11 +-
 .../hadoop/hbase/io/hfile/package-tree.html     |    8 +-
 .../apache/hadoop/hbase/ipc/package-tree.html   |    2 +-
 .../hadoop/hbase/mapreduce/package-tree.html    |    4 +-
 .../hbase/master/balancer/package-tree.html     |    2 +-
 .../hadoop/hbase/master/package-tree.html       |    2 +-
 .../hbase/master/procedure/package-tree.html    |    2 +-
 .../org/apache/hadoop/hbase/package-tree.html   |   16 +-
 .../hadoop/hbase/procedure2/package-tree.html   |    6 +-
 .../hadoop/hbase/quotas/package-tree.html       |    8 +-
 .../hadoop/hbase/regionserver/package-tree.html |   16 +-
 .../regionserver/querymatcher/package-tree.html |    2 +-
 .../apache/hadoop/hbase/rest/RESTServer.html    |   40 +-
 .../hadoop/hbase/rest/model/package-tree.html   |    2 +-
 .../hbase/security/access/package-tree.html     |    2 +-
 .../thrift/ThriftServerRunner.HBaseHandler.html |  142 +-
 .../ThriftServerRunner.IOErrorWithCause.html    |   12 +-
 .../thrift/ThriftServerRunner.ImplType.html     |   42 +-
 ...ThriftServerRunner.ResultScannerWrapper.html |   12 +-
 .../hadoop/hbase/thrift/ThriftServerRunner.html |   52 +-
 .../hadoop/hbase/thrift/package-tree.html       |    2 +-
 .../apache/hadoop/hbase/util/package-tree.html  |    8 +-
 .../apache/hadoop/hbase/wal/package-tree.html   |    2 +-
 .../org/apache/hadoop/hbase/Version.html        |    6 +-
 .../hadoop/hbase/http/HttpServerUtil.html       |   52 +-
 .../apache/hadoop/hbase/rest/RESTServer.html    |  541 +--
 .../thrift/ThriftServerRunner.HBaseHandler.html | 3586 +++++++++---------
 .../ThriftServerRunner.IOErrorWithCause.html    | 3586 +++++++++---------
 .../thrift/ThriftServerRunner.ImplType.html     | 3586 +++++++++---------
 ...ThriftServerRunner.ResultScannerWrapper.html | 3586 +++++++++---------
 .../hadoop/hbase/thrift/ThriftServerRunner.html | 3586 +++++++++---------
 downloads.html                                  |    4 +-
 export_control.html                             |    4 +-
 index.html                                      |    4 +-
 integration.html                                |    4 +-
 issue-tracking.html                             |    4 +-
 license.html                                    |    4 +-
 mail-lists.html                                 |    4 +-
 metrics.html                                    |    4 +-
 old_news.html                                   |    4 +-
 plugin-management.html                          |    4 +-
 plugins.html                                    |    4 +-
 poweredbyhbase.html                             |    4 +-
 project-info.html                               |    4 +-
 project-reports.html                            |    4 +-
 project-summary.html                            |    4 +-
 pseudo-distributed.html                         |    4 +-
 replication.html                                |    4 +-
 resources.html                                  |    4 +-
 source-repository.html                          |    4 +-
 sponsors.html                                   |    4 +-
 supportingprojects.html                         |    4 +-
 team-list.html                                  |    4 +-
 .../hbase/rest/HBaseRESTTestingUtility.html     |    2 +-
 69 files changed, 9602 insertions(+), 9508 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index 09d2a49..a90d409 100644
--- a/acid-semantics.html
+++ b/acid-semantics.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) ACID Properties
@@ -601,7 +601,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index e07b290..8e5f450 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
 /Author (Apache HBase Team)
 /Creator (Asciidoctor PDF 1.5.0.alpha.15, based on Prawn 2.2.2)
 /Producer (Apache HBase Team)
-/ModDate (D:20180510142949+00'00')
-/CreationDate (D:20180510144450+00'00')
+/ModDate (D:20180511142957+00'00')
+/CreationDate (D:20180511144509+00'00')
 >>
 endobj
 2 0 obj

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 2b91e84..5663b8c 100644
--- a/book.html
+++ b/book.html
@@ -37873,7 +37873,7 @@ The server will return cellblocks compressed using this same compressor as long
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-05-10 14:29:49 UTC
+Last updated 2018-05-11 14:29:57 UTC
 </div>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 8d3a4bb..8113342 100644
--- a/bulk-loads.html
+++ b/bulk-loads.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Bulk Loads in Apache HBase (TM)
@@ -306,7 +306,7 @@ under the License. -->
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index ca28c38..70ea00a 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Checkstyle Results</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -96059,25 +96059,25 @@
 <td>blocks</td>
 <td>EmptyBlock</td>
 <td>Must have at least one statement.</td>
-<td>212</td></tr>
+<td>216</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
-<td>253</td></tr>
+<td>257</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 104).</td>
-<td>255</td></tr>
+<td>259</td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 110).</td>
-<td>330</td></tr></table></div>
+<td>334</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.rest.RESTServlet.java">org/apache/hadoop/hbase/rest/RESTServlet.java</h3>
 <table border="0" class="table table-striped">
@@ -123501,7 +123501,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index 0002484..ac90537 100644
--- a/coc.html
+++ b/coc.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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Code of Conduct Policy
@@ -375,7 +375,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index f99eceb..d2e3e4f 100644
--- a/dependencies.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Dependencies</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index 23d8e7a..85a38bd 100644
--- a/dependency-convergence.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Reactor Dependency Convergence</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -1105,7 +1105,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 4dceea7..2ce1b8c 100644
--- a/dependency-info.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Dependency Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -313,7 +313,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index 79285cb..4ac37d5 100644
--- a/dependency-management.html
+++ b/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="20180510" />
+    <meta name="Date-Revision-yyyymmdd" content="20180511" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Dependency Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -969,7 +969,7 @@
                         <a href="https://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2018-05-11</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index d860e4f..58fdfeb 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -3768,21 +3768,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Thu May 10 14:39:10 UTC 2018"</code></td>
+<td class="colLast"><code>"Fri May 11 14:39:32 UTC 2018"</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"8ba2a7eeb967a80d04020e30b2fe8e8652ea1758"</code></td>
+<td class="colLast"><code>"c60578d9829f29cf77b250d238a9e38dc0b513d7"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#srcChecksum">srcChecksum</a></code></td>
-<td class="colLast"><code>"c0e2dabb9168862e94db0866785192b1"</code></td>
+<td class="colLast"><code>"f948e99b537d772f2a2c6e0d3117cb36"</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.url">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 6f8e74d..710312b 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -16890,7 +16890,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html#ConstantSizeRegionSplitPolicy--">ConstantSizeRegionSplitPolicy()</a></span> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html" title="class in org.apache.hadoop.hbase.regionserver">ConstantSizeRegionSplitPolicy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/http/HttpServerUtil.html#constrainHttpMethods-org.eclipse.jetty.servlet.ServletContextHandler-">constrainHttpMethods(ServletContextHandler)</a></span> - Static method in class org.apache.hadoop.hbase.http.<a href="org/apache/hadoop/hbase/http/HttpServerUtil.html" title="class in org.apache.hadoop.hbase.http">HttpServerUtil</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/http/HttpServerUtil.html#constrainHttpMethods-org.eclipse.jetty.servlet.ServletContextHandler-boolean-">constrainHttpMethods(ServletContextHandler, boolean)</a></span> - Static method in class org.apache.hadoop.hbase.http.<a href="org/apache/hadoop/hbase/http/HttpServerUtil.html" title="class in org.apache.hadoop.hbase.http">HttpServerUtil</a></dt>
 <dd>
 <div class="block">Add constraints to a Jetty Context to disallow undesirable Http methods.</div>
 </dd>
@@ -92587,6 +92587,10 @@ service.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/Constants.html#REST_DNS_NAMESERVER">REST_DNS_NAMESERVER</a></span> - Static variable in interface org.apache.hadoop.hbase.rest.<a href="org/apache/hadoop/hbase/rest/Constants.html" title="interface in org.apache.hadoop.hbase.rest">Constants</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/RESTServer.html#REST_HTTP_ALLOW_OPTIONS_METHOD">REST_HTTP_ALLOW_OPTIONS_METHOD</a></span> - Static variable in class org.apache.hadoop.hbase.rest.<a href="org/apache/hadoop/hbase/rest/RESTServer.html" title="class in org.apache.hadoop.hbase.rest">RESTServer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/RESTServer.html#REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT">REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</a></span> - Static variable in class org.apache.hadoop.hbase.rest.<a href="org/apache/hadoop/hbase/rest/RESTServer.html" title="class in org.apache.hadoop.hbase.rest">RESTServer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/Constants.html#REST_KERBEROS_PRINCIPAL">REST_KERBEROS_PRINCIPAL</a></span> - Static variable in interface org.apache.hadoop.hbase.rest.<a href="org/apache/hadoop/hbase/rest/Constants.html" title="interface in org.apache.hadoop.hbase.rest">Constants</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/Constants.html#REST_KEYTAB_FILE">REST_KEYTAB_FILE</a></span> - Static variable in interface org.apache.hadoop.hbase.rest.<a href="org/apache/hadoop/hbase/rest/Constants.html" title="interface in org.apache.hadoop.hbase.rest">Constants</a></dt>
@@ -110977,6 +110981,10 @@ service.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.html#THRIFT_CALL_KEY">THRIFT_CALL_KEY</a></span> - Static variable in interface org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSource.html" title="interface in org.apache.hadoop.hbase.thrift">MetricsThriftServerSource</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_HTTP_ALLOW_OPTIONS_METHOD">THRIFT_HTTP_ALLOW_OPTIONS_METHOD</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/ThriftServerRunner.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT">THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</a></span> - Static variable in class org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/ThriftServerRunner.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.html#THRIFT_ONE_JMX_CONTEXT">THRIFT_ONE_JMX_CONTEXT</a></span> - Static variable in interface org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.html" title="interface in org.apache.hadoop.hbase.thrift">MetricsThriftServerSourceFactory</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.html#THRIFT_ONE_METRICS_CONTEXT">THRIFT_ONE_METRICS_CONTEXT</a></span> - Static variable in interface org.apache.hadoop.hbase.thrift.<a href="org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactory.html" title="interface in org.apache.hadoop.hbase.thrift">MetricsThriftServerSourceFactory</a></dt>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index b136486..35b548a 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -167,9 +167,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index e1568c6..e0c7de9 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -550,24 +550,24 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index 2747857..97b11e5 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -183,14 +183,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">CompareFilter.CompareOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">CompareFilter.CompareOp</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/http/HttpServerUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/http/HttpServerUtil.html b/devapidocs/org/apache/hadoop/hbase/http/HttpServerUtil.html
index 2a9216a..2cc2dbc 100644
--- a/devapidocs/org/apache/hadoop/hbase/http/HttpServerUtil.html
+++ b/devapidocs/org/apache/hadoop/hbase/http/HttpServerUtil.html
@@ -152,7 +152,8 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/http/HttpServerUtil.html#constrainHttpMethods-org.eclipse.jetty.servlet.ServletContextHandler-">constrainHttpMethods</a></span>(org.eclipse.jetty.servlet.ServletContextHandler&nbsp;ctxHandler)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/http/HttpServerUtil.html#constrainHttpMethods-org.eclipse.jetty.servlet.ServletContextHandler-boolean-">constrainHttpMethods</a></span>(org.eclipse.jetty.servlet.ServletContextHandler&nbsp;ctxHandler,
+                    boolean&nbsp;allowOptionsMethod)</code>
 <div class="block">Add constraints to a Jetty Context to disallow undesirable Http methods.</div>
 </td>
 </tr>
@@ -184,7 +185,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HttpServerUtil</h4>
-<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html#line.55">HttpServerUtil</a>()</pre>
+<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html#line.61">HttpServerUtil</a>()</pre>
 </li>
 </ul>
 </li>
@@ -195,17 +196,19 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="constrainHttpMethods-org.eclipse.jetty.servlet.ServletContextHandler-">
+<a name="constrainHttpMethods-org.eclipse.jetty.servlet.ServletContextHandler-boolean-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>constrainHttpMethods</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html#line.35">constrainHttpMethods</a>(org.eclipse.jetty.servlet.ServletContextHandler&nbsp;ctxHandler)</pre>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/http/HttpServerUtil.html#line.36">constrainHttpMethods</a>(org.eclipse.jetty.servlet.ServletContextHandler&nbsp;ctxHandler,
+                                        boolean&nbsp;allowOptionsMethod)</pre>
 <div class="block">Add constraints to a Jetty Context to disallow undesirable Http methods.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>ctxHandler</code> - The context to modify</dd>
+<dd><code>allowOptionsMethod</code> - if true then OPTIONS method will not be set in constraint mapping</dd>
 </dl>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index b11167e..2379a55 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -273,12 +273,12 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType.BlockCategory</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index 7600159..6a2998c 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -349,9 +349,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index 81c504b..2e21581 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -294,9 +294,9 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TableSplit.Version</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
index eb945fb..ad40e69 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
@@ -197,8 +197,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.Action.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.LocalityType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.Action.Type</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 7de2ad7..cad894a 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -347,9 +347,9 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index 550d779..0fa081d 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -209,8 +209,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">ServerProcedureInterface.ServerOperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 68a3a27..d662c95 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -441,19 +441,19 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 51096b7..d7bc0d9 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -212,11 +212,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockedResourceType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockedResourceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index cb3eddd..d6e7735 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -229,13 +229,13 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottlingException.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index d941e23..d2f8bfe 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -704,20 +704,20 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index 23060c2..6851ee1 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 </ul>
 </li>
 </ul>


[02/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
index 021207f..3f84557 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html
@@ -232,1816 +232,1820 @@
 <span class="sourceLineNo">224</span><a name="line.224"></a>
 <span class="sourceLineNo">225</span>  private final JvmPauseMonitor pauseMonitor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** An enum of server implementation selections */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public enum ImplType {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    THREADED_SELECTOR(<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    final String option;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    final boolean isAlwaysFramed;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    final boolean canSpecifyBindIP;<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      this.option = option;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      this.serverClass = serverClass;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     *         {@link #values()}<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    @Override<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    public String toString() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return "-" + option;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public String getOption() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return option;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    public boolean isAlwaysFramed() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      return isAlwaysFramed;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    public String getDescription() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.268"></a>
-<span class="sourceLineNo">269</span>          serverClass.getSimpleName());<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (isAlwaysFramed) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        sb.append(" This implies the framed transport.");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (this == DEFAULT) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        sb.append("This is the default.");<a name="line.274"></a>
+<span class="sourceLineNo">227</span>  static String THRIFT_HTTP_ALLOW_OPTIONS_METHOD = "hbase.thrift.http.allow.options.method";<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static boolean THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT = false;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  /** An enum of server implementation selections */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  public enum ImplType {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    THREADED_SELECTOR(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    final String option;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    final boolean isAlwaysFramed;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    final boolean canSpecifyBindIP;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      this.option = option;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      this.serverClass = serverClass;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     *         {@link #values()}<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public String toString() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return "-" + option;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    public String getOption() {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return option;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    public boolean isAlwaysFramed() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      return isAlwaysFramed;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    public String getDescription() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.271"></a>
+<span class="sourceLineNo">272</span>          serverClass.getSimpleName());<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (isAlwaysFramed) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        sb.append(" This implies the framed transport.");<a name="line.274"></a>
 <span class="sourceLineNo">275</span>      }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      return sb.toString();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    static OptionGroup createOptionGroup() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      OptionGroup group = new OptionGroup();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      for (ImplType t : values()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return group;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      for (ImplType t : values()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        if (confType.equals(t.option)) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          return t;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      ImplType chosenType = null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      int numChosen = 0;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      for (ImplType t : values()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if (cmd.hasOption(t.option)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          chosenType = t;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          ++numChosen;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      if (numChosen &lt; 1) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        LOG.info("Using default thrift server type");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        chosenType = DEFAULT;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } else if (numChosen &gt; 1) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        throw new AssertionError("Exactly one option out of " +<a name="line.310"></a>
-<span class="sourceLineNo">311</span>          Arrays.toString(values()) + " has to be specified");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      }<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>    public String simpleClassName() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      return serverClass.getSimpleName();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      for (ImplType t : values()) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        if (!t.canSpecifyBindIP) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>          l.add(t.simpleClassName());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      return l;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    // login the server principal (if using secure Hadoop)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    if (securityEnabled) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        "hbase.thrift.kerberos.principal", host);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      hbaseHandler, metrics, conf);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    if (strQop != null) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (doAsEnabled) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                "configured ");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    if (qop != null) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                              THRIFT_QOP_KEY,<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      checkHttpSecurity(qop, conf);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (!securityEnabled) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        throw new IOException("Thrift server must"<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          + " run in secure mode to support authentication");<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  /*<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * Runs the Thrift server<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public void run() {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      public Object run() {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          pauseMonitor.start();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            setupHTTPServer();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            httpServer.start();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            httpServer.join();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>          } else {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>            setupServer();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            tserver.serve();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        } catch (Exception e) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>          // Crash the process if the ThriftServer is not running<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          System.exit(-1);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        return null;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    });<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  public void shutdown() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    if (pauseMonitor != null) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      pauseMonitor.stop();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (tserver != null) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      tserver.stop();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      tserver = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    if (httpServer != null) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        httpServer.stop();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        httpServer = null;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      } catch (Exception e) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      httpServer = null;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  private void setupHTTPServer() throws IOException {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // Set the default max thread number to 100 to limit<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    //<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    threadPool.setMinThreads(minThreads);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    httpServer = new Server(threadPool);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    // Context handler<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            ServletContextHandler.SESSIONS);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    // set up Jetty and run the embedded server<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    httpConfig.setSecureScheme("https");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    httpConfig.setSecurePort(listenPort);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    httpConfig.setSendServerVersion(false);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    httpConfig.setSendDateHeader(false);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    ServerConnector serverConnector;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>      String[] excludeCiphers = conf.getStrings(<a name="line.488"></a>
-<span class="sourceLineNo">489</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      if (excludeCiphers.length != 0) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      String[] includeCiphers = conf.getStrings(<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      if (includeCiphers.length != 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      String[] excludeProtocols = conf.getStrings(<a name="line.500"></a>
-<span class="sourceLineNo">501</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (excludeProtocols.length != 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      String[] includeProtocols = conf.getStrings(<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      if (includeProtocols.length != 0) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>      serverConnector = new ServerConnector(httpServer,<a name="line.511"></a>
-<span class="sourceLineNo">512</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.512"></a>
-<span class="sourceLineNo">513</span>          new HttpConnectionFactory(httpsConfig));<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    } else {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    serverConnector.setPort(listenPort);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    serverConnector.setHost(host);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    httpServer.addConnector(serverConnector);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    httpServer.setStopAtShutdown(true);<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    if (doAsEnabled) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
+<span class="sourceLineNo">276</span>      if (this == DEFAULT) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        sb.append("This is the default.");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return sb.toString();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    static OptionGroup createOptionGroup() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      OptionGroup group = new OptionGroup();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      for (ImplType t : values()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return group;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      for (ImplType t : values()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        if (confType.equals(t.option)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          return t;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      ImplType chosenType = null;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      int numChosen = 0;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      for (ImplType t : values()) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if (cmd.hasOption(t.option)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          chosenType = t;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ++numChosen;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      if (numChosen &lt; 1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        LOG.info("Using default thrift server type");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        chosenType = DEFAULT;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } else if (numChosen &gt; 1) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        throw new AssertionError("Exactly one option out of " +<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          Arrays.toString(values()) + " has to be specified");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public String simpleClassName() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      return serverClass.getSimpleName();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      for (ImplType t : values()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        if (!t.canSpecifyBindIP) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>          l.add(t.simpleClassName());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      return l;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // login the server principal (if using secure Hadoop)<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (securityEnabled) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        "hbase.thrift.kerberos.principal", host);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      hbaseHandler, metrics, conf);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (strQop != null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    if (doAsEnabled) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                "configured ");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    if (qop != null) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.372"></a>
+<span class="sourceLineNo">373</span>                              THRIFT_QOP_KEY,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.374"></a>
+<span class="sourceLineNo">375</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      checkHttpSecurity(qop, conf);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      if (!securityEnabled) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        throw new IOException("Thrift server must"<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          + " run in secure mode to support authentication");<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /*<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Runs the Thrift server<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  public void run() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      @Override<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      public Object run() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        try {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          pauseMonitor.start();<a name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>            setupHTTPServer();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            httpServer.start();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>            httpServer.join();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          } else {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            setupServer();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            tserver.serve();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>          }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        } catch (Exception e) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>          // Crash the process if the ThriftServer is not running<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          System.exit(-1);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        return null;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    });<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  public void shutdown() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    if (pauseMonitor != null) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      pauseMonitor.stop();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (tserver != null) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      tserver.stop();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      tserver = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    if (httpServer != null) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        httpServer.stop();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        httpServer = null;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      } catch (Exception e) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      httpServer = null;<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  private void setupHTTPServer() throws IOException {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Set the default max thread number to 100 to limit<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    //<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    threadPool.setMinThreads(minThreads);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    httpServer = new Server(threadPool);<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    // Context handler<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            ServletContextHandler.SESSIONS);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    HttpServerUtil.constrainHttpMethods(ctxHandler,<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      conf.getBoolean(THRIFT_HTTP_ALLOW_OPTIONS_METHOD, THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT));<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>    // set up Jetty and run the embedded server<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    httpConfig.setSecureScheme("https");<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    httpConfig.setSecurePort(listenPort);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    httpConfig.setSendServerVersion(false);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    httpConfig.setSendDateHeader(false);<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ServerConnector serverConnector;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>      String[] excludeCiphers = conf.getStrings(<a name="line.492"></a>
+<span class="sourceLineNo">493</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (excludeCiphers.length != 0) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      }<a name="line.496"></a>
+<span class="sourceLineNo">497</span>      String[] includeCiphers = conf.getStrings(<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      if (includeCiphers.length != 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      String[] excludeProtocols = conf.getStrings(<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      if (excludeProtocols.length != 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      String[] includeProtocols = conf.getStrings(<a name="line.509"></a>
+<span class="sourceLineNo">510</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      if (includeProtocols.length != 0) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.516"></a>
+<span class="sourceLineNo">517</span>          new HttpConnectionFactory(httpsConfig));<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    } else {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    serverConnector.setPort(listenPort);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    serverConnector.setHost(host);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    httpServer.addConnector(serverConnector);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    httpServer.setStopAtShutdown(true);<a name="line.525"></a>
 <span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * Setting up the thrift TServer<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  private void setupServer() throws Exception {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    // Construct correct ProtocolFactory<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    TProcessor processor = p;<a name="line.539"></a>
+<span class="sourceLineNo">527</span>    if (doAsEnabled) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.531"></a>
+<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>  /**<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * Setting up the thrift TServer<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   */<a name="line.536"></a>
+<span class="sourceLineNo">537</span>  private void setupServer() throws Exception {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    // Construct correct ProtocolFactory<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>    // Construct correct TransportFactory<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    TTransportFactory transportFactory;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      if (qop != null) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        throw new RuntimeException("Thrift server authentication"<a name="line.545"></a>
-<span class="sourceLineNo">546</span>          + " doesn't work with framed transport yet");<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      transportFactory = new TFramedTransport.Factory(<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      LOG.debug("Using framed transport");<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    } else if (qop == null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      transportFactory = new TTransportFactory();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    } else {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      // Extract the name from the principal<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        new SaslGssCallbackHandler() {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>          @Override<a name="line.561"></a>
-<span class="sourceLineNo">562</span>          public void handle(Callback[] callbacks)<a name="line.562"></a>
-<span class="sourceLineNo">563</span>              throws UnsupportedCallbackException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            AuthorizeCallback ac = null;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            for (Callback callback : callbacks) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>              if (callback instanceof AuthorizeCallback) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                ac = (AuthorizeCallback) callback;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>              } else {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>                throw new UnsupportedCallbackException(callback,<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.570"></a>
-<span class="sourceLineNo">571</span>              }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>            if (ac != null) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              String authid = ac.getAuthenticationID();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>              String authzid = ac.getAuthorizationID();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>              if (!authid.equals(authzid)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>                ac.setAuthorized(false);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>              } else {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>                ac.setAuthorized(true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>                LOG.info("Effective user: " + userName);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                ac.setAuthorizedID(userName);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>              }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        });<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      transportFactory = saslFactory;<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>      // Create a processor wrapper, to get the caller<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      processor = new TProcessor() {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>        @Override<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        public boolean process(TProtocol inProt,<a name="line.592"></a>
-<span class="sourceLineNo">593</span>            TProtocol outProt) throws TException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>          TSaslServerTransport saslServerTransport =<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.595"></a>
-<span class="sourceLineNo">596</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>          String principal = saslServer.getAuthorizationID();<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>          return p.process(inProt, outProt);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      };<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.605"></a>
-<span class="sourceLineNo">606</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.606"></a>
-<span class="sourceLineNo">607</span>          "address binding at the moment. See " +<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      throw new RuntimeException(<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.616"></a>
-<span class="sourceLineNo">617</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        TNonblockingServer.Args serverArgs =<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            new TNonblockingServer.Args(serverTransport);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        serverArgs.processor(processor)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>                  .transportFactory(transportFactory)<a name="line.626"></a>
-<span class="sourceLineNo">627</span>                  .protocolFactory(protocolFactory);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      } else if (implType == ImplType.HS_HA) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        ExecutorService executorService = createExecutor(<a name="line.632"></a>
-<span class="sourceLineNo">633</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.634"></a>
-<span class="sourceLineNo">635</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        tserver = new THsHaServer(serverArgs);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      } else { // THREADED_SELECTOR<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        ExecutorService executorService = createExecutor(<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.643"></a>
-<span class="sourceLineNo">644</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      LOG.info("starting HBase " + implType.simpleClassName() +<a name="line.647"></a>
-<span class="sourceLineNo">648</span>          " server on " + Integer.toString(listenPort));<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (implType == ImplType.THREAD_POOL) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      // Thread pool server. Get the IP address to bind to.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      int readTimeout = conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      TServerTransport serverTransport = new TServerSocket(<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          new TServerSocket.ServerSocketTransportArgs().<a name="line.655"></a>
-<span class="sourceLineNo">656</span>              bindAddr(new InetSocketAddress(listenAddress, listenPort)).backlog(backlog).<a name="line.656"></a>
-<span class="sourceLineNo">657</span>              clientTimeout(readTimeout));<a name="line.657"></a>
-<span class="sourceLineNo">658</span><a name="line.658"></a>
-<span class="sourceLineNo">659</span>      TBoundedThreadPoolServer.Args serverArgs =<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          new TBoundedThreadPoolServer.Args(serverTransport, conf);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      serverArgs.processor(processor).transportFactory(transportFactory)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>              .protocolFactory(protocolFactory);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      LOG.info("starting " + ImplType.THREAD_POOL.simpleClassName() + " on "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + listenAddress + ":" + Integer.toString(listenPort)<a name="line.664"></a>
-<span class="sourceLineNo">665</span>          + " with readTimeout " + readTimeout + "ms; " + serverArgs);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      this.tserver = new TBoundedThreadPoolServer(serverArgs, metrics);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    } else {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      throw new AssertionError("Unsupported Thrift server implementation: " +<a name="line.668"></a>
-<span class="sourceLineNo">669</span>          implType.simpleClassName());<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>    // A sanity check that we instantiated the right type of server.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    if (tserver.getClass() != implType.serverClass) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      throw new AssertionError("Expected to create Thrift server class " +<a name="line.674"></a>
-<span class="sourceLineNo">675</span>          implType.serverClass.getName() + " but got " +<a name="line.675"></a>
-<span class="sourceLineNo">676</span>          tserver.getClass().getName());<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>    registerFilters(conf);<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">541</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    TProcessor processor = p;<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>    // Construct correct TransportFactory<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    TTransportFactory transportFactory;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      if (qop != null) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>        throw new RuntimeException("Thrift server authentication"<a name="line.549"></a>
+<span class="sourceLineNo">550</span>          + " doesn't work with framed transport yet");<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      }<a name="line.551"></a>
+<span class="sourceLineNo">552</span>      transportFactory = new TFramedTransport.Factory(<a name="line.552"></a>
+<span class="sourceLineNo">553</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>      LOG.debug("Using framed transport");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    } else if (qop == null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      transportFactory = new TTransportFactory();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    } else {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      // Extract the name from the principal<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.559"></a>
+<span class="sourceLineNo">560</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        new SaslGssCallbackHandler() {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>          @Override<a name="line.565"></a>
+<span class="sourceLineNo">566</span>          public void handle(Callback[] callbacks)<a name="line.566"></a>
+<span class="sourceLineNo">567</span>              throws UnsupportedCallbackException {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            AuthorizeCallback ac = null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span>            for (Callback callback : callbacks) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>              if (callback instanceof AuthorizeCallback) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>                ac = (AuthorizeCallback) callback;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>              } else {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>                throw new UnsupportedCallbackException(callback,<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              }<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>            if (ac != null) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>              String authid = ac.getAuthenticationID();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>              String authzid = ac.getAuthorizationID();<a name="line.579"></a>
+<span class="sourceLineNo">580</span>              if (!authid.equals(authzid)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>                ac.setAuthorized(false);<a name="line.581"></a>
+<span class="sourceLineNo">582</span>              } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                ac.setAuthorized(true);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>                LOG.info("Effective user: " + userName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                ac.setAuthorizedID(userName);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>              }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>            }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>          }<a name="line.589"></a>
+<span class="sourceLineNo">590</span>        });<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      transportFactory = saslFactory;<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>      // Create a processor wrapper, to get the caller<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      processor = new TProcessor() {<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        public boolean process(TProtocol inProt,<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            TProtocol outProt) throws TException {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>          TSaslServerTransport saslServerTransport =<a name="line.598"></a>
+<span class="sourceLineNo">599</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.599"></a>
+<span class="sourceLineNo">600</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>          String principal = saslServer.getAuthorizationID();<a name="line.601"></a>
+<span class="sourceLineNo">602</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>          return p.process(inProt, outProt);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      };<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    }<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.609"></a>
+<span class="sourceLineNo">610</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.610"></a>
+<span class="sourceLineNo">611</span>          "address binding at the moment. See " +<a name="line.611"></a>
+<span class="sourceLineNo">612</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      throw new RuntimeException(<a name="line.613"></a>
+<span class="sourceLineNo">614</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.623"></a>
+<span class="sourceLineNo">624</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>        TNonblockingServer.Args serverArgs =<a name="line.627"></a>
+<span class="sourceLineNo">628</span>            new TNonblockingServer.Args(serverTransport);<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        serverArgs.processor(processor)<a name="line.629"></a>
+<span class="sourceLineNo">630</span>                  .transportFactory(transportFactory)<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  .protocolFactory(protocolFactory);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } else if (implType == ImplType.HS_HA) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        ExecutorService executorService = createExecutor(<a name="line.636"></a>
+<span class="sourceLineNo">637</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.638"></a>
+<span class="sourceLineNo">639</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        tserver = new THsHaServer(serverArgs);<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      } else { // THREADED_SELECTOR<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        ExecutorService executorService = createExecutor(<a name="line.645"></a>
+<span class="sourceLineNo">646</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.646"></a>
+<span class="sourceLineNo">647</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>      LOG.info("starting HBase " + implType.simpleClass

<TRUNCATED>

[04/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
index 021207f..3f84557 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html
@@ -232,1816 +232,1820 @@
 <span class="sourceLineNo">224</span><a name="line.224"></a>
 <span class="sourceLineNo">225</span>  private final JvmPauseMonitor pauseMonitor;<a name="line.225"></a>
 <span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /** An enum of server implementation selections */<a name="line.227"></a>
-<span class="sourceLineNo">228</span>  public enum ImplType {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    THREADED_SELECTOR(<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    final String option;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    final boolean isAlwaysFramed;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    final boolean canSpecifyBindIP;<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      this.option = option;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      this.serverClass = serverClass;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    /**<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     *         {@link #values()}<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    @Override<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    public String toString() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return "-" + option;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public String getOption() {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      return option;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    public boolean isAlwaysFramed() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      return isAlwaysFramed;<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>    public String getDescription() {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.268"></a>
-<span class="sourceLineNo">269</span>          serverClass.getSimpleName());<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (isAlwaysFramed) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        sb.append(" This implies the framed transport.");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (this == DEFAULT) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        sb.append("This is the default.");<a name="line.274"></a>
+<span class="sourceLineNo">227</span>  static String THRIFT_HTTP_ALLOW_OPTIONS_METHOD = "hbase.thrift.http.allow.options.method";<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static boolean THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT = false;<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  /** An enum of server implementation selections */<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  public enum ImplType {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    HS_HA("hsha", true, THsHaServer.class, true),<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    THREADED_SELECTOR(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        "threadedselector", true, TThreadedSelectorServer.class, true);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    public static final ImplType DEFAULT = THREAD_POOL;<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    final String option;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    final boolean isAlwaysFramed;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    final Class&lt;? extends TServer&gt; serverClass;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    final boolean canSpecifyBindIP;<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    private ImplType(String option, boolean isAlwaysFramed,<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        Class&lt;? extends TServer&gt; serverClass, boolean canSpecifyBindIP) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      this.option = option;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      this.isAlwaysFramed = isAlwaysFramed;<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      this.serverClass = serverClass;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      this.canSpecifyBindIP = canSpecifyBindIP;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span>     * @return &lt;code&gt;-option&lt;/code&gt; so we can get the list of options from<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     *         {@link #values()}<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public String toString() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      return "-" + option;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    public String getOption() {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return option;<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>    public boolean isAlwaysFramed() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      return isAlwaysFramed;<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    public String getDescription() {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      StringBuilder sb = new StringBuilder("Use the " +<a name="line.271"></a>
+<span class="sourceLineNo">272</span>          serverClass.getSimpleName());<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (isAlwaysFramed) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        sb.append(" This implies the framed transport.");<a name="line.274"></a>
 <span class="sourceLineNo">275</span>      }<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      return sb.toString();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    static OptionGroup createOptionGroup() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      OptionGroup group = new OptionGroup();<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      for (ImplType t : values()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      return group;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      for (ImplType t : values()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        if (confType.equals(t.option)) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          return t;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      ImplType chosenType = null;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      int numChosen = 0;<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      for (ImplType t : values()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if (cmd.hasOption(t.option)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          chosenType = t;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          ++numChosen;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      if (numChosen &lt; 1) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        LOG.info("Using default thrift server type");<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        chosenType = DEFAULT;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } else if (numChosen &gt; 1) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        throw new AssertionError("Exactly one option out of " +<a name="line.310"></a>
-<span class="sourceLineNo">311</span>          Arrays.toString(values()) + " has to be specified");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      }<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>    public String simpleClassName() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      return serverClass.getSimpleName();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      for (ImplType t : values()) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        if (!t.canSpecifyBindIP) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>          l.add(t.simpleClassName());<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      return l;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    // login the server principal (if using secure Hadoop)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    if (securityEnabled) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        "hbase.thrift.kerberos.principal", host);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      hbaseHandler, metrics, conf);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    if (strQop != null) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    if (doAsEnabled) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.361"></a>
-<span class="sourceLineNo">362</span>                "configured ");<a name="line.362"></a>
-<span class="sourceLineNo">363</span>      }<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    if (qop != null) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.367"></a>
-<span class="sourceLineNo">368</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                              THRIFT_QOP_KEY,<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.371"></a>
-<span class="sourceLineNo">372</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.372"></a>
-<span class="sourceLineNo">373</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      checkHttpSecurity(qop, conf);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (!securityEnabled) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        throw new IOException("Thrift server must"<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          + " run in secure mode to support authentication");<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  /*<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   * Runs the Thrift server<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>  @Override<a name="line.395"></a>
-<span class="sourceLineNo">396</span>  public void run() {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      public Object run() {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        try {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          pauseMonitor.start();<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>            setupHTTPServer();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>            httpServer.start();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>            httpServer.join();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>          } else {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>            setupServer();<a name="line.407"></a>
-<span class="sourceLineNo">408</span>            tserver.serve();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        } catch (Exception e) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>          // Crash the process if the ThriftServer is not running<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          System.exit(-1);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        return null;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    });<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  public void shutdown() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    if (pauseMonitor != null) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      pauseMonitor.stop();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (tserver != null) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      tserver.stop();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      tserver = null;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    if (httpServer != null) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        httpServer.stop();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        httpServer = null;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      } catch (Exception e) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      httpServer = null;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  private void setupHTTPServer() throws IOException {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // Set the default max thread number to 100 to limit<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    //<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    threadPool.setMinThreads(minThreads);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    httpServer = new Server(threadPool);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    // Context handler<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            ServletContextHandler.SESSIONS);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>    // set up Jetty and run the embedded server<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    httpConfig.setSecureScheme("https");<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    httpConfig.setSecurePort(listenPort);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    httpConfig.setSendServerVersion(false);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    httpConfig.setSendDateHeader(false);<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    ServerConnector serverConnector;<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.485"></a>
-<span class="sourceLineNo">486</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>      String[] excludeCiphers = conf.getStrings(<a name="line.488"></a>
-<span class="sourceLineNo">489</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      if (excludeCiphers.length != 0) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      String[] includeCiphers = conf.getStrings(<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      if (includeCiphers.length != 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      String[] excludeProtocols = conf.getStrings(<a name="line.500"></a>
-<span class="sourceLineNo">501</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (excludeProtocols.length != 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      String[] includeProtocols = conf.getStrings(<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      if (includeProtocols.length != 0) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>      serverConnector = new ServerConnector(httpServer,<a name="line.511"></a>
-<span class="sourceLineNo">512</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.512"></a>
-<span class="sourceLineNo">513</span>          new HttpConnectionFactory(httpsConfig));<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    } else {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    serverConnector.setPort(listenPort);<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    serverConnector.setHost(host);<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    httpServer.addConnector(serverConnector);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    httpServer.setStopAtShutdown(true);<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    if (doAsEnabled) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
+<span class="sourceLineNo">276</span>      if (this == DEFAULT) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        sb.append("This is the default.");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return sb.toString();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    static OptionGroup createOptionGroup() {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      OptionGroup group = new OptionGroup();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      for (ImplType t : values()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        group.addOption(new Option(t.option, t.getDescription()));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      return group;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    public static ImplType getServerImpl(Configuration conf) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      for (ImplType t : values()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        if (confType.equals(t.option)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          return t;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      throw new AssertionError("Unknown server ImplType.option:" + confType);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    static void setServerImpl(CommandLine cmd, Configuration conf) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      ImplType chosenType = null;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      int numChosen = 0;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      for (ImplType t : values()) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if (cmd.hasOption(t.option)) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          chosenType = t;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ++numChosen;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      if (numChosen &lt; 1) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        LOG.info("Using default thrift server type");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        chosenType = DEFAULT;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } else if (numChosen &gt; 1) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        throw new AssertionError("Exactly one option out of " +<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          Arrays.toString(values()) + " has to be specified");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      LOG.info("Using thrift server type " + chosenType.option);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      conf.set(SERVER_TYPE_CONF_KEY, chosenType.option);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public String simpleClassName() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      return serverClass.getSimpleName();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    public static List&lt;String&gt; serversThatCannotSpecifyBindIP() {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      List&lt;String&gt; l = new ArrayList&lt;&gt;();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      for (ImplType t : values()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        if (!t.canSpecifyBindIP) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>          l.add(t.simpleClassName());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      return l;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  public ThriftServerRunner(Configuration conf) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // login the server principal (if using secure Hadoop)<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    securityEnabled = userProvider.isHadoopSecurityEnabled()<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      &amp;&amp; userProvider.isHBaseSecurityEnabled();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (securityEnabled) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      host = Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        conf.get("hbase.thrift.dns.interface", "default"),<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      userProvider.login("hbase.thrift.keytab.file",<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        "hbase.thrift.kerberos.principal", host);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    this.conf = HBaseConfiguration.create(conf);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    this.listenPort = conf.getInt(PORT_CONF_KEY, DEFAULT_LISTEN_PORT);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.ONE);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    this.pauseMonitor = new JvmPauseMonitor(conf, this.metrics.getSource());<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    this.hbaseHandler = new HBaseHandler(conf, userProvider);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    this.hbaseHandler.initMetrics(metrics);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    this.handler = HbaseHandlerMetricsProxy.newInstance(<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      hbaseHandler, metrics, conf);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    this.realUser = userProvider.getCurrent().getUGI();<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    String strQop = conf.get(THRIFT_QOP_KEY);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    if (strQop != null) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      this.qop = SaslUtil.getQop(strQop);<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    if (doAsEnabled) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not " +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>                "configured ");<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    if (qop != null) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      if (qop != QualityOfProtection.AUTHENTICATION &amp;&amp;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          qop != QualityOfProtection.INTEGRITY &amp;&amp;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          qop != QualityOfProtection.PRIVACY) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        throw new IOException(String.format("Invalide %s: It must be one of %s, %s, or %s.",<a name="line.372"></a>
+<span class="sourceLineNo">373</span>                              THRIFT_QOP_KEY,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                              QualityOfProtection.AUTHENTICATION.name(),<a name="line.374"></a>
+<span class="sourceLineNo">375</span>                              QualityOfProtection.INTEGRITY.name(),<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                              QualityOfProtection.PRIVACY.name()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      checkHttpSecurity(qop, conf);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      if (!securityEnabled) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        throw new IOException("Thrift server must"<a name="line.380"></a>
+<span class="sourceLineNo">381</span>          + " run in secure mode to support authentication");<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  private void checkHttpSecurity(QualityOfProtection qop, Configuration conf) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    if (qop == QualityOfProtection.PRIVACY &amp;&amp;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        conf.getBoolean(USE_HTTP_CONF_KEY, false) &amp;&amp;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        !conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      throw new IllegalArgumentException("Thrift HTTP Server's QoP is privacy, but " +<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          THRIFT_SSL_ENABLED + " is false");<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /*<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Runs the Thrift server<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   */<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  public void run() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    realUser.doAs(new PrivilegedAction&lt;Object&gt;() {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      @Override<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      public Object run() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        try {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          pauseMonitor.start();<a name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (conf.getBoolean(USE_HTTP_CONF_KEY, false)) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>            setupHTTPServer();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            httpServer.start();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>            httpServer.join();<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          } else {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            setupServer();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            tserver.serve();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>          }<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        } catch (Exception e) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          LOG.error(HBaseMarkers.FATAL, "Cannot run ThriftServer", e);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>          // Crash the process if the ThriftServer is not running<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          System.exit(-1);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        return null;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    });<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  public void shutdown() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    if (pauseMonitor != null) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      pauseMonitor.stop();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (tserver != null) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      tserver.stop();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      tserver = null;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    if (httpServer != null) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      try {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        httpServer.stop();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        httpServer = null;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      } catch (Exception e) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        LOG.error("Problem encountered in shutting down HTTP server " + e.getCause());<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      httpServer = null;<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  }<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>  private void setupHTTPServer() throws IOException {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    TProtocolFactory protocolFactory = new TBinaryProtocol.Factory();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    TProcessor processor = new Hbase.Processor&lt;&gt;(handler);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    TServlet thriftHttpServlet = new ThriftHttpServlet(processor, protocolFactory, realUser,<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        conf, hbaseHandler, securityEnabled, doAsEnabled);<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Set the default max thread number to 100 to limit<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // the number of concurrent requests so that Thrfit HTTP server doesn't OOM easily.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    //<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    int minThreads = conf.getInt(HTTP_MIN_THREADS, 2);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    int maxThreads = conf.getInt(HTTP_MAX_THREADS, 100);<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    QueuedThreadPool threadPool = new QueuedThreadPool(maxThreads);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    threadPool.setMinThreads(minThreads);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    httpServer = new Server(threadPool);<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    // Context handler<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    ServletContextHandler ctxHandler = new ServletContextHandler(httpServer, "/",<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            ServletContextHandler.SESSIONS);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    ctxHandler.addServlet(new ServletHolder(thriftHttpServlet), "/*");<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    HttpServerUtil.constrainHttpMethods(ctxHandler,<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      conf.getBoolean(THRIFT_HTTP_ALLOW_OPTIONS_METHOD, THRIFT_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT));<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span>    // set up Jetty and run the embedded server<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>    httpConfig.setSecureScheme("https");<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    httpConfig.setSecurePort(listenPort);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    httpConfig.setHeaderCacheSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    httpConfig.setRequestHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    httpConfig.setResponseHeaderSize(DEFAULT_HTTP_MAX_HEADER_SIZE);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    httpConfig.setSendServerVersion(false);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    httpConfig.setSendDateHeader(false);<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span>    ServerConnector serverConnector;<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    if(conf.getBoolean(THRIFT_SSL_ENABLED, false)) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          THRIFT_SSL_KEYSTORE_PASSWORD, null);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          THRIFT_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>      String[] excludeCiphers = conf.getStrings(<a name="line.492"></a>
+<span class="sourceLineNo">493</span>          THRIFT_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      if (excludeCiphers.length != 0) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      }<a name="line.496"></a>
+<span class="sourceLineNo">497</span>      String[] includeCiphers = conf.getStrings(<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          THRIFT_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      if (includeCiphers.length != 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>      // Disable SSLv3 by default due to "Poodle" Vulnerability - CVE-2014-3566<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      String[] excludeProtocols = conf.getStrings(<a name="line.504"></a>
+<span class="sourceLineNo">505</span>          THRIFT_SSL_EXCLUDE_PROTOCOLS, "SSLv3");<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      if (excludeProtocols.length != 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      }<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      String[] includeProtocols = conf.getStrings(<a name="line.509"></a>
+<span class="sourceLineNo">510</span>          THRIFT_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.510"></a>
+<span class="sourceLineNo">511</span>      if (includeProtocols.length != 0) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span>      serverConnector = new ServerConnector(httpServer,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.516"></a>
+<span class="sourceLineNo">517</span>          new HttpConnectionFactory(httpsConfig));<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    } else {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      serverConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConfig));<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    serverConnector.setPort(listenPort);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    String host = getBindAddress(conf).getHostAddress();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    serverConnector.setHost(host);<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    httpServer.addConnector(serverConnector);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    httpServer.setStopAtShutdown(true);<a name="line.525"></a>
 <span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.527"></a>
-<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>  /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * Setting up the thrift TServer<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  private void setupServer() throws Exception {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    // Construct correct ProtocolFactory<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    TProcessor processor = p;<a name="line.539"></a>
+<span class="sourceLineNo">527</span>    if (doAsEnabled) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      ProxyUsers.refreshSuperUserGroupsConfiguration(conf);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>    LOG.info("Starting Thrift HTTP Server on " + Integer.toString(listenPort));<a name="line.531"></a>
+<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>  /**<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * Setting up the thrift TServer<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   */<a name="line.536"></a>
+<span class="sourceLineNo">537</span>  private void setupServer() throws Exception {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    // Construct correct ProtocolFactory<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    TProtocolFactory protocolFactory = getProtocolFactory();<a name="line.539"></a>
 <span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>    // Construct correct TransportFactory<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    TTransportFactory transportFactory;<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      if (qop != null) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        throw new RuntimeException("Thrift server authentication"<a name="line.545"></a>
-<span class="sourceLineNo">546</span>          + " doesn't work with framed transport yet");<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      transportFactory = new TFramedTransport.Factory(<a name="line.548"></a>
-<span class="sourceLineNo">549</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>      LOG.debug("Using framed transport");<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    } else if (qop == null) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      transportFactory = new TTransportFactory();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    } else {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      // Extract the name from the principal<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        new SaslGssCallbackHandler() {<a name="line.560"></a>
-<span class="sourceLineNo">561</span>          @Override<a name="line.561"></a>
-<span class="sourceLineNo">562</span>          public void handle(Callback[] callbacks)<a name="line.562"></a>
-<span class="sourceLineNo">563</span>              throws UnsupportedCallbackException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>            AuthorizeCallback ac = null;<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            for (Callback callback : callbacks) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>              if (callback instanceof AuthorizeCallback) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>                ac = (AuthorizeCallback) callback;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>              } else {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>                throw new UnsupportedCallbackException(callback,<a name="line.569"></a>
-<span class="sourceLineNo">570</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.570"></a>
-<span class="sourceLineNo">571</span>              }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>            if (ac != null) {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>              String authid = ac.getAuthenticationID();<a name="line.574"></a>
-<span class="sourceLineNo">575</span>              String authzid = ac.getAuthorizationID();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>              if (!authid.equals(authzid)) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>                ac.setAuthorized(false);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>              } else {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>                ac.setAuthorized(true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>                LOG.info("Effective user: " + userName);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>                ac.setAuthorizedID(userName);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>              }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>          }<a name="line.585"></a>
-<span class="sourceLineNo">586</span>        });<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      transportFactory = saslFactory;<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>      // Create a processor wrapper, to get the caller<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      processor = new TProcessor() {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>        @Override<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        public boolean process(TProtocol inProt,<a name="line.592"></a>
-<span class="sourceLineNo">593</span>            TProtocol outProt) throws TException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>          TSaslServerTransport saslServerTransport =<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.595"></a>
-<span class="sourceLineNo">596</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>          String principal = saslServer.getAuthorizationID();<a name="line.597"></a>
-<span class="sourceLineNo">598</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>          return p.process(inProt, outProt);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      };<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.605"></a>
-<span class="sourceLineNo">606</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.606"></a>
-<span class="sourceLineNo">607</span>          "address binding at the moment. See " +<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      throw new RuntimeException(<a name="line.609"></a>
-<span class="sourceLineNo">610</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.616"></a>
-<span class="sourceLineNo">617</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.619"></a>
-<span class="sourceLineNo">620</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        TNonblockingServer.Args serverArgs =<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            new TNonblockingServer.Args(serverTransport);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        serverArgs.processor(processor)<a name="line.625"></a>
-<span class="sourceLineNo">626</span>                  .transportFactory(transportFactory)<a name="line.626"></a>
-<span class="sourceLineNo">627</span>                  .protocolFactory(protocolFactory);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      } else if (implType == ImplType.HS_HA) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>        ExecutorService executorService = createExecutor(<a name="line.632"></a>
-<span class="sourceLineNo">633</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.634"></a>
-<span class="sourceLineNo">635</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        tserver = new THsHaServer(serverArgs);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      } else { // THREADED_SELECTOR<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        ExecutorService executorService = createExecutor(<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.643"></a>
-<span class="sourceLineNo">644</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      LOG.info("starting HBase " + implType.simpleClassName() +<a name="line.647"></a>
-<span class="sourceLineNo">648</span>          " server on " + Integer.toString(listenPort));<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    } else if (implType == ImplType.THREAD_POOL) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      // Thread pool server. Get the IP address to bind to.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      int readTimeout = conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.652"></a>
-<span class="sourceLineNo">653</span>          THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      TServerTransport serverTransport = new TServerSocket(<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          new TServerSocket.ServerSocketTransportArgs().<a name="line.655"></a>
-<span class="sourceLineNo">656</span>              bindAddr(new InetSocketAddress(listenAddress, listenPort)).backlog(backlog).<a name="line.656"></a>
-<span class="sourceLineNo">657</span>              clientTimeout(readTimeout));<a name="line.657"></a>
-<span class="sourceLineNo">658</span><a name="line.658"></a>
-<span class="sourceLineNo">659</span>      TBoundedThreadPoolServer.Args serverArgs =<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          new TBoundedThreadPoolServer.Args(serverTransport, conf);<a name="line.660"></a>
-<span class="sourceLineNo">661</span>      serverArgs.processor(processor).transportFactory(transportFactory)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>              .protocolFactory(protocolFactory);<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      LOG.info("starting " + ImplType.THREAD_POOL.simpleClassName() + " on "<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          + listenAddress + ":" + Integer.toString(listenPort)<a name="line.664"></a>
-<span class="sourceLineNo">665</span>          + " with readTimeout " + readTimeout + "ms; " + serverArgs);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      this.tserver = new TBoundedThreadPoolServer(serverArgs, metrics);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    } else {<a name="line.667"></a>
-<span class="sourceLineNo">668</span>      throw new AssertionError("Unsupported Thrift server implementation: " +<a name="line.668"></a>
-<span class="sourceLineNo">669</span>          implType.simpleClassName());<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>    // A sanity check that we instantiated the right type of server.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    if (tserver.getClass() != implType.serverClass) {<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      throw new AssertionError("Expected to create Thrift server class " +<a name="line.674"></a>
-<span class="sourceLineNo">675</span>          implType.serverClass.getName() + " but got " +<a name="line.675"></a>
-<span class="sourceLineNo">676</span>          tserver.getClass().getName());<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>    registerFilters(conf);<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
+<span class="sourceLineNo">541</span>    final TProcessor p = new Hbase.Processor&lt;&gt;(handler);<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    ImplType implType = ImplType.getServerImpl(conf);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    TProcessor processor = p;<a name="line.543"></a>
+<span class="sourceLineNo">544</span><a name="line.544"></a>
+<span class="sourceLineNo">545</span>    // Construct correct TransportFactory<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    TTransportFactory transportFactory;<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    if (conf.getBoolean(FRAMED_CONF_KEY, false) || implType.isAlwaysFramed) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      if (qop != null) {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>        throw new RuntimeException("Thrift server authentication"<a name="line.549"></a>
+<span class="sourceLineNo">550</span>          + " doesn't work with framed transport yet");<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      }<a name="line.551"></a>
+<span class="sourceLineNo">552</span>      transportFactory = new TFramedTransport.Factory(<a name="line.552"></a>
+<span class="sourceLineNo">553</span>          conf.getInt(MAX_FRAME_SIZE_CONF_KEY, 2)  * 1024 * 1024);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>      LOG.debug("Using framed transport");<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    } else if (qop == null) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      transportFactory = new TTransportFactory();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    } else {<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      // Extract the name from the principal<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      String name = SecurityUtil.getUserFromPrincipal(<a name="line.559"></a>
+<span class="sourceLineNo">560</span>        conf.get("hbase.thrift.kerberos.principal"));<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      Map&lt;String, String&gt; saslProperties = SaslUtil.initSaslProperties(qop.name());<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      TSaslServerTransport.Factory saslFactory = new TSaslServerTransport.Factory();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      saslFactory.addServerDefinition("GSSAPI", name, host, saslProperties,<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        new SaslGssCallbackHandler() {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>          @Override<a name="line.565"></a>
+<span class="sourceLineNo">566</span>          public void handle(Callback[] callbacks)<a name="line.566"></a>
+<span class="sourceLineNo">567</span>              throws UnsupportedCallbackException {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            AuthorizeCallback ac = null;<a name="line.568"></a>
+<span class="sourceLineNo">569</span>            for (Callback callback : callbacks) {<a name="line.569"></a>
+<span class="sourceLineNo">570</span>              if (callback instanceof AuthorizeCallback) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>                ac = (AuthorizeCallback) callback;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>              } else {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>                throw new UnsupportedCallbackException(callback,<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                    "Unrecognized SASL GSSAPI Callback");<a name="line.574"></a>
+<span class="sourceLineNo">575</span>              }<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>            if (ac != null) {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>              String authid = ac.getAuthenticationID();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>              String authzid = ac.getAuthorizationID();<a name="line.579"></a>
+<span class="sourceLineNo">580</span>              if (!authid.equals(authzid)) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>                ac.setAuthorized(false);<a name="line.581"></a>
+<span class="sourceLineNo">582</span>              } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>                ac.setAuthorized(true);<a name="line.583"></a>
+<span class="sourceLineNo">584</span>                String userName = SecurityUtil.getUserFromPrincipal(authzid);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>                LOG.info("Effective user: " + userName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>                ac.setAuthorizedID(userName);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>              }<a name="line.587"></a>
+<span class="sourceLineNo">588</span>            }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>          }<a name="line.589"></a>
+<span class="sourceLineNo">590</span>        });<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      transportFactory = saslFactory;<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>      // Create a processor wrapper, to get the caller<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      processor = new TProcessor() {<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        public boolean process(TProtocol inProt,<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            TProtocol outProt) throws TException {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>          TSaslServerTransport saslServerTransport =<a name="line.598"></a>
+<span class="sourceLineNo">599</span>            (TSaslServerTransport)inProt.getTransport();<a name="line.599"></a>
+<span class="sourceLineNo">600</span>          SaslServer saslServer = saslServerTransport.getSaslServer();<a name="line.600"></a>
+<span class="sourceLineNo">601</span>          String principal = saslServer.getAuthorizationID();<a name="line.601"></a>
+<span class="sourceLineNo">602</span>          hbaseHandler.setEffectiveUser(principal);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>          return p.process(inProt, outProt);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      };<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    }<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    if (conf.get(BIND_CONF_KEY) != null &amp;&amp; !implType.canSpecifyBindIP) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      LOG.error("Server types " + Joiner.on(", ").join(<a name="line.609"></a>
+<span class="sourceLineNo">610</span>          ImplType.serversThatCannotSpecifyBindIP()) + " don't support IP " +<a name="line.610"></a>
+<span class="sourceLineNo">611</span>          "address binding at the moment. See " +<a name="line.611"></a>
+<span class="sourceLineNo">612</span>          "https://issues.apache.org/jira/browse/HBASE-2155 for details.");<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      throw new RuntimeException(<a name="line.613"></a>
+<span class="sourceLineNo">614</span>          "-" + BIND_CONF_KEY + " not supported with " + implType);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>    // Thrift's implementation uses '0' as a placeholder for 'use the default.'<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    int backlog = conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span>    if (implType == ImplType.HS_HA || implType == ImplType.NONBLOCKING ||<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        implType == ImplType.THREADED_SELECTOR) {<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      InetAddress listenAddress = getBindAddress(conf);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(<a name="line.623"></a>
+<span class="sourceLineNo">624</span>          new InetSocketAddress(listenAddress, listenPort));<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>      if (implType == ImplType.NONBLOCKING) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>        TNonblockingServer.Args serverArgs =<a name="line.627"></a>
+<span class="sourceLineNo">628</span>            new TNonblockingServer.Args(serverTransport);<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        serverArgs.processor(processor)<a name="line.629"></a>
+<span class="sourceLineNo">630</span>                  .transportFactory(transportFactory)<a name="line.630"></a>
+<span class="sourceLineNo">631</span>                  .protocolFactory(protocolFactory);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        tserver = new TNonblockingServer(serverArgs);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      } else if (implType == ImplType.HS_HA) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        ExecutorService executorService = createExecutor(<a name="line.636"></a>
+<span class="sourceLineNo">637</span>            callQueue, serverArgs.getMaxWorkerThreads(), serverArgs.getMaxWorkerThreads());<a name="line.637"></a>
+<span class="sourceLineNo">638</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.638"></a>
+<span class="sourceLineNo">639</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        tserver = new THsHaServer(serverArgs);<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      } else { // THREADED_SELECTOR<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        TThreadedSelectorServer.Args serverArgs =<a name="line.642"></a>
+<span class="sourceLineNo">643</span>            new HThreadedSelectorServerArgs(serverTransport, conf);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>        CallQueue callQueue = new CallQueue(new LinkedBlockingQueue&lt;&gt;(), metrics);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        ExecutorService executorService = createExecutor(<a name="line.645"></a>
+<span class="sourceLineNo">646</span>            callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());<a name="line.646"></a>
+<span class="sourceLineNo">647</span>        serverArgs.executorService(executorService).processor(processor)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>                .transportFactory(transportFactory).protocolFactory(protocolFactory);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        tserver = new TThreadedSelectorServer(serverArgs);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>      LOG.

<TRUNCATED>

[09/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
index d82c3a7..62e28c8 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.738">ThriftServerRunner.HBaseHandler</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.html#line.742">ThriftServerRunner.HBaseHandler</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <div class="block">The HBaseHandler is a glue object that connects Thrift RPC calls to the
@@ -721,7 +721,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>conf</h4>
-<pre>protected&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.739">conf</a></pre>
+<pre>protected&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.743">conf</a></pre>
 </li>
 </ul>
 <a name="LOG">
@@ -730,7 +730,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>protected static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.740">LOG</a></pre>
+<pre>protected static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.744">LOG</a></pre>
 </li>
 </ul>
 <a name="nextScannerId">
@@ -739,7 +739,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>nextScannerId</h4>
-<pre>protected&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.743">nextScannerId</a></pre>
+<pre>protected&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.747">nextScannerId</a></pre>
 </li>
 </ul>
 <a name="scannerMap">
@@ -748,7 +748,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerMap</h4>
-<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/HashMap.html?is-external=true" title="class or interface in java.util">HashMap</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ResultScannerWrapper</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.744">scannerMap</a></pre>
+<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/HashMap.html?is-external=true" title="class or interface in java.util">HashMap</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>,<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ResultScannerWrapper</a>&gt; <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.748">scannerMap</a></pre>
 </li>
 </ul>
 <a name="metrics">
@@ -757,7 +757,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>metrics</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.html" title="class in org.apache.hadoop.hbase.thrift">ThriftMetrics</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.745">metrics</a></pre>
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.html" title="class in org.apache.hadoop.hbase.thrift">ThriftMetrics</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.749">metrics</a></pre>
 </li>
 </ul>
 <a name="connectionCache">
@@ -766,7 +766,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>connectionCache</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/ConnectionCache.html" title="class in org.apache.hadoop.hbase.util">ConnectionCache</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.747">connectionCache</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/ConnectionCache.html" title="class in org.apache.hadoop.hbase.util">ConnectionCache</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.751">connectionCache</a></pre>
 </li>
 </ul>
 <a name="coalescer">
@@ -775,7 +775,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>coalescer</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/thrift/IncrementCoalescer.html" title="class in org.apache.hadoop.hbase.thrift">IncrementCoalescer</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.748">coalescer</a></pre>
+<pre><a href="../../../../../org/apache/hadoop/hbase/thrift/IncrementCoalescer.html" title="class in org.apache.hadoop.hbase.thrift">IncrementCoalescer</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.752">coalescer</a></pre>
 </li>
 </ul>
 <a name="CLEANUP_INTERVAL">
@@ -784,7 +784,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>CLEANUP_INTERVAL</h4>
-<pre>static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.750">CLEANUP_INTERVAL</a></pre>
+<pre>static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.754">CLEANUP_INTERVAL</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.HBaseHandler.CLEANUP_INTERVAL">Constant Field Values</a></dd>
@@ -797,7 +797,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MAX_IDLETIME</h4>
-<pre>static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.751">MAX_IDLETIME</a></pre>
+<pre>static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.755">MAX_IDLETIME</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.hadoop.hbase.thrift.ThriftServerRunner.HBaseHandler.MAX_IDLETIME">Constant Field Values</a></dd>
@@ -818,7 +818,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HBaseHandler</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.821">HBaseHandler</a>(org.apache.hadoop.conf.Configuration&nbsp;c,
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.825">HBaseHandler</a>(org.apache.hadoop.conf.Configuration&nbsp;c,
                        <a href="../../../../../org/apache/hadoop/hbase/security/UserProvider.html" title="class in org.apache.hadoop.hbase.security">UserProvider</a>&nbsp;userProvider)
                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -841,7 +841,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAllColumns</h4>
-<pre>byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.759">getAllColumns</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table)
+<pre>byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.763">getAllColumns</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table)
                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Returns a list of all the column families for a given Table.</div>
 <dl>
@@ -858,7 +858,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTable</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.777">getTable</a>(byte[]&nbsp;tableName)
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.781">getTable</a>(byte[]&nbsp;tableName)
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Creates and returns a Table instance from a given table name.</div>
 <dl>
@@ -877,7 +877,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTable</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.782">getTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.786">getTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -891,7 +891,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>addScanner</h4>
-<pre>protected&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.793">addScanner</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;scanner,
+<pre>protected&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.797">addScanner</a>(<a href="../../../../../org/apache/hadoop/hbase/client/ResultScanner.html" title="interface in org.apache.hadoop.hbase.client">ResultScanner</a>&nbsp;scanner,
                          boolean&nbsp;sortColumns)</pre>
 <div class="block">Assigns a unique ID to the scanner and adds the mapping to an internal
  hash-map.</div>
@@ -909,7 +909,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getScanner</h4>
-<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ResultScannerWrapper</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.806">getScanner</a>(int&nbsp;id)</pre>
+<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ResultScannerWrapper</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.810">getScanner</a>(int&nbsp;id)</pre>
 <div class="block">Returns the scanner associated with the specified ID.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -925,7 +925,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>removeScanner</h4>
-<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ResultScannerWrapper</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.817">removeScanner</a>(int&nbsp;id)</pre>
+<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ResultScannerWrapper.html" title="class in org.apache.hadoop.hbase.thrift">ThriftServerRunner.ResultScannerWrapper</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.821">removeScanner</a>(int&nbsp;id)</pre>
 <div class="block">Removes the scanner associated with the specified ID from the internal
  id-&gt;scanner hash-map.</div>
 <dl>
@@ -942,7 +942,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAdmin</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.836">getAdmin</a>()
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.840">getAdmin</a>()
                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Obtain HBaseAdmin. Creates the instance if it is not already created.</div>
 <dl>
@@ -957,7 +957,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>setEffectiveUser</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.840">setEffectiveUser</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;effectiveUser)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.844">setEffectiveUser</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;effectiveUser)</pre>
 </li>
 </ul>
 <a name="enableTable-java.nio.ByteBuffer-">
@@ -966,7 +966,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>enableTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.845">enableTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.849">enableTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
                  throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
 <div class="block">Brings a table on-line (enables it)</div>
@@ -986,7 +986,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>disableTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.855">disableTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.859">disableTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
                   throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
 <div class="block">Disables a table (takes it off-line) If it is being served, the master
@@ -1007,7 +1007,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>isTableEnabled</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.865">isTableEnabled</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.869">isTableEnabled</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
                        throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1027,7 +1027,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>compact</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.877">compact</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableNameOrRegionName)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.881">compact</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableNameOrRegionName)
              throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1043,7 +1043,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>majorCompact</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.894">majorCompact</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableNameOrRegionName)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.898">majorCompact</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableNameOrRegionName)
                   throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1059,7 +1059,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableNames</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.909">getTableNames</a>()
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.913">getTableNames</a>()
                                throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
 <div class="block">List all the userspace tables.</div>
@@ -1079,7 +1079,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableRegions</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRegionInfo&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.927">getTableRegions</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRegionInfo&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.931">getTableRegions</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
                                                                            throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
 <div class="block">List the regions associated with a table.</div>
@@ -1101,7 +1101,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.957">get</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.961">get</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                 <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                 <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;column,
                                                                 <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1130,7 +1130,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>get</h4>
-<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.978">get</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.982">get</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                    byte[]&nbsp;family,
                                                                    byte[]&nbsp;qualifier,
@@ -1153,7 +1153,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getVer</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1004">getVer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1008">getVer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;column,
                                                                    int&nbsp;numVersions,
@@ -1184,7 +1184,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getVer</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1025">getVer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1029">getVer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                    byte[]&nbsp;family,
                                                                    byte[]&nbsp;qualifier,
@@ -1209,7 +1209,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getVerTs</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1050">getVerTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1054">getVerTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;column,
                                                                      long&nbsp;timestamp,
@@ -1243,7 +1243,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getVerTs</h4>
-<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1070">getVerTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TCell&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1074">getVerTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                         byte[]&nbsp;family,
                                                                         byte[]&nbsp;qualifier,
@@ -1268,7 +1268,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRow</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1097">getRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1101">getRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
                                                                  throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
@@ -1295,7 +1295,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowWithColumns</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1105">getRowWithColumns</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1109">getRowWithColumns</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                                                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1324,7 +1324,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowTs</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1115">getRowTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1119">getRowTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                           <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                           long&nbsp;timestamp,
                                                                           <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1353,7 +1353,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowWithColumnsTs</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1122">getRowWithColumnsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1126">getRowWithColumnsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                                                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                                                                                      long&nbsp;timestamp,
@@ -1383,7 +1383,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRows</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1158">getRows</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1162">getRows</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;rows,
                                                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
                                                                   throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
@@ -1410,7 +1410,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowsWithColumns</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1168">getRowsWithColumns</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1172">getRowsWithColumns</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                                     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;rows,
                                                                                     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                                                                                     <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1439,7 +1439,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowsTs</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1178">getRowsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1182">getRowsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;rows,
                                                                            long&nbsp;timestamp,
                                                                            <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1468,7 +1468,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRowsWithColumnsTs</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1187">getRowsWithColumnsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1191">getRowsWithColumnsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                                                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;rows,
                                                                                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                                                                                       long&nbsp;timestamp,
@@ -1498,7 +1498,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteAll</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1227">deleteAll</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1231">deleteAll</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                       <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                       <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;column,
                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1524,7 +1524,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteAllTs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1236">deleteAllTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1240">deleteAllTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;column,
                         long&nbsp;timestamp,
@@ -1553,7 +1553,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteAllRow</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1262">deleteAllRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1266">deleteAllRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
                   throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
@@ -1577,7 +1577,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteAllRowTs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1269">deleteAllRowTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1273">deleteAllRowTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                            <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                            long&nbsp;timestamp,
                            <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1604,7 +1604,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1287">createTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;in_tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1291">createTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;in_tableName,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor&gt;&nbsp;columnFamilies)
                  throws org.apache.hadoop.hbase.thrift.generated.IOError,
                         org.apache.hadoop.hbase.thrift.generated.IllegalArgument,
@@ -1633,7 +1633,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableName</h4>
-<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1310">getTableName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;buffer)</pre>
+<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1314">getTableName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;buffer)</pre>
 </li>
 </ul>
 <a name="deleteTable-java.nio.ByteBuffer-">
@@ -1642,7 +1642,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1315">deleteTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;in_tableName)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1319">deleteTable</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;in_tableName)
                  throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
 <div class="block">Deletes a table</div>
@@ -1663,7 +1663,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>mutateRow</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1332">mutateRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1336">mutateRow</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                       <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.Mutation&gt;&nbsp;mutations,
                       <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1694,7 +1694,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>mutateRowTs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1340">mutateRowTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1344">mutateRowTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.Mutation&gt;&nbsp;mutations,
                         long&nbsp;timestamp,
@@ -1727,7 +1727,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>mutateRows</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1404">mutateRows</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1408">mutateRows</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.BatchMutation&gt;&nbsp;rowBatches,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
                 throws org.apache.hadoop.hbase.thrift.generated.IOError,
@@ -1758,7 +1758,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>mutateRowsTs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1411">mutateRowsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1415">mutateRowsTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.BatchMutation&gt;&nbsp;rowBatches,
                          long&nbsp;timestamp,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1791,7 +1791,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>atomicIncrement</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1491">atomicIncrement</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1495">atomicIncrement</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                             <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                             <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;column,
                             long&nbsp;amount)
@@ -1821,7 +1821,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>atomicIncrement</h4>
-<pre>protected&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1501">atomicIncrement</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>protected&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1505">atomicIncrement</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;row,
                                byte[]&nbsp;family,
                                byte[]&nbsp;qualifier,
@@ -1843,7 +1843,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerClose</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1518">scannerClose</a>(int&nbsp;id)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1522">scannerClose</a>(int&nbsp;id)
                   throws org.apache.hadoop.hbase.thrift.generated.IOError,
                          org.apache.hadoop.hbase.thrift.generated.IllegalArgument</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
@@ -1865,7 +1865,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerGetList</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1531">scannerGetList</a>(int&nbsp;id,
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1535">scannerGetList</a>(int&nbsp;id,
                                                                                 int&nbsp;nbRows)
                                                                          throws org.apache.hadoop.hbase.thrift.generated.IllegalArgument,
                                                                                 org.apache.hadoop.hbase.thrift.generated.IOError</pre>
@@ -1894,7 +1894,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerGet</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1555">scannerGet</a>(int&nbsp;id)
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;org.apache.hadoop.hbase.thrift.generated.TRowResult&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1559">scannerGet</a>(int&nbsp;id)
                                                                      throws org.apache.hadoop.hbase.thrift.generated.IllegalArgument,
                                                                             org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
@@ -1921,7 +1921,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerOpenWithScan</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1560">scannerOpenWithScan</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1564">scannerOpenWithScan</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                org.apache.hadoop.hbase.thrift.generated.TScan&nbsp;tScan,
                                <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
                         throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
@@ -1946,7 +1946,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerOpen</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1615">scannerOpen</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1619">scannerOpen</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;startRow,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -1978,7 +1978,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerOpenWithStop</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1644">scannerOpenWithStop</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1648">scannerOpenWithStop</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;startRow,
                                <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;stopRow,
                                <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
@@ -2016,7 +2016,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerOpenWithPrefix</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1674">scannerOpenWithPrefix</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1678">scannerOpenWithPrefix</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;startAndPrefix,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;attributes)
@@ -2047,7 +2047,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerOpenTs</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1708">scannerOpenTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1712">scannerOpenTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;startRow,
                          <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
                          long&nbsp;timestamp,
@@ -2084,7 +2084,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>scannerOpenWithStopTs</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1738">scannerOpenWithStopTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1742">scannerOpenWithStopTs</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;startRow,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;stopRow,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;columns,
@@ -2125,7 +2125,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getColumnDescriptors</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1770">getColumnDescriptors</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1774">getColumnDescriptors</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;tableName)
                                                                                                throws org.apache.hadoop.hbase.thrift.generated.IOError,
                                                                                                       org.apache.thrift.TException</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
@@ -2149,7 +2149,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>closeTable</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1793">closeTable</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1797">closeTable</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Table.html" title="interface in org.apache.hadoop.hbase.client">Table</a>&nbsp;table)
                  throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -2163,7 +2163,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRegionInfo</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.thrift.generated.TRegionInfo&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1805">getRegionInfo</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;searchRow)
+<pre>public&nbsp;org.apache.hadoop.hbase.thrift.generated.TRegionInfo&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1809">getRegionInfo</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&nbsp;searchRow)
                                                                    throws org.apache.hadoop.hbase.thrift.generated.IOError</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code>org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</code></span></div>
 <div class="block">Get the regininfo for the specified row. It scans
@@ -2186,7 +2186,7 @@ implements org.apache.hadoop.hbase.thrift.generated.Hbase.Iface</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReverseScanResult</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1843">getReverseScanResult</a>(byte[]&nbsp;tableName,
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/thrift/ThriftServerRunner.HBaseHandler.html#line.1847">getReverseScanResult</a>(byte

<TRUNCATED>

[10/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/rest/RESTServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/RESTServer.html b/devapidocs/org/apache/hadoop/hbase/rest/RESTServer.html
index f7b13c6..a038e56 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/RESTServer.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/RESTServer.html
@@ -179,6 +179,14 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rest/RESTServer.html#REST_CSRF_METHODS_TO_IGNORE_KEY">REST_CSRF_METHODS_TO_IGNORE_KEY</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>(package private) static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rest/RESTServer.html#REST_HTTP_ALLOW_OPTIONS_METHOD">REST_HTTP_ALLOW_OPTIONS_METHOD</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rest/RESTServer.html#REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT">REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rest/RESTServer.html#restCSRFEnabled">restCSRFEnabled</a></span></code>&nbsp;</td>
 </tr>
@@ -362,13 +370,31 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 </dl>
 </li>
 </ul>
+<a name="REST_HTTP_ALLOW_OPTIONS_METHOD">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>REST_HTTP_ALLOW_OPTIONS_METHOD</h4>
+<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.98">REST_HTTP_ALLOW_OPTIONS_METHOD</a></pre>
+</li>
+</ul>
+<a name="REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</h4>
+<pre>private static&nbsp;boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.100">REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT</a></pre>
+</li>
+</ul>
 <a name="REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY</h4>
-<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.124">REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY</a></pre>
+<pre>static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.128">REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY</a></pre>
 </li>
 </ul>
 </li>
@@ -402,7 +428,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>printUsageAndExit</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.98">printUsageAndExit</a>(org.apache.hbase.thirdparty.org.apache.commons.cli.Options&nbsp;options,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.102">printUsageAndExit</a>(org.apache.hbase.thirdparty.org.apache.commons.cli.Options&nbsp;options,
                                       int&nbsp;exitCode)</pre>
 </li>
 </ul>
@@ -412,7 +438,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getTrimmedStringList</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.115">getTrimmedStringList</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.119">getTrimmedStringList</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;defaultValue)</pre>
 <div class="block">Returns a list of strings from a comma-delimited configuration value.</div>
@@ -433,7 +459,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>addCSRFFilter</h4>
-<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.125">addCSRFFilter</a>(org.eclipse.jetty.servlet.ServletContextHandler&nbsp;ctxHandler,
+<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.129">addCSRFFilter</a>(org.eclipse.jetty.servlet.ServletContextHandler&nbsp;ctxHandler,
                           org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 </li>
 </ul>
@@ -443,7 +469,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>loginServerPrincipal</h4>
-<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;org.eclipse.jetty.servlet.FilterHolder,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.glassfish.jersey.servlet.ServletContainer&gt;&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.139">loginServerPrincipal</a>(<a href="../../../../../org/apache/hadoop/hbase/security/UserProvider.html" title="class in org.apache.hadoop.hbase.security">UserProvider</a>&nbsp;userProvider,
+<pre>private static&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;org.eclipse.jetty.servlet.FilterHolder,<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;? extends org.glassfish.jersey.servlet.ServletContainer&gt;&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.143">loginServerPrincipal</a>(<a href="../../../../../org/apache/hadoop/hbase/security/UserProvider.html" title="class in org.apache.hadoop.hbase.security">UserProvider</a>&nbsp;userProvider,
                                                                                                                                                 org.apache.hadoop.conf.Configuration&nbsp;conf)
                                                                                                                                          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
@@ -458,7 +484,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>parseCommandLine</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.164">parseCommandLine</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.168">parseCommandLine</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args,
                                      <a href="../../../../../org/apache/hadoop/hbase/rest/RESTServlet.html" title="class in org.apache.hadoop.hbase.rest">RESTServlet</a>&nbsp;servlet)</pre>
 </li>
 </ul>
@@ -468,7 +494,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rest/Constants.html"
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.226">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rest/RESTServer.html#line.230">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)
                  throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">The main method for the HBase rest server.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
index 034077c..c20ff47 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
@@ -110,8 +110,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.FilterType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.FilterType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index bf7ef69..e0eb9a0 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -137,9 +137,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
 </ul>
 </li>
 </ul>


[07/11] hbase-site git commit: Published site at c60578d9829f29cf77b250d238a9e38dc0b513d7.

Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/039fa0b5/devapidocs/src-html/org/apache/hadoop/hbase/rest/RESTServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RESTServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RESTServer.html
index 4934e0d..f70c235 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/RESTServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/RESTServer.html
@@ -103,274 +103,279 @@
 <span class="sourceLineNo">095</span><a name="line.95"></a>
 <span class="sourceLineNo">096</span>  private static final String PATH_SPEC_ANY = "/*";<a name="line.96"></a>
 <span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  private static void printUsageAndExit(Options options, int exitCode) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    HelpFormatter formatter = new HelpFormatter();<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    formatter.printHelp("hbase rest start", "", options,<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      "\nTo run the REST server as a daemon, execute " +<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      "hbase-daemon.sh start|stop rest [--infoport &lt;port&gt;] [-p &lt;port&gt;] [-ro]\n", true);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    System.exit(exitCode);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  /**<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   * Returns a list of strings from a comma-delimited configuration value.<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   *<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   * @param conf configuration to check<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * @param name configuration property name<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * @param defaultValue default value if no value found for name<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * @return list of strings from comma-delimited configuration value, or an<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   *     empty list if not found<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  private static List&lt;String&gt; getTrimmedStringList(Configuration conf,<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    String name, String defaultValue) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    String valueString = conf.get(name, defaultValue);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    if (valueString == null) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      return new ArrayList&lt;&gt;();<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return new ArrayList&lt;&gt;(StringUtils.getTrimmedStringCollection(valueString));<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  static String REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY = "hbase.rest-csrf.browser-useragents-regex";<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  static void addCSRFFilter(ServletContextHandler ctxHandler, Configuration conf) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    restCSRFEnabled = conf.getBoolean(REST_CSRF_ENABLED_KEY, REST_CSRF_ENABLED_DEFAULT);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    if (restCSRFEnabled) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      Map&lt;String, String&gt; restCsrfParams = RestCsrfPreventionFilter<a name="line.128"></a>
-<span class="sourceLineNo">129</span>          .getFilterParams(conf, "hbase.rest-csrf.");<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      FilterHolder holder = new FilterHolder();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      holder.setName("csrf");<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      holder.setClassName(RestCsrfPreventionFilter.class.getName());<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      holder.setInitParameters(restCsrfParams);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      ctxHandler.addFilter(holder, PATH_SPEC_ANY, EnumSet.allOf(DispatcherType.class));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  // login the server principal (if using secure Hadoop)<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private static Pair&lt;FilterHolder, Class&lt;? extends ServletContainer&gt;&gt; loginServerPrincipal(<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    UserProvider userProvider, Configuration conf) throws Exception {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    Class&lt;? extends ServletContainer&gt; containerClass = ServletContainer.class;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    if (userProvider.isHadoopSecurityEnabled() &amp;&amp; userProvider.isHBaseSecurityEnabled()) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      String machineName = Strings.domainNamePointerToHostName(<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        DNS.getDefaultHost(conf.get(REST_DNS_INTERFACE, "default"),<a name="line.144"></a>
-<span class="sourceLineNo">145</span>          conf.get(REST_DNS_NAMESERVER, "default")));<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      String keytabFilename = conf.get(REST_KEYTAB_FILE);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      Preconditions.checkArgument(keytabFilename != null &amp;&amp; !keytabFilename.isEmpty(),<a name="line.147"></a>
-<span class="sourceLineNo">148</span>        REST_KEYTAB_FILE + " should be set if security is enabled");<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      String principalConfig = conf.get(REST_KERBEROS_PRINCIPAL);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      Preconditions.checkArgument(principalConfig != null &amp;&amp; !principalConfig.isEmpty(),<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        REST_KERBEROS_PRINCIPAL + " should be set if security is enabled");<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      userProvider.login(REST_KEYTAB_FILE, REST_KERBEROS_PRINCIPAL, machineName);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      if (conf.get(REST_AUTHENTICATION_TYPE) != null) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        containerClass = RESTServletContainer.class;<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        FilterHolder authFilter = new FilterHolder();<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        authFilter.setClassName(AuthFilter.class.getName());<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        authFilter.setName("AuthenticationFilter");<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        return new Pair&lt;&gt;(authFilter,containerClass);<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>
-<span class="sourceLineNo">161</span>    return new Pair&lt;&gt;(null, containerClass);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>  private static void parseCommandLine(String[] args, RESTServlet servlet) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    Options options = new Options();<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    options.addOption("p", "port", true, "Port to bind to [default: " + DEFAULT_LISTEN_PORT + "]");<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    options.addOption("ro", "readonly", false, "Respond only to GET HTTP " +<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      "method requests [default: false]");<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    options.addOption(null, "infoport", true, "Port for web UI");<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>    CommandLine commandLine = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    try {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      commandLine = new PosixParser().parse(options, args);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    } catch (ParseException e) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      LOG.error("Could not parse: ", e);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      printUsageAndExit(options, -1);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>    // check for user-defined port setting, if so override the conf<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    if (commandLine != null &amp;&amp; commandLine.hasOption("port")) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      String val = commandLine.getOptionValue("port");<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      servlet.getConfiguration().setInt("hbase.rest.port", Integer.parseInt(val));<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      if (LOG.isDebugEnabled()) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        LOG.debug("port set to " + val);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>    // check if server should only process GET requests, if so override the conf<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    if (commandLine != null &amp;&amp; commandLine.hasOption("readonly")) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      servlet.getConfiguration().setBoolean("hbase.rest.readonly", true);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      if (LOG.isDebugEnabled()) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        LOG.debug("readonly set to true");<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    // check for user-defined info server port setting, if so override the conf<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    if (commandLine != null &amp;&amp; commandLine.hasOption("infoport")) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      String val = commandLine.getOptionValue("infoport");<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      servlet.getConfiguration().setInt("hbase.rest.info.port", Integer.parseInt(val));<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      if (LOG.isDebugEnabled()) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        LOG.debug("Web UI port set to " + val);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    @SuppressWarnings("unchecked")<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    List&lt;String&gt; remainingArgs = commandLine != null ? commandLine.getArgList() : new ArrayList&lt;&gt;();<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    if (remainingArgs.size() != 1) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      printUsageAndExit(options, 1);<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>    String command = remainingArgs.get(0);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    if ("start".equals(command)) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      // continue and start container<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    } else if ("stop".equals(command)) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      System.exit(1);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    } else {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      printUsageAndExit(options, 1);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  /**<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * The main method for the HBase rest server.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   * @param args command-line arguments<a name="line.223"></a>
-<span class="sourceLineNo">224</span>   * @throws Exception exception<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   */<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  public static void main(String[] args) throws Exception {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    LOG.info("***** STARTING service '" + RESTServer.class.getSimpleName() + "' *****");<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    VersionInfo.logVersion();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    Configuration conf = HBaseConfiguration.create();<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    Pair&lt;FilterHolder, Class&lt;? extends ServletContainer&gt;&gt; pair = loginServerPrincipal(<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      userProvider, conf);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    FilterHolder authFilter = pair.getFirst();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    RESTServlet servlet = RESTServlet.getInstance(conf, userProvider);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>    parseCommandLine(args, servlet);<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>    // set up the Jersey servlet container for Jetty<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    ResourceConfig application = new ResourceConfig().<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        packages("org.apache.hadoop.hbase.rest").register(JacksonJaxbJsonProvider.class);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    ServletHolder sh = new ServletHolder(new ServletContainer(application));<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>    // Set the default max thread number to 100 to limit<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    // the number of concurrent requests so that REST server doesn't OOM easily.<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    //<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    int maxThreads = servlet.getConfiguration().getInt(REST_THREAD_POOL_THREADS_MAX, 100);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    int minThreads = servlet.getConfiguration().getInt(REST_THREAD_POOL_THREADS_MIN, 2);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    // Use the default queue (unbounded with Jetty 9.3) if the queue size is negative, otherwise use<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    // bounded {@link ArrayBlockingQueue} with the given size<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    int queueSize = servlet.getConfiguration().getInt(REST_THREAD_POOL_TASK_QUEUE_SIZE, -1);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    int idleTimeout = servlet.getConfiguration().getInt(REST_THREAD_POOL_THREAD_IDLE_TIMEOUT, 60000);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    QueuedThreadPool threadPool = queueSize &gt; 0 ?<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        new QueuedThreadPool(maxThreads, minThreads, idleTimeout, new ArrayBlockingQueue&lt;&gt;(queueSize)) :<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        new QueuedThreadPool(maxThreads, minThreads, idleTimeout);<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>    Server server = new Server(threadPool);<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>    // Setup JMX<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    MBeanContainer mbContainer=new MBeanContainer(ManagementFactory.getPlatformMBeanServer());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    server.addEventListener(mbContainer);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    server.addBean(mbContainer);<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>    String host = servlet.getConfiguration().get("hbase.rest.host", "0.0.0.0");<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    int servicePort = servlet.getConfiguration().getInt("hbase.rest.port", 8080);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    httpConfig.setSecureScheme("https");<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    httpConfig.setSecurePort(servicePort);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    httpConfig.setSendServerVersion(false);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    httpConfig.setSendDateHeader(false);<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>    ServerConnector serverConnector;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    if (conf.getBoolean(REST_SSL_ENABLED, false)) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      String keystore = conf.get(REST_SSL_KEYSTORE_STORE);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.281"></a>
-<span class="sourceLineNo">282</span>          REST_SSL_KEYSTORE_PASSWORD, null);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.283"></a>
-<span class="sourceLineNo">284</span>          REST_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>      String[] excludeCiphers = servlet.getConfiguration().getStrings(<a name="line.289"></a>
-<span class="sourceLineNo">290</span>          REST_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      if (excludeCiphers.length != 0) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      String[] includeCiphers = servlet.getConfiguration().getStrings(<a name="line.294"></a>
-<span class="sourceLineNo">295</span>          REST_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      if (includeCiphers.length != 0) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span>      String[] excludeProtocols = servlet.getConfiguration().getStrings(<a name="line.300"></a>
-<span class="sourceLineNo">301</span>          REST_SSL_EXCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      if (excludeProtocols.length != 0) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      String[] includeProtocols = servlet.getConfiguration().getStrings(<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          REST_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      if (includeProtocols.length != 0) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>      serverConnector = new ServerConnector(server,<a name="line.311"></a>
-<span class="sourceLineNo">312</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.312"></a>
-<span class="sourceLineNo">313</span>          new HttpConnectionFactory(httpsConfig));<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    } else {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      serverConnector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>    int acceptQueueSize = servlet.getConfiguration().getInt(REST_CONNECTOR_ACCEPT_QUEUE_SIZE, -1);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    if (acceptQueueSize &gt;= 0) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      serverConnector.setAcceptQueueSize(acceptQueueSize);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    serverConnector.setPort(servicePort);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    serverConnector.setHost(host);<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    server.addConnector(serverConnector);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    server.setStopAtShutdown(true);<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>    // set up context<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    ServletContextHandler ctxHandler = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    ctxHandler.addServlet(sh, PATH_SPEC_ANY);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    if (authFilter != null) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      ctxHandler.addFilter(authFilter, PATH_SPEC_ANY, EnumSet.of(DispatcherType.REQUEST));<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>    // Load filters from configuration.<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    String[] filterClasses = servlet.getConfiguration().getStrings(FILTER_CLASSES,<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        GzipFilter.class.getName());<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    for (String filter : filterClasses) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      filter = filter.trim();<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      ctxHandler.addFilter(filter, PATH_SPEC_ANY, EnumSet.of(DispatcherType.REQUEST));<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    addCSRFFilter(ctxHandler, conf);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    HttpServerUtil.constrainHttpMethods(ctxHandler);<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>    // Put up info server.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    int port = conf.getInt("hbase.rest.info.port", 8085);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (port &gt;= 0) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      conf.setLong("startcode", System.currentTimeMillis());<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      String a = conf.get("hbase.rest.info.bindAddress", "0.0.0.0");<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      InfoServer infoServer = new InfoServer("rest", a, port, false, conf);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      infoServer.setAttribute("hbase.conf", conf);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      infoServer.start();<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    }<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    try {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      // start server<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      server.start();<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      server.join();<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    } catch (Exception e) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      LOG.error(HBaseMarkers.FATAL, "Failed to start server", e);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      System.exit(1);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    LOG.info("***** STOPPING service '" + RESTServer.class.getSimpleName() + "' *****");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>  }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>}<a name="line.365"></a>
+<span class="sourceLineNo">098</span>  static String REST_HTTP_ALLOW_OPTIONS_METHOD = "hbase.rest.http.allow.options.method";<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  // HTTP OPTIONS method is commonly used in REST APIs for negotiation. So it is enabled by default.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  private static boolean REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT = true;<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  private static void printUsageAndExit(Options options, int exitCode) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    HelpFormatter formatter = new HelpFormatter();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    formatter.printHelp("hbase rest start", "", options,<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      "\nTo run the REST server as a daemon, execute " +<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      "hbase-daemon.sh start|stop rest [--infoport &lt;port&gt;] [-p &lt;port&gt;] [-ro]\n", true);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    System.exit(exitCode);<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>   * Returns a list of strings from a comma-delimited configuration value.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   *<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * @param conf configuration to check<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   * @param name configuration property name<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param defaultValue default value if no value found for name<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * @return list of strings from comma-delimited configuration value, or an<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   *     empty list if not found<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  private static List&lt;String&gt; getTrimmedStringList(Configuration conf,<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    String name, String defaultValue) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    String valueString = conf.get(name, defaultValue);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    if (valueString == null) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      return new ArrayList&lt;&gt;();<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return new ArrayList&lt;&gt;(StringUtils.getTrimmedStringCollection(valueString));<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  static String REST_CSRF_BROWSER_USERAGENTS_REGEX_KEY = "hbase.rest-csrf.browser-useragents-regex";<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  static void addCSRFFilter(ServletContextHandler ctxHandler, Configuration conf) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    restCSRFEnabled = conf.getBoolean(REST_CSRF_ENABLED_KEY, REST_CSRF_ENABLED_DEFAULT);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    if (restCSRFEnabled) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      Map&lt;String, String&gt; restCsrfParams = RestCsrfPreventionFilter<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          .getFilterParams(conf, "hbase.rest-csrf.");<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      FilterHolder holder = new FilterHolder();<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      holder.setName("csrf");<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      holder.setClassName(RestCsrfPreventionFilter.class.getName());<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      holder.setInitParameters(restCsrfParams);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      ctxHandler.addFilter(holder, PATH_SPEC_ANY, EnumSet.allOf(DispatcherType.class));<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>  // login the server principal (if using secure Hadoop)<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  private static Pair&lt;FilterHolder, Class&lt;? extends ServletContainer&gt;&gt; loginServerPrincipal(<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    UserProvider userProvider, Configuration conf) throws Exception {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    Class&lt;? extends ServletContainer&gt; containerClass = ServletContainer.class;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    if (userProvider.isHadoopSecurityEnabled() &amp;&amp; userProvider.isHBaseSecurityEnabled()) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      String machineName = Strings.domainNamePointerToHostName(<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        DNS.getDefaultHost(conf.get(REST_DNS_INTERFACE, "default"),<a name="line.148"></a>
+<span class="sourceLineNo">149</span>          conf.get(REST_DNS_NAMESERVER, "default")));<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      String keytabFilename = conf.get(REST_KEYTAB_FILE);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      Preconditions.checkArgument(keytabFilename != null &amp;&amp; !keytabFilename.isEmpty(),<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        REST_KEYTAB_FILE + " should be set if security is enabled");<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      String principalConfig = conf.get(REST_KERBEROS_PRINCIPAL);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      Preconditions.checkArgument(principalConfig != null &amp;&amp; !principalConfig.isEmpty(),<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        REST_KERBEROS_PRINCIPAL + " should be set if security is enabled");<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      userProvider.login(REST_KEYTAB_FILE, REST_KERBEROS_PRINCIPAL, machineName);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      if (conf.get(REST_AUTHENTICATION_TYPE) != null) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        containerClass = RESTServletContainer.class;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        FilterHolder authFilter = new FilterHolder();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        authFilter.setClassName(AuthFilter.class.getName());<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        authFilter.setName("AuthenticationFilter");<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        return new Pair&lt;&gt;(authFilter,containerClass);<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>    return new Pair&lt;&gt;(null, containerClass);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  private static void parseCommandLine(String[] args, RESTServlet servlet) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    Options options = new Options();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    options.addOption("p", "port", true, "Port to bind to [default: " + DEFAULT_LISTEN_PORT + "]");<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    options.addOption("ro", "readonly", false, "Respond only to GET HTTP " +<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      "method requests [default: false]");<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    options.addOption(null, "infoport", true, "Port for web UI");<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    CommandLine commandLine = null;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    try {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      commandLine = new PosixParser().parse(options, args);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    } catch (ParseException e) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      LOG.error("Could not parse: ", e);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      printUsageAndExit(options, -1);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // check for user-defined port setting, if so override the conf<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    if (commandLine != null &amp;&amp; commandLine.hasOption("port")) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      String val = commandLine.getOptionValue("port");<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      servlet.getConfiguration().setInt("hbase.rest.port", Integer.parseInt(val));<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      if (LOG.isDebugEnabled()) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        LOG.debug("port set to " + val);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>    // check if server should only process GET requests, if so override the conf<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    if (commandLine != null &amp;&amp; commandLine.hasOption("readonly")) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      servlet.getConfiguration().setBoolean("hbase.rest.readonly", true);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      if (LOG.isDebugEnabled()) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span>        LOG.debug("readonly set to true");<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>    // check for user-defined info server port setting, if so override the conf<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    if (commandLine != null &amp;&amp; commandLine.hasOption("infoport")) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      String val = commandLine.getOptionValue("infoport");<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      servlet.getConfiguration().setInt("hbase.rest.info.port", Integer.parseInt(val));<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      if (LOG.isDebugEnabled()) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        LOG.debug("Web UI port set to " + val);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      }<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>    @SuppressWarnings("unchecked")<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    List&lt;String&gt; remainingArgs = commandLine != null ? commandLine.getArgList() : new ArrayList&lt;&gt;();<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    if (remainingArgs.size() != 1) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      printUsageAndExit(options, 1);<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>    String command = remainingArgs.get(0);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    if ("start".equals(command)) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      // continue and start container<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    } else if ("stop".equals(command)) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      System.exit(1);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    } else {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      printUsageAndExit(options, 1);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>  /**<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * The main method for the HBase rest server.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * @param args command-line arguments<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * @throws Exception exception<a name="line.228"></a>
+<span class="sourceLineNo">229</span>   */<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  public static void main(String[] args) throws Exception {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    LOG.info("***** STARTING service '" + RESTServer.class.getSimpleName() + "' *****");<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    VersionInfo.logVersion();<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    Configuration conf = HBaseConfiguration.create();<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    UserProvider userProvider = UserProvider.instantiate(conf);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    Pair&lt;FilterHolder, Class&lt;? extends ServletContainer&gt;&gt; pair = loginServerPrincipal(<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      userProvider, conf);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    FilterHolder authFilter = pair.getFirst();<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    RESTServlet servlet = RESTServlet.getInstance(conf, userProvider);<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>    parseCommandLine(args, servlet);<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>    // set up the Jersey servlet container for Jetty<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    ResourceConfig application = new ResourceConfig().<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        packages("org.apache.hadoop.hbase.rest").register(JacksonJaxbJsonProvider.class);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    ServletHolder sh = new ServletHolder(new ServletContainer(application));<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // Set the default max thread number to 100 to limit<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    // the number of concurrent requests so that REST server doesn't OOM easily.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    // Jetty set the default max thread number to 250, if we don't set it.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    //<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    // Our default min thread number 2 is the same as that used by Jetty.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    int maxThreads = servlet.getConfiguration().getInt(REST_THREAD_POOL_THREADS_MAX, 100);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    int minThreads = servlet.getConfiguration().getInt(REST_THREAD_POOL_THREADS_MIN, 2);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    // Use the default queue (unbounded with Jetty 9.3) if the queue size is negative, otherwise use<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    // bounded {@link ArrayBlockingQueue} with the given size<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    int queueSize = servlet.getConfiguration().getInt(REST_THREAD_POOL_TASK_QUEUE_SIZE, -1);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    int idleTimeout = servlet.getConfiguration().getInt(REST_THREAD_POOL_THREAD_IDLE_TIMEOUT, 60000);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    QueuedThreadPool threadPool = queueSize &gt; 0 ?<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        new QueuedThreadPool(maxThreads, minThreads, idleTimeout, new ArrayBlockingQueue&lt;&gt;(queueSize)) :<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        new QueuedThreadPool(maxThreads, minThreads, idleTimeout);<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    Server server = new Server(threadPool);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    // Setup JMX<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    MBeanContainer mbContainer=new MBeanContainer(ManagementFactory.getPlatformMBeanServer());<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    server.addEventListener(mbContainer);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    server.addBean(mbContainer);<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    String host = servlet.getConfiguration().get("hbase.rest.host", "0.0.0.0");<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    int servicePort = servlet.getConfiguration().getInt("hbase.rest.port", 8080);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    HttpConfiguration httpConfig = new HttpConfiguration();<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    httpConfig.setSecureScheme("https");<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    httpConfig.setSecurePort(servicePort);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    httpConfig.setSendServerVersion(false);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    httpConfig.setSendDateHeader(false);<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>    ServerConnector serverConnector;<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    if (conf.getBoolean(REST_SSL_ENABLED, false)) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      httpsConfig.addCustomizer(new SecureRequestCustomizer());<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>      SslContextFactory sslCtxFactory = new SslContextFactory();<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      String keystore = conf.get(REST_SSL_KEYSTORE_STORE);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      String password = HBaseConfiguration.getPassword(conf,<a name="line.285"></a>
+<span class="sourceLineNo">286</span>          REST_SSL_KEYSTORE_PASSWORD, null);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      String keyPassword = HBaseConfiguration.getPassword(conf,<a name="line.287"></a>
+<span class="sourceLineNo">288</span>          REST_SSL_KEYSTORE_KEYPASSWORD, password);<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      sslCtxFactory.setKeyStorePath(keystore);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      sslCtxFactory.setKeyStorePassword(password);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      sslCtxFactory.setKeyManagerPassword(keyPassword);<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>      String[] excludeCiphers = servlet.getConfiguration().getStrings(<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          REST_SSL_EXCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      if (excludeCiphers.length != 0) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        sslCtxFactory.setExcludeCipherSuites(excludeCiphers);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      }<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      String[] includeCiphers = servlet.getConfiguration().getStrings(<a name="line.298"></a>
+<span class="sourceLineNo">299</span>          REST_SSL_INCLUDE_CIPHER_SUITES, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      if (includeCiphers.length != 0) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        sslCtxFactory.setIncludeCipherSuites(includeCiphers);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span>      String[] excludeProtocols = servlet.getConfiguration().getStrings(<a name="line.304"></a>
+<span class="sourceLineNo">305</span>          REST_SSL_EXCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      if (excludeProtocols.length != 0) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        sslCtxFactory.setExcludeProtocols(excludeProtocols);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      String[] includeProtocols = servlet.getConfiguration().getStrings(<a name="line.309"></a>
+<span class="sourceLineNo">310</span>          REST_SSL_INCLUDE_PROTOCOLS, ArrayUtils.EMPTY_STRING_ARRAY);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      if (includeProtocols.length != 0) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        sslCtxFactory.setIncludeProtocols(includeProtocols);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>      serverConnector = new ServerConnector(server,<a name="line.315"></a>
+<span class="sourceLineNo">316</span>          new SslConnectionFactory(sslCtxFactory, HttpVersion.HTTP_1_1.toString()),<a name="line.316"></a>
+<span class="sourceLineNo">317</span>          new HttpConnectionFactory(httpsConfig));<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    } else {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      serverConnector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>    int acceptQueueSize = servlet.getConfiguration().getInt(REST_CONNECTOR_ACCEPT_QUEUE_SIZE, -1);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    if (acceptQueueSize &gt;= 0) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      serverConnector.setAcceptQueueSize(acceptQueueSize);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>    serverConnector.setPort(servicePort);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    serverConnector.setHost(host);<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>    server.addConnector(serverConnector);<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    server.setStopAtShutdown(true);<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>    // set up context<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    ServletContextHandler ctxHandler = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    ctxHandler.addServlet(sh, PATH_SPEC_ANY);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    if (authFilter != null) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      ctxHandler.addFilter(authFilter, PATH_SPEC_ANY, EnumSet.of(DispatcherType.REQUEST));<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>    // Load filters from configuration.<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    String[] filterClasses = servlet.getConfiguration().getStrings(FILTER_CLASSES,<a name="line.341"></a>
+<span class="sourceLineNo">342</span>        GzipFilter.class.getName());<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    for (String filter : filterClasses) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      filter = filter.trim();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      ctxHandler.addFilter(filter, PATH_SPEC_ANY, EnumSet.of(DispatcherType.REQUEST));<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    }<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    addCSRFFilter(ctxHandler, conf);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    HttpServerUtil.constrainHttpMethods(ctxHandler, servlet.getConfiguration()<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        .getBoolean(REST_HTTP_ALLOW_OPTIONS_METHOD, REST_HTTP_ALLOW_OPTIONS_METHOD_DEFAULT));<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>    // Put up info server.<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    int port = conf.getInt("hbase.rest.info.port", 8085);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    if (port &gt;= 0) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      conf.setLong("startcode", System.currentTimeMillis());<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      String a = conf.get("hbase.rest.info.bindAddress", "0.0.0.0");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      InfoServer infoServer = new InfoServer("rest", a, port, false, conf);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      infoServer.setAttribute("hbase.conf", conf);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      infoServer.start();<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    try {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      // start server<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      server.start();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      server.join();<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    } catch (Exception e) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>      LOG.error(HBaseMarkers.FATAL, "Failed to start server", e);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      System.exit(1);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    LOG.info("***** STOPPING service '" + RESTServer.class.getSimpleName() + "' *****");<a name="line.368"></a>
+<span class="sourceLineNo">369</span>  }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>}<a name="line.370"></a>