Repository: hbase-site Updated Branches: refs/heads/asf-site 767291b81 -> a5e2ad1d5
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a5e2ad1d/testdevapidocs/src-html/org/apache/hadoop/hbase/IntegrationTestingUtility.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/IntegrationTestingUtility.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/IntegrationTestingUtility.html index 514b8b4..274c956 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/IntegrationTestingUtility.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/IntegrationTestingUtility.html @@ -139,17 +139,29 @@ <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> public void createDistributedHBaseCluster() throws IOException {<a name="line.133"></a> -<span class="sourceLineNo">134</span> Configuration conf = getConfiguration();<a name="line.134"></a> -<span class="sourceLineNo">135</span> conf.set("fs.defaultFS", conf.get("original.defaultFS"));<a name="line.135"></a> -<span class="sourceLineNo">136</span> Class<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,<a name="line.136"></a> -<span class="sourceLineNo">137</span> DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);<a name="line.137"></a> -<span class="sourceLineNo">138</span> ClusterManager clusterManager = ReflectionUtils.newInstance(<a name="line.138"></a> -<span class="sourceLineNo">139</span> clusterManagerClass, conf);<a name="line.139"></a> -<span class="sourceLineNo">140</span> setHBaseCluster(new DistributedHBaseCluster(conf, clusterManager));<a name="line.140"></a> -<span class="sourceLineNo">141</span> getAdmin();<a name="line.141"></a> -<span class="sourceLineNo">142</span> }<a name="line.142"></a> -<span class="sourceLineNo">143</span><a name="line.143"></a> -<span class="sourceLineNo">144</span>}<a name="line.144"></a> +<span class="sourceLineNo">134</span> //if it is a distributed HBase cluster, use the conf provided by classpath<a name="line.134"></a> +<span class="sourceLineNo">135</span> //to set hbase dir and fs.defaultFS.<a name="line.135"></a> +<span class="sourceLineNo">136</span> //Since when the super class HBaseTestingUtility initializing, it will<a name="line.136"></a> +<span class="sourceLineNo">137</span> //change hbase.rootdir to a local test dir.<a name="line.137"></a> +<span class="sourceLineNo">138</span> //we use "original.defaultFS" and "original.hbase.dir" to restore them.<a name="line.138"></a> +<span class="sourceLineNo">139</span> Configuration conf = getConfiguration();<a name="line.139"></a> +<span class="sourceLineNo">140</span> if (conf.get("original.defaultFS") != null) {<a name="line.140"></a> +<span class="sourceLineNo">141</span> conf.set("fs.defaultFS", conf.get("original.defaultFS"));<a name="line.141"></a> +<span class="sourceLineNo">142</span> }<a name="line.142"></a> +<span class="sourceLineNo">143</span> if (conf.get("original.hbase.dir") != null) {<a name="line.143"></a> +<span class="sourceLineNo">144</span> conf.set(HConstants.HBASE_DIR, conf.get("original.hbase.dir"));<a name="line.144"></a> +<span class="sourceLineNo">145</span> }<a name="line.145"></a> +<span class="sourceLineNo">146</span> LOG.debug("Setting {} to {} since it is a distributed cluster",<a name="line.146"></a> +<span class="sourceLineNo">147</span> HConstants.HBASE_DIR, conf.get(HConstants.HBASE_DIR));<a name="line.147"></a> +<span class="sourceLineNo">148</span> Class<? extends ClusterManager> clusterManagerClass = conf.getClass(HBASE_CLUSTER_MANAGER_CLASS,<a name="line.148"></a> +<span class="sourceLineNo">149</span> DEFAULT_HBASE_CLUSTER_MANAGER_CLASS, ClusterManager.class);<a name="line.149"></a> +<span class="sourceLineNo">150</span> ClusterManager clusterManager = ReflectionUtils.newInstance(<a name="line.150"></a> +<span class="sourceLineNo">151</span> clusterManagerClass, conf);<a name="line.151"></a> +<span class="sourceLineNo">152</span> setHBaseCluster(new DistributedHBaseCluster(conf, clusterManager));<a name="line.152"></a> +<span class="sourceLineNo">153</span> getAdmin();<a name="line.153"></a> +<span class="sourceLineNo">154</span> }<a name="line.154"></a> +<span class="sourceLineNo">155</span><a name="line.155"></a> +<span class="sourceLineNo">156</span>}<a name="line.156"></a>
