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/03/16 14:53:50 UTC
[10/51] [partial] hbase-site git commit: Published site at
22f4def942f8a3367d0ca6598317e9b9a7d0cfcd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/replication/TableReplicationStorageBase.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/TableReplicationStorageBase.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/TableReplicationStorageBase.html
index ab343c1..9bafd71 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/TableReplicationStorageBase.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/TableReplicationStorageBase.html
@@ -90,32 +90,32 @@
<span class="sourceLineNo">082</span> conf.getInt(HConstants.HBASE_META_BLOCK_SIZE, HConstants.DEFAULT_HBASE_META_BLOCK_SIZE);<a name="line.82"></a>
<span class="sourceLineNo">083</span> return TableDescriptorBuilder<a name="line.83"></a>
<span class="sourceLineNo">084</span> .newBuilder(REPLICATION_TABLE)<a name="line.84"></a>
-<span class="sourceLineNo">085</span> .addColumnFamily(<a name="line.85"></a>
+<span class="sourceLineNo">085</span> .setColumnFamily(<a name="line.85"></a>
<span class="sourceLineNo">086</span> ColumnFamilyDescriptorBuilder.newBuilder(FAMILY_PEER).setMaxVersions(metaMaxVersion)<a name="line.86"></a>
<span class="sourceLineNo">087</span> .setInMemory(true).setBlocksize(metaBlockSize)<a name="line.87"></a>
<span class="sourceLineNo">088</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL).setBloomFilterType(BloomType.NONE)<a name="line.88"></a>
<span class="sourceLineNo">089</span> .build())<a name="line.89"></a>
-<span class="sourceLineNo">090</span> .addColumnFamily(<a name="line.90"></a>
+<span class="sourceLineNo">090</span> .setColumnFamily(<a name="line.90"></a>
<span class="sourceLineNo">091</span> ColumnFamilyDescriptorBuilder.newBuilder(FAMILY_RS_STATE).setMaxVersions(metaMaxVersion)<a name="line.91"></a>
<span class="sourceLineNo">092</span> .setInMemory(true).setBlocksize(metaBlockSize)<a name="line.92"></a>
<span class="sourceLineNo">093</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL).setBloomFilterType(BloomType.NONE)<a name="line.93"></a>
<span class="sourceLineNo">094</span> .build())<a name="line.94"></a>
-<span class="sourceLineNo">095</span> .addColumnFamily(<a name="line.95"></a>
+<span class="sourceLineNo">095</span> .setColumnFamily(<a name="line.95"></a>
<span class="sourceLineNo">096</span> ColumnFamilyDescriptorBuilder.newBuilder(FAMILY_QUEUE).setMaxVersions(metaMaxVersion)<a name="line.96"></a>
<span class="sourceLineNo">097</span> .setInMemory(true).setBlocksize(metaBlockSize)<a name="line.97"></a>
<span class="sourceLineNo">098</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL).setBloomFilterType(BloomType.NONE)<a name="line.98"></a>
<span class="sourceLineNo">099</span> .build())<a name="line.99"></a>
-<span class="sourceLineNo">100</span> .addColumnFamily(<a name="line.100"></a>
+<span class="sourceLineNo">100</span> .setColumnFamily(<a name="line.100"></a>
<span class="sourceLineNo">101</span> ColumnFamilyDescriptorBuilder.newBuilder(FAMILY_WAL)<a name="line.101"></a>
<span class="sourceLineNo">102</span> .setMaxVersions(HConstants.ALL_VERSIONS).setInMemory(true)<a name="line.102"></a>
<span class="sourceLineNo">103</span> .setBlocksize(metaBlockSize).setScope(HConstants.REPLICATION_SCOPE_LOCAL)<a name="line.103"></a>
<span class="sourceLineNo">104</span> .setBloomFilterType(BloomType.NONE).build())<a name="line.104"></a>
-<span class="sourceLineNo">105</span> .addColumnFamily(<a name="line.105"></a>
+<span class="sourceLineNo">105</span> .setColumnFamily(<a name="line.105"></a>
<span class="sourceLineNo">106</span> ColumnFamilyDescriptorBuilder.newBuilder(FAMILY_REGIONS).setMaxVersions(metaMaxVersion)<a name="line.106"></a>
<span class="sourceLineNo">107</span> .setInMemory(true).setBlocksize(metaBlockSize)<a name="line.107"></a>
<span class="sourceLineNo">108</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL).setBloomFilterType(BloomType.NONE)<a name="line.108"></a>
<span class="sourceLineNo">109</span> .build())<a name="line.109"></a>
-<span class="sourceLineNo">110</span> .addColumnFamily(<a name="line.110"></a>
+<span class="sourceLineNo">110</span> .setColumnFamily(<a name="line.110"></a>
<span class="sourceLineNo">111</span> ColumnFamilyDescriptorBuilder.newBuilder(FAMILY_HFILE_REFS)<a name="line.111"></a>
<span class="sourceLineNo">112</span> .setMaxVersions(metaMaxVersion).setInMemory(true).setBlocksize(metaBlockSize)<a name="line.112"></a>
<span class="sourceLineNo">113</span> .setScope(HConstants.REPLICATION_SCOPE_LOCAL).setBloomFilterType(BloomType.NONE)<a name="line.113"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.OpType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.OpType.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.OpType.html
index eeb8705..ea9558d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.OpType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.OpType.html
@@ -1136,7 +1136,7 @@
<span class="sourceLineNo">1128</span> setScope(HConstants.REPLICATION_SCOPE_LOCAL).build();<a name="line.1128"></a>
<span class="sourceLineNo">1129</span> TableDescriptor td =<a name="line.1129"></a>
<span class="sourceLineNo">1130</span> TableDescriptorBuilder.newBuilder(AccessControlLists.ACL_TABLE_NAME).<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span> addColumnFamily(cfd).build();<a name="line.1131"></a>
+<span class="sourceLineNo">1131</span> setColumnFamily(cfd).build();<a name="line.1131"></a>
<span class="sourceLineNo">1132</span> admin.createTable(td);<a name="line.1132"></a>
<span class="sourceLineNo">1133</span> }<a name="line.1133"></a>
<span class="sourceLineNo">1134</span><a name="line.1134"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.html
index eeb8705..ea9558d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/AccessController.html
@@ -1136,7 +1136,7 @@
<span class="sourceLineNo">1128</span> setScope(HConstants.REPLICATION_SCOPE_LOCAL).build();<a name="line.1128"></a>
<span class="sourceLineNo">1129</span> TableDescriptor td =<a name="line.1129"></a>
<span class="sourceLineNo">1130</span> TableDescriptorBuilder.newBuilder(AccessControlLists.ACL_TABLE_NAME).<a name="line.1130"></a>
-<span class="sourceLineNo">1131</span> addColumnFamily(cfd).build();<a name="line.1131"></a>
+<span class="sourceLineNo">1131</span> setColumnFamily(cfd).build();<a name="line.1131"></a>
<span class="sourceLineNo">1132</span> admin.createTable(td);<a name="line.1132"></a>
<span class="sourceLineNo">1133</span> }<a name="line.1133"></a>
<span class="sourceLineNo">1134</span><a name="line.1134"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.html
index f590daa..0801a89 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/access/CoprocessorWhitelistMasterObserver.html
@@ -29,183 +29,145 @@
<span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import java.util.Collection;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.util.Optional;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.regex.Matcher;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.commons.io.FilenameUtils;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.Path;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.HConstants;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.coprocessor.MasterObserver;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.slf4j.Logger;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.slf4j.LoggerFactory;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Master observer for restricting coprocessor assignments.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.46"></a>
-<span class="sourceLineNo">047</span>public class CoprocessorWhitelistMasterObserver implements MasterCoprocessor, MasterObserver {<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span> public static final String CP_COPROCESSOR_WHITELIST_PATHS_KEY =<a name="line.49"></a>
-<span class="sourceLineNo">050</span> "hbase.coprocessor.region.whitelist.paths";<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> private static final Logger LOG = LoggerFactory<a name="line.52"></a>
-<span class="sourceLineNo">053</span> .getLogger(CoprocessorWhitelistMasterObserver.class);<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> @Override<a name="line.55"></a>
-<span class="sourceLineNo">056</span> public Optional<MasterObserver> getMasterObserver() {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> return Optional.of(this);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx,<a name="line.61"></a>
-<span class="sourceLineNo">062</span> TableName tableName, TableDescriptor htd) throws IOException {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> verifyCoprocessors(ctx, htd);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public void preCreateTable(ObserverContext<MasterCoprocessorEnvironment> ctx,<a name="line.67"></a>
-<span class="sourceLineNo">068</span> TableDescriptor htd, RegionInfo[] regions) throws IOException {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> verifyCoprocessors(ctx, htd);<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> /**<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * Validates a single whitelist path against the coprocessor path<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * @param coprocPath the path to the coprocessor including scheme<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @param wlPath can be:<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * 1) a "*" to wildcard all coprocessor paths<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * 2) a specific filesystem (e.g. hdfs://my-cluster/)<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * 3) a wildcard path to be evaluated by<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * {@link FilenameUtils#wildcardMatch(String, String)}<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * path can specify scheme or not (e.g.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * "file:///usr/hbase/coprocessors" or for all<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * filesystems "/usr/hbase/coprocessors")<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @return if the path was found under the wlPath<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @throws IOException if a failure occurs in getting the path file system<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private static boolean validatePath(Path coprocPath, Path wlPath,<a name="line.86"></a>
-<span class="sourceLineNo">087</span> Configuration conf) throws IOException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> // verify if all are allowed<a name="line.88"></a>
-<span class="sourceLineNo">089</span> if (wlPath.toString().equals("*")) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> return(true);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> // verify we are on the same filesystem if wlPath has a scheme<a name="line.93"></a>
-<span class="sourceLineNo">094</span> if (!wlPath.isAbsoluteAndSchemeAuthorityNull()) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> String wlPathScheme = wlPath.toUri().getScheme();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> String coprocPathScheme = coprocPath.toUri().getScheme();<a name="line.96"></a>
-<span class="sourceLineNo">097</span> String wlPathHost = wlPath.toUri().getHost();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> String coprocPathHost = coprocPath.toUri().getHost();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> if (wlPathScheme != null) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> wlPathScheme = wlPathScheme.toString().toLowerCase();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> } else {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> wlPathScheme = "";<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span> if (wlPathHost != null) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> wlPathHost = wlPathHost.toString().toLowerCase();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> } else {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> wlPathHost = "";<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (coprocPathScheme != null) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> coprocPathScheme = coprocPathScheme.toString().toLowerCase();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> } else {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> coprocPathScheme = "";<a name="line.112"></a>
-<span class="sourceLineNo">113</span> }<a name="line.113"></a>
-<span class="sourceLineNo">114</span> if (coprocPathHost != null) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> coprocPathHost = coprocPathHost.toString().toLowerCase();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> } else {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> coprocPathHost = "";<a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span> if (!wlPathScheme.equals(coprocPathScheme) || !wlPathHost.equals(coprocPathHost)) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return(false);<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<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> // allow any on this file-system (file systems were verified to be the same above)<a name="line.124"></a>
-<span class="sourceLineNo">125</span> if (wlPath.isRoot()) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return(true);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> // allow "loose" matches stripping scheme<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (FilenameUtils.wildcardMatch(<a name="line.130"></a>
-<span class="sourceLineNo">131</span> Path.getPathWithoutSchemeAndAuthority(coprocPath).toString(),<a name="line.131"></a>
-<span class="sourceLineNo">132</span> Path.getPathWithoutSchemeAndAuthority(wlPath).toString())) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> return(true);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return(false);<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> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * Perform the validation checks for a coprocessor to determine if the path<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * is white listed or not.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @throws IOException if path is not included in whitelist or a failure<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * occurs in processing<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * @param ctx as passed in from the coprocessor<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * @param htd as passed in from the coprocessor<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> private void verifyCoprocessors(ObserverContext<MasterCoprocessorEnvironment> ctx,<a name="line.146"></a>
-<span class="sourceLineNo">147</span> TableDescriptor htd) throws IOException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> Configuration conf = ctx.getEnvironment().getConfiguration();<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> Collection<String> paths =<a name="line.151"></a>
-<span class="sourceLineNo">152</span> conf.getStringCollection(<a name="line.152"></a>
-<span class="sourceLineNo">153</span> CP_COPROCESSOR_WHITELIST_PATHS_KEY);<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> Collection<String> coprocs = htd.getCoprocessors();<a name="line.155"></a>
-<span class="sourceLineNo">156</span> for (int i = 0; i < coprocs.size(); i++) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> String coprocSpec = Bytes.toString(htd.getValue(<a name="line.158"></a>
-<span class="sourceLineNo">159</span> Bytes.toBytes("coprocessor$" + (i + 1))));<a name="line.159"></a>
-<span class="sourceLineNo">160</span> if (coprocSpec == null) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> continue;<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> // File path is the 1st field of the coprocessor spec<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Matcher matcher =<a name="line.165"></a>
-<span class="sourceLineNo">166</span> HConstants.CP_HTD_ATTR_VALUE_PATTERN.matcher(coprocSpec);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (matcher == null || !matcher.matches()) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> continue;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> String coprocPathStr = matcher.group(1).trim();<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // Check if coprocessor is being loaded via the classpath (i.e. no file path)<a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (coprocPathStr.equals("")) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> break;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> Path coprocPath = new Path(coprocPathStr);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> String coprocessorClass = matcher.group(2).trim();<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> boolean foundPathMatch = false;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> for (String pathStr : paths) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> Path wlPath = new Path(pathStr);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> try {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> foundPathMatch = validatePath(coprocPath, wlPath, conf);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (foundPathMatch == true) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> LOG.debug(String.format("Coprocessor %s found in directory %s",<a name="line.185"></a>
-<span class="sourceLineNo">186</span> coprocessorClass, pathStr));<a name="line.186"></a>
-<span class="sourceLineNo">187</span> break;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span> } catch (IOException e) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> LOG.warn(String.format("Failed to validate white list path %s for coprocessor path %s",<a name="line.190"></a>
-<span class="sourceLineNo">191</span> pathStr, coprocPathStr));<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (!foundPathMatch) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> throw new IOException(String.format("Loading %s DENIED in %s",<a name="line.195"></a>
-<span class="sourceLineNo">196</span> coprocessorClass, CP_COPROCESSOR_WHITELIST_PATHS_KEY));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>}<a name="line.200"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.io.FilenameUtils;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.fs.Path;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.CoprocessorDescriptor;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.coprocessor.MasterObserver;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.coprocessor.ObserverContext;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Master observer for restricting coprocessor assignments.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)<a name="line.42"></a>
+<span class="sourceLineNo">043</span>public class CoprocessorWhitelistMasterObserver implements MasterCoprocessor, MasterObserver {<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> public static final String CP_COPROCESSOR_WHITELIST_PATHS_KEY =<a name="line.45"></a>
+<span class="sourceLineNo">046</span> "hbase.coprocessor.region.whitelist.paths";<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory<a name="line.48"></a>
+<span class="sourceLineNo">049</span> .getLogger(CoprocessorWhitelistMasterObserver.class);<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span> @Override<a name="line.51"></a>
+<span class="sourceLineNo">052</span> public Optional<MasterObserver> getMasterObserver() {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> return Optional.of(this);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> }<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> @Override<a name="line.56"></a>
+<span class="sourceLineNo">057</span> public void preModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx,<a name="line.57"></a>
+<span class="sourceLineNo">058</span> TableName tableName, TableDescriptor htd) throws IOException {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> verifyCoprocessors(ctx, htd);<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> @Override<a name="line.62"></a>
+<span class="sourceLineNo">063</span> public void preCreateTable(ObserverContext<MasterCoprocessorEnvironment> ctx,<a name="line.63"></a>
+<span class="sourceLineNo">064</span> TableDescriptor htd, RegionInfo[] regions) throws IOException {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> verifyCoprocessors(ctx, htd);<a name="line.65"></a>
+<span class="sourceLineNo">066</span> }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * Validates a single whitelist path against the coprocessor path<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * @param coprocPath the path to the coprocessor including scheme<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @param wlPath can be:<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * 1) a "*" to wildcard all coprocessor paths<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * 2) a specific filesystem (e.g. hdfs://my-cluster/)<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * 3) a wildcard path to be evaluated by<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * {@link FilenameUtils#wildcardMatch(String, String)}<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * path can specify scheme or not (e.g.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * "file:///usr/hbase/coprocessors" or for all<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * filesystems "/usr/hbase/coprocessors")<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @return if the path was found under the wlPath<a name="line.79"></a>
+<span class="sourceLineNo">080</span> */<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static boolean validatePath(Path coprocPath, Path wlPath) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> // verify if all are allowed<a name="line.82"></a>
+<span class="sourceLineNo">083</span> if (wlPath.toString().equals("*")) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> return(true);<a name="line.84"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> // verify we are on the same filesystem if wlPath has a scheme<a name="line.87"></a>
+<span class="sourceLineNo">088</span> if (!wlPath.isAbsoluteAndSchemeAuthorityNull()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> String wlPathScheme = wlPath.toUri().getScheme();<a name="line.89"></a>
+<span class="sourceLineNo">090</span> String coprocPathScheme = coprocPath.toUri().getScheme();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> String wlPathHost = wlPath.toUri().getHost();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> String coprocPathHost = coprocPath.toUri().getHost();<a name="line.92"></a>
+<span class="sourceLineNo">093</span> if (wlPathScheme != null) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> wlPathScheme = wlPathScheme.toString().toLowerCase();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> } else {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> wlPathScheme = "";<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span> if (wlPathHost != null) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> wlPathHost = wlPathHost.toString().toLowerCase();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> } else {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> wlPathHost = "";<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (coprocPathScheme != null) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> coprocPathScheme = coprocPathScheme.toString().toLowerCase();<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } else {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> coprocPathScheme = "";<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> if (coprocPathHost != null) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> coprocPathHost = coprocPathHost.toString().toLowerCase();<a name="line.109"></a>
+<span class="sourceLineNo">110</span> } else {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> coprocPathHost = "";<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (!wlPathScheme.equals(coprocPathScheme) || !wlPathHost.equals(coprocPathHost)) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return(false);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> // allow any on this file-system (file systems were verified to be the same above)<a name="line.118"></a>
+<span class="sourceLineNo">119</span> if (wlPath.isRoot()) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> return(true);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> // allow "loose" matches stripping scheme<a name="line.123"></a>
+<span class="sourceLineNo">124</span> if (FilenameUtils.wildcardMatch(<a name="line.124"></a>
+<span class="sourceLineNo">125</span> Path.getPathWithoutSchemeAndAuthority(coprocPath).toString(),<a name="line.125"></a>
+<span class="sourceLineNo">126</span> Path.getPathWithoutSchemeAndAuthority(wlPath).toString())) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> return(true);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> return(false);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Perform the validation checks for a coprocessor to determine if the path<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * is white listed or not.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * @throws IOException if path is not included in whitelist or a failure<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * occurs in processing<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @param ctx as passed in from the coprocessor<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @param htd as passed in from the coprocessor<a name="line.138"></a>
+<span class="sourceLineNo">139</span> */<a name="line.139"></a>
+<span class="sourceLineNo">140</span> private static void verifyCoprocessors(ObserverContext<MasterCoprocessorEnvironment> ctx,<a name="line.140"></a>
+<span class="sourceLineNo">141</span> TableDescriptor htd) throws IOException {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> Collection<String> paths =<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ctx.getEnvironment().getConfiguration().getStringCollection(<a name="line.143"></a>
+<span class="sourceLineNo">144</span> CP_COPROCESSOR_WHITELIST_PATHS_KEY);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> for (CoprocessorDescriptor cp : htd.getCoprocessorDescriptors()) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> if (cp.getJarPath().isPresent()) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> if (paths.stream().noneMatch(p -> {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Path wlPath = new Path(p);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> if (validatePath(new Path(cp.getJarPath().get()), wlPath)) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> LOG.debug(String.format("Coprocessor %s found in directory %s",<a name="line.150"></a>
+<span class="sourceLineNo">151</span> cp.getClassName(), p));<a name="line.151"></a>
+<span class="sourceLineNo">152</span> return true;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return false;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> })) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> throw new IOException(String.format("Loading %s DENIED in %s",<a name="line.156"></a>
+<span class="sourceLineNo">157</span> cp.getClassName(), CP_COPROCESSOR_WHITELIST_PATHS_KEY));<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<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> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span>}<a name="line.162"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.BulkHFileVisitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.BulkHFileVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.BulkHFileVisitor.html
index 59ecd28..46ffa67 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.BulkHFileVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.BulkHFileVisitor.html
@@ -881,7 +881,7 @@
<span class="sourceLineNo">873</span> byte[][] keys = inferBoundaries(map);<a name="line.873"></a>
<span class="sourceLineNo">874</span> TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.874"></a>
<span class="sourceLineNo">875</span> familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.875"></a>
-<span class="sourceLineNo">876</span> .forEachOrdered(tdBuilder::addColumnFamily);<a name="line.876"></a>
+<span class="sourceLineNo">876</span> .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.876"></a>
<span class="sourceLineNo">877</span> admin.createTable(tdBuilder.build(), keys);<a name="line.877"></a>
<span class="sourceLineNo">878</span><a name="line.878"></a>
<span class="sourceLineNo">879</span> LOG.info("Table " + tableName + " is available!!");<a name="line.879"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.LoadQueueItem.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.LoadQueueItem.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.LoadQueueItem.html
index 59ecd28..46ffa67 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.LoadQueueItem.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.LoadQueueItem.html
@@ -881,7 +881,7 @@
<span class="sourceLineNo">873</span> byte[][] keys = inferBoundaries(map);<a name="line.873"></a>
<span class="sourceLineNo">874</span> TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.874"></a>
<span class="sourceLineNo">875</span> familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.875"></a>
-<span class="sourceLineNo">876</span> .forEachOrdered(tdBuilder::addColumnFamily);<a name="line.876"></a>
+<span class="sourceLineNo">876</span> .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.876"></a>
<span class="sourceLineNo">877</span> admin.createTable(tdBuilder.build(), keys);<a name="line.877"></a>
<span class="sourceLineNo">878</span><a name="line.878"></a>
<span class="sourceLineNo">879</span> LOG.info("Table " + tableName + " is available!!");<a name="line.879"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8b1eaec1/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.html
index 59ecd28..46ffa67 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.html
@@ -881,7 +881,7 @@
<span class="sourceLineNo">873</span> byte[][] keys = inferBoundaries(map);<a name="line.873"></a>
<span class="sourceLineNo">874</span> TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.874"></a>
<span class="sourceLineNo">875</span> familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.875"></a>
-<span class="sourceLineNo">876</span> .forEachOrdered(tdBuilder::addColumnFamily);<a name="line.876"></a>
+<span class="sourceLineNo">876</span> .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.876"></a>
<span class="sourceLineNo">877</span> admin.createTable(tdBuilder.build(), keys);<a name="line.877"></a>
<span class="sourceLineNo">878</span><a name="line.878"></a>
<span class="sourceLineNo">879</span> LOG.info("Table " + tableName + " is available!!");<a name="line.879"></a>