You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/12/07 18:24:34 UTC
[28/52] [partial] hbase-site git commit: Published site at
61220e4d7c8d7e5fb8ed3bbe2469bc86632c48de.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d9f3c819/apidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html b/apidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
index 441f8dd..f02acf8 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
@@ -35,295 +35,293 @@
<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.hbase.classification.InterfaceAudience;<a name="line.28"></a>
<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.util.HeapMemorySizeUtil;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.util.VersionInfo;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.zookeeper.ZKConfig;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Adds HBase configuration files to a Configuration<a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@InterfaceAudience.Public<a name="line.37"></a>
-<span class="sourceLineNo">038</span>@InterfaceStability.Stable<a name="line.38"></a>
-<span class="sourceLineNo">039</span>public class HBaseConfiguration extends Configuration {<a name="line.39"></a>
-<span class="sourceLineNo">040</span> private static final Log LOG = LogFactory.getLog(HBaseConfiguration.class);<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span> /**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Instantiating HBaseConfiguration() is deprecated. Please use<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * HBaseConfiguration#create() to construct a plain Configuration<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @deprecated Please use create() instead.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span> @Deprecated<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public HBaseConfiguration() {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> //TODO:replace with private constructor, HBaseConfiguration should not extend Configuration<a name="line.49"></a>
-<span class="sourceLineNo">050</span> super();<a name="line.50"></a>
-<span class="sourceLineNo">051</span> addHbaseResources(this);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> LOG.warn("instantiating HBaseConfiguration() is deprecated. Please use"<a name="line.52"></a>
-<span class="sourceLineNo">053</span> + " HBaseConfiguration#create() to construct a plain Configuration");<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> /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * Instantiating HBaseConfiguration() is deprecated. Please use<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * HBaseConfiguration#create(conf) to construct a plain Configuration<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * @deprecated Please user create(conf) instead.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Deprecated<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public HBaseConfiguration(final Configuration c) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> //TODO:replace with private constructor<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> merge(this, c);<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> private static void checkDefaultsVersion(Configuration conf) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (conf.getBoolean("hbase.defaults.for.version.skip", Boolean.FALSE)) return;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> String defaultsVersion = conf.get("hbase.defaults.for.version");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> String thisVersion = VersionInfo.getVersion();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> if (!thisVersion.equals(defaultsVersion)) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> throw new RuntimeException(<a name="line.73"></a>
-<span class="sourceLineNo">074</span> "hbase-default.xml file seems to be for an older version of HBase (" +<a name="line.74"></a>
-<span class="sourceLineNo">075</span> defaultsVersion + "), this version is " + thisVersion);<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> public static Configuration addHbaseResources(Configuration conf) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> conf.addResource("hbase-default.xml");<a name="line.80"></a>
-<span class="sourceLineNo">081</span> conf.addResource("hbase-site.xml");<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> checkDefaultsVersion(conf);<a name="line.83"></a>
-<span class="sourceLineNo">084</span> HeapMemorySizeUtil.checkForClusterFreeMemoryLimit(conf);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> return conf;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * Creates a Configuration with HBase resources<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @return a Configuration with HBase resources<a name="line.90"></a>
-<span class="sourceLineNo">091</span> */<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public static Configuration create() {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> Configuration conf = new Configuration();<a name="line.93"></a>
-<span class="sourceLineNo">094</span> // In case HBaseConfiguration is loaded from a different classloader than<a name="line.94"></a>
-<span class="sourceLineNo">095</span> // Configuration, conf needs to be set with appropriate class loader to resolve<a name="line.95"></a>
-<span class="sourceLineNo">096</span> // HBase resources.<a name="line.96"></a>
-<span class="sourceLineNo">097</span> conf.setClassLoader(HBaseConfiguration.class.getClassLoader());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return addHbaseResources(conf);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * @param that Configuration to clone.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @return a Configuration created with the hbase-*.xml files plus<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * the given configuration.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> */<a name="line.105"></a>
-<span class="sourceLineNo">106</span> public static Configuration create(final Configuration that) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> Configuration conf = create();<a name="line.107"></a>
-<span class="sourceLineNo">108</span> merge(conf, that);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return conf;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * Merge two configurations.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @param destConf the configuration that will be overwritten with items<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * from the srcConf<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * @param srcConf the source configuration<a name="line.116"></a>
-<span class="sourceLineNo">117</span> **/<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public static void merge(Configuration destConf, Configuration srcConf) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> for (Map.Entry<String, String> e : srcConf) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> destConf.set(e.getKey(), e.getValue());<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> /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * Returns a subset of the configuration properties, matching the given key prefix.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * The prefix is stripped from the return keys, ie. when calling with a prefix of "myprefix",<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * the entry "myprefix.key1 = value1" would be returned as "key1 = value1". If an entry's<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * key matches the prefix exactly ("myprefix = value2"), it will <strong>not</strong> be<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * included in the results, since it would show up as an entry with an empty key.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> */<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public static Configuration subset(Configuration srcConf, String prefix) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> Configuration newConf = new Configuration(false);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> for (Map.Entry<String, String> entry : srcConf) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (entry.getKey().startsWith(prefix)) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> String newKey = entry.getKey().substring(prefix.length());<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // avoid entries that would produce an empty key<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (!newKey.isEmpty()) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> newConf.set(newKey, entry.getValue());<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> return newConf;<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">145</span> /**<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * Sets all the entries in the provided {@code Map<String, String>} as properties in the<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * given {@code Configuration}. Each property will have the specified prefix prepended,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * so that the configuration entries are keyed by {@code prefix + entry.getKey()}.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> */<a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static void setWithPrefix(Configuration conf, String prefix,<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Iterable<Map.Entry<String, String>> properties) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> for (Map.Entry<String, String> entry : properties) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> conf.set(prefix + entry.getKey(), entry.getValue());<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>
-<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @return whether to show HBase Configuration in servlet<a name="line.158"></a>
-<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public static boolean isShowConfInServlet() {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> boolean isShowConf = false;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> try {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> if (Class.forName("org.apache.hadoop.conf.ConfServlet") != null) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> isShowConf = true;<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span> } catch (LinkageError e) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // should we handle it more aggressively in addition to log the error?<a name="line.167"></a>
-<span class="sourceLineNo">168</span> LOG.warn("Error thrown: ", e);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> } catch (ClassNotFoundException ce) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> LOG.debug("ClassNotFound: ConfServlet");<a name="line.170"></a>
-<span class="sourceLineNo">171</span> // ignore<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> return isShowConf;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> /**<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * Get the value of the <code>name</code> property as an <code>int</code>, possibly<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * referring to the deprecated name of the configuration property.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * If no such property exists, the provided default value is returned,<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * or if the specified value is not a valid <code>int</code>,<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * then an error is thrown.<a name="line.181"></a>
-<span class="sourceLineNo">182</span> *<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * @param name property name.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * @param deprecatedName a deprecatedName for the property to use<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * if non-deprecated name is not used<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @param defaultValue default value.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * @throws NumberFormatException when the value is invalid<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @return property value as an <code>int</code>,<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * or <code>defaultValue</code>.<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> // TODO: developer note: This duplicates the functionality of deprecated<a name="line.191"></a>
-<span class="sourceLineNo">192</span> // property support in Configuration in Hadoop 2. But since Hadoop-1 does not<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // contain these changes, we will do our own as usual. Replace these when H2 is default.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> public static int getInt(Configuration conf, String name,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> String deprecatedName, int defaultValue) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> if (conf.get(deprecatedName) != null) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> LOG.warn(String.format("Config option \"%s\" is deprecated. Instead, use \"%s\""<a name="line.197"></a>
-<span class="sourceLineNo">198</span> , deprecatedName, name));<a name="line.198"></a>
-<span class="sourceLineNo">199</span> return conf.getInt(deprecatedName, defaultValue);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> } else {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> return conf.getInt(name, defaultValue);<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> /**<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * Get the password from the Configuration instance using the<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * getPassword method if it exists. If not, then fall back to the<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * general get method for configuration elements.<a name="line.208"></a>
-<span class="sourceLineNo">209</span> *<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * @param conf configuration instance for accessing the passwords<a name="line.210"></a>
-<span class="sourceLineNo">211</span> * @param alias the name of the password element<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * @param defPass the default password<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * @return String password or default password<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @throws IOException<a name="line.214"></a>
-<span class="sourceLineNo">215</span> */<a name="line.215"></a>
-<span class="sourceLineNo">216</span> public static String getPassword(Configuration conf, String alias,<a name="line.216"></a>
-<span class="sourceLineNo">217</span> String defPass) throws IOException {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> String passwd = null;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> try {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> Method m = Configuration.class.getMethod("getPassword", String.class);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> char[] p = (char[]) m.invoke(conf, alias);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> if (p != null) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> LOG.debug(String.format("Config option \"%s\" was found through" +<a name="line.223"></a>
-<span class="sourceLineNo">224</span> " the Configuration getPassword method.", alias));<a name="line.224"></a>
-<span class="sourceLineNo">225</span> passwd = new String(p);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> } else {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.debug(String.format(<a name="line.227"></a>
-<span class="sourceLineNo">228</span> "Config option \"%s\" was not found. Using provided default value",<a name="line.228"></a>
-<span class="sourceLineNo">229</span> alias));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> passwd = defPass;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> } catch (NoSuchMethodException e) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> // this is a version of Hadoop where the credential<a name="line.233"></a>
-<span class="sourceLineNo">234</span> //provider API doesn't exist yet<a name="line.234"></a>
-<span class="sourceLineNo">235</span> LOG.debug(String.format(<a name="line.235"></a>
-<span class="sourceLineNo">236</span> "Credential.getPassword method is not available." +<a name="line.236"></a>
-<span class="sourceLineNo">237</span> " Falling back to configuration."));<a name="line.237"></a>
-<span class="sourceLineNo">238</span> passwd = conf.get(alias, defPass);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> } catch (SecurityException e) {<a name="line.239"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.util.VersionInfo;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.zookeeper.ZKConfig;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * Adds HBase configuration files to a Configuration<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>@InterfaceAudience.Public<a name="line.36"></a>
+<span class="sourceLineNo">037</span>@InterfaceStability.Stable<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public class HBaseConfiguration extends Configuration {<a name="line.38"></a>
+<span class="sourceLineNo">039</span> private static final Log LOG = LogFactory.getLog(HBaseConfiguration.class);<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Instantiating HBaseConfiguration() is deprecated. Please use<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * HBaseConfiguration#create() to construct a plain Configuration<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * @deprecated Please use create() instead.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span> @Deprecated<a name="line.46"></a>
+<span class="sourceLineNo">047</span> public HBaseConfiguration() {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> //TODO:replace with private constructor, HBaseConfiguration should not extend Configuration<a name="line.48"></a>
+<span class="sourceLineNo">049</span> super();<a name="line.49"></a>
+<span class="sourceLineNo">050</span> addHbaseResources(this);<a name="line.50"></a>
+<span class="sourceLineNo">051</span> LOG.warn("instantiating HBaseConfiguration() is deprecated. Please use"<a name="line.51"></a>
+<span class="sourceLineNo">052</span> + " HBaseConfiguration#create() to construct a plain Configuration");<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> /**<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * Instantiating HBaseConfiguration() is deprecated. Please use<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * HBaseConfiguration#create(conf) to construct a plain Configuration<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * @deprecated Please user create(conf) instead.<a name="line.58"></a>
+<span class="sourceLineNo">059</span> */<a name="line.59"></a>
+<span class="sourceLineNo">060</span> @Deprecated<a name="line.60"></a>
+<span class="sourceLineNo">061</span> public HBaseConfiguration(final Configuration c) {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> //TODO:replace with private constructor<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> merge(this, c);<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> private static void checkDefaultsVersion(Configuration conf) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> if (conf.getBoolean("hbase.defaults.for.version.skip", Boolean.FALSE)) return;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> String defaultsVersion = conf.get("hbase.defaults.for.version");<a name="line.69"></a>
+<span class="sourceLineNo">070</span> String thisVersion = VersionInfo.getVersion();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (!thisVersion.equals(defaultsVersion)) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> throw new RuntimeException(<a name="line.72"></a>
+<span class="sourceLineNo">073</span> "hbase-default.xml file seems to be for an older version of HBase (" +<a name="line.73"></a>
+<span class="sourceLineNo">074</span> defaultsVersion + "), this version is " + thisVersion);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> public static Configuration addHbaseResources(Configuration conf) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> conf.addResource("hbase-default.xml");<a name="line.79"></a>
+<span class="sourceLineNo">080</span> conf.addResource("hbase-site.xml");<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> checkDefaultsVersion(conf);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return conf;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> }<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> * Creates a Configuration with HBase resources<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * @return a Configuration with HBase resources<a name="line.88"></a>
+<span class="sourceLineNo">089</span> */<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public static Configuration create() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> Configuration conf = new Configuration();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // In case HBaseConfiguration is loaded from a different classloader than<a name="line.92"></a>
+<span class="sourceLineNo">093</span> // Configuration, conf needs to be set with appropriate class loader to resolve<a name="line.93"></a>
+<span class="sourceLineNo">094</span> // HBase resources.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> conf.setClassLoader(HBaseConfiguration.class.getClassLoader());<a name="line.95"></a>
+<span class="sourceLineNo">096</span> return addHbaseResources(conf);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * @param that Configuration to clone.<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @return a Configuration created with the hbase-*.xml files plus<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * the given configuration.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> */<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public static Configuration create(final Configuration that) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> Configuration conf = create();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> merge(conf, that);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> return conf;<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> * Merge two configurations.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @param destConf the configuration that will be overwritten with items<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * from the srcConf<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @param srcConf the source configuration<a name="line.114"></a>
+<span class="sourceLineNo">115</span> **/<a name="line.115"></a>
+<span class="sourceLineNo">116</span> public static void merge(Configuration destConf, Configuration srcConf) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> for (Map.Entry<String, String> e : srcConf) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> destConf.set(e.getKey(), e.getValue());<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<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> * Returns a subset of the configuration properties, matching the given key prefix.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * The prefix is stripped from the return keys, ie. when calling with a prefix of "myprefix",<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * the entry "myprefix.key1 = value1" would be returned as "key1 = value1". If an entry's<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * key matches the prefix exactly ("myprefix = value2"), it will <strong>not</strong> be<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * included in the results, since it would show up as an entry with an empty key.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static Configuration subset(Configuration srcConf, String prefix) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Configuration newConf = new Configuration(false);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> for (Map.Entry<String, String> entry : srcConf) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (entry.getKey().startsWith(prefix)) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> String newKey = entry.getKey().substring(prefix.length());<a name="line.133"></a>
+<span class="sourceLineNo">134</span> // avoid entries that would produce an empty key<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (!newKey.isEmpty()) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> newConf.set(newKey, entry.getValue());<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> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span> return newConf;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span> * Sets all the entries in the provided {@code Map<String, String>} as properties in the<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * given {@code Configuration}. Each property will have the specified prefix prepended,<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * so that the configuration entries are keyed by {@code prefix + entry.getKey()}.<a name="line.146"></a>
+<span class="sourceLineNo">147</span> */<a name="line.147"></a>
+<span class="sourceLineNo">148</span> public static void setWithPrefix(Configuration conf, String prefix,<a name="line.148"></a>
+<span class="sourceLineNo">149</span> Iterable<Map.Entry<String, String>> properties) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> for (Map.Entry<String, String> entry : properties) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> conf.set(prefix + entry.getKey(), entry.getValue());<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * @return whether to show HBase Configuration in servlet<a name="line.156"></a>
+<span class="sourceLineNo">157</span> */<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public static boolean isShowConfInServlet() {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> boolean isShowConf = false;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> try {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (Class.forName("org.apache.hadoop.conf.ConfServlet") != null) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> isShowConf = true;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span> } catch (LinkageError e) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> // should we handle it more aggressively in addition to log the error?<a name="line.165"></a>
+<span class="sourceLineNo">166</span> LOG.warn("Error thrown: ", e);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } catch (ClassNotFoundException ce) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> LOG.debug("ClassNotFound: ConfServlet");<a name="line.168"></a>
+<span class="sourceLineNo">169</span> // ignore<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return isShowConf;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Get the value of the <code>name</code> property as an <code>int</code>, possibly<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * referring to the deprecated name of the configuration property.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * If no such property exists, the provided default value is returned,<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * or if the specified value is not a valid <code>int</code>,<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * then an error is thrown.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> *<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * @param name property name.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * @param deprecatedName a deprecatedName for the property to use<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * if non-deprecated name is not used<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @param defaultValue default value.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * @throws NumberFormatException when the value is invalid<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * @return property value as an <code>int</code>,<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * or <code>defaultValue</code>.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> */<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // TODO: developer note: This duplicates the functionality of deprecated<a name="line.189"></a>
+<span class="sourceLineNo">190</span> // property support in Configuration in Hadoop 2. But since Hadoop-1 does not<a name="line.190"></a>
+<span class="sourceLineNo">191</span> // contain these changes, we will do our own as usual. Replace these when H2 is default.<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public static int getInt(Configuration conf, String name,<a name="line.192"></a>
+<span class="sourceLineNo">193</span> String deprecatedName, int defaultValue) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> if (conf.get(deprecatedName) != null) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> LOG.warn(String.format("Config option \"%s\" is deprecated. Instead, use \"%s\""<a name="line.195"></a>
+<span class="sourceLineNo">196</span> , deprecatedName, name));<a name="line.196"></a>
+<span class="sourceLineNo">197</span> return conf.getInt(deprecatedName, defaultValue);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> } else {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return conf.getInt(name, defaultValue);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> /**<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * Get the password from the Configuration instance using the<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * getPassword method if it exists. If not, then fall back to the<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * general get method for configuration elements.<a name="line.206"></a>
+<span class="sourceLineNo">207</span> *<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * @param conf configuration instance for accessing the passwords<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @param alias the name of the password element<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @param defPass the default password<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * @return String password or default password<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * @throws IOException<a name="line.212"></a>
+<span class="sourceLineNo">213</span> */<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public static String getPassword(Configuration conf, String alias,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> String defPass) throws IOException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> String passwd = null;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> try {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> Method m = Configuration.class.getMethod("getPassword", String.class);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> char[] p = (char[]) m.invoke(conf, alias);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (p != null) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.debug(String.format("Config option \"%s\" was found through" +<a name="line.221"></a>
+<span class="sourceLineNo">222</span> " the Configuration getPassword method.", alias));<a name="line.222"></a>
+<span class="sourceLineNo">223</span> passwd = new String(p);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> } else {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> LOG.debug(String.format(<a name="line.225"></a>
+<span class="sourceLineNo">226</span> "Config option \"%s\" was not found. Using provided default value",<a name="line.226"></a>
+<span class="sourceLineNo">227</span> alias));<a name="line.227"></a>
+<span class="sourceLineNo">228</span> passwd = defPass;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> } catch (NoSuchMethodException e) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> // this is a version of Hadoop where the credential<a name="line.231"></a>
+<span class="sourceLineNo">232</span> //provider API doesn't exist yet<a name="line.232"></a>
+<span class="sourceLineNo">233</span> LOG.debug(String.format(<a name="line.233"></a>
+<span class="sourceLineNo">234</span> "Credential.getPassword method is not available." +<a name="line.234"></a>
+<span class="sourceLineNo">235</span> " Falling back to configuration."));<a name="line.235"></a>
+<span class="sourceLineNo">236</span> passwd = conf.get(alias, defPass);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> } catch (SecurityException e) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> throw new IOException(e.getMessage(), e);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } catch (IllegalAccessException e) {<a name="line.239"></a>
<span class="sourceLineNo">240</span> throw new IOException(e.getMessage(), e);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> } catch (IllegalAccessException e) {<a name="line.241"></a>
+<span class="sourceLineNo">241</span> } catch (IllegalArgumentException e) {<a name="line.241"></a>
<span class="sourceLineNo">242</span> throw new IOException(e.getMessage(), e);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> } catch (IllegalArgumentException e) {<a name="line.243"></a>
+<span class="sourceLineNo">243</span> } catch (InvocationTargetException e) {<a name="line.243"></a>
<span class="sourceLineNo">244</span> throw new IOException(e.getMessage(), e);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> } catch (InvocationTargetException e) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> throw new IOException(e.getMessage(), e);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> return passwd;<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> /**<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * Generates a {@link Configuration} instance by applying the ZooKeeper cluster key<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * to the base Configuration. Note that additional configuration properties may be needed<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * for a remote cluster, so it is preferable to use<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * {@link #createClusterConf(Configuration, String, String)}.<a name="line.255"></a>
-<span class="sourceLineNo">256</span> *<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @param baseConf the base configuration to use, containing prefixed override properties<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * @param clusterKey the ZooKeeper quorum cluster key to apply, or {@code null} if none<a name="line.258"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return passwd;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<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> * Generates a {@link Configuration} instance by applying the ZooKeeper cluster key<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * to the base Configuration. Note that additional configuration properties may be needed<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * for a remote cluster, so it is preferable to use<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * {@link #createClusterConf(Configuration, String, String)}.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> *<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @param baseConf the base configuration to use, containing prefixed override properties<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * @param clusterKey the ZooKeeper quorum cluster key to apply, or {@code null} if none<a name="line.256"></a>
+<span class="sourceLineNo">257</span> *<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * @return the merged configuration with override properties and cluster key applied<a name="line.258"></a>
<span class="sourceLineNo">259</span> *<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * @return the merged configuration with override properties and cluster key applied<a name="line.260"></a>
-<span class="sourceLineNo">261</span> *<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * @see #createClusterConf(Configuration, String, String)<a name="line.262"></a>
-<span class="sourceLineNo">263</span> */<a name="line.263"></a>
-<span class="sourceLineNo">264</span> public static Configuration createClusterConf(Configuration baseConf, String clusterKey)<a name="line.264"></a>
-<span class="sourceLineNo">265</span> throws IOException {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> return createClusterConf(baseConf, clusterKey, null);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<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> * Generates a {@link Configuration} instance by applying property overrides prefixed by<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * a cluster profile key to the base Configuration. Override properties are extracted by<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * the {@link #subset(Configuration, String)} method, then the merged on top of the base<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * Configuration and returned.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> *<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * @param baseConf the base configuration to use, containing prefixed override properties<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * @param clusterKey the ZooKeeper quorum cluster key to apply, or {@code null} if none<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @param overridePrefix the property key prefix to match for override properties,<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * or {@code null} if none<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * @return the merged configuration with override properties and cluster key applied<a name="line.279"></a>
-<span class="sourceLineNo">280</span> */<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public static Configuration createClusterConf(Configuration baseConf, String clusterKey,<a name="line.281"></a>
-<span class="sourceLineNo">282</span> String overridePrefix) throws IOException {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> Configuration clusterConf = HBaseConfiguration.create(baseConf);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (clusterKey != null && !clusterKey.isEmpty()) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> applyClusterKeyToConf(clusterConf, clusterKey);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> if (overridePrefix != null && !overridePrefix.isEmpty()) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> Configuration clusterSubset = HBaseConfiguration.subset(clusterConf, overridePrefix);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> HBaseConfiguration.merge(clusterConf, clusterSubset);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return clusterConf;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> /**<a name="line.295"></a>
-<span class="sourceLineNo">296</span> * Apply the settings in the given key to the given configuration, this is<a name="line.296"></a>
-<span class="sourceLineNo">297</span> * used to communicate with distant clusters<a name="line.297"></a>
-<span class="sourceLineNo">298</span> * @param conf configuration object to configure<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * @param key string that contains the 3 required configuratins<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * @throws IOException<a name="line.300"></a>
-<span class="sourceLineNo">301</span> */<a name="line.301"></a>
-<span class="sourceLineNo">302</span> private static void applyClusterKeyToConf(Configuration conf, String key)<a name="line.302"></a>
-<span class="sourceLineNo">303</span> throws IOException{<a name="line.303"></a>
-<span class="sourceLineNo">304</span> ZKConfig.ZKClusterKey zkClusterKey = ZKConfig.transformClusterKey(key);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> conf.set(HConstants.ZOOKEEPER_QUORUM, zkClusterKey.getQuorumString());<a name="line.305"></a>
-<span class="sourceLineNo">306</span> conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, zkClusterKey.getClientPort());<a name="line.306"></a>
-<span class="sourceLineNo">307</span> conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, zkClusterKey.getZnodeParent());<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<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> * For debugging. Dump configurations to system output as xml format.<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * Master and RS configurations can also be dumped using<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * http services. e.g. "curl http://master:16010/dump"<a name="line.313"></a>
-<span class="sourceLineNo">314</span> */<a name="line.314"></a>
-<span class="sourceLineNo">315</span> public static void main(String[] args) throws Exception {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> HBaseConfiguration.create().writeXml(System.out);<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>}<a name="line.318"></a>
+<span class="sourceLineNo">260</span> * @see #createClusterConf(Configuration, String, String)<a name="line.260"></a>
+<span class="sourceLineNo">261</span> */<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public static Configuration createClusterConf(Configuration baseConf, String clusterKey)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> throws IOException {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> return createClusterConf(baseConf, clusterKey, null);<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> /**<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * Generates a {@link Configuration} instance by applying property overrides prefixed by<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * a cluster profile key to the base Configuration. Override properties are extracted by<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * the {@link #subset(Configuration, String)} method, then the merged on top of the base<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * Configuration and returned.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> *<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * @param baseConf the base configuration to use, containing prefixed override properties<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * @param clusterKey the ZooKeeper quorum cluster key to apply, or {@code null} if none<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @param overridePrefix the property key prefix to match for override properties,<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * or {@code null} if none<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * @return the merged configuration with override properties and cluster key applied<a name="line.277"></a>
+<span class="sourceLineNo">278</span> */<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public static Configuration createClusterConf(Configuration baseConf, String clusterKey,<a name="line.279"></a>
+<span class="sourceLineNo">280</span> String overridePrefix) throws IOException {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> Configuration clusterConf = HBaseConfiguration.create(baseConf);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> if (clusterKey != null && !clusterKey.isEmpty()) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> applyClusterKeyToConf(clusterConf, clusterKey);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> if (overridePrefix != null && !overridePrefix.isEmpty()) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Configuration clusterSubset = HBaseConfiguration.subset(clusterConf, overridePrefix);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> HBaseConfiguration.merge(clusterConf, clusterSubset);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span> return clusterConf;<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<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> * Apply the settings in the given key to the given configuration, this is<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * used to communicate with distant clusters<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * @param conf configuration object to configure<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * @param key string that contains the 3 required configuratins<a name="line.297"></a>
+<span class="sourceLineNo">298</span> * @throws IOException<a name="line.298"></a>
+<span class="sourceLineNo">299</span> */<a name="line.299"></a>
+<span class="sourceLineNo">300</span> private static void applyClusterKeyToConf(Configuration conf, String key)<a name="line.300"></a>
+<span class="sourceLineNo">301</span> throws IOException{<a name="line.301"></a>
+<span class="sourceLineNo">302</span> ZKConfig.ZKClusterKey zkClusterKey = ZKConfig.transformClusterKey(key);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> conf.set(HConstants.ZOOKEEPER_QUORUM, zkClusterKey.getQuorumString());<a name="line.303"></a>
+<span class="sourceLineNo">304</span> conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, zkClusterKey.getClientPort());<a name="line.304"></a>
+<span class="sourceLineNo">305</span> conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, zkClusterKey.getZnodeParent());<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<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> * For debugging. Dump configurations to system output as xml format.<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * Master and RS configurations can also be dumped using<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * http services. e.g. "curl http://master:16010/dump"<a name="line.311"></a>
+<span class="sourceLineNo">312</span> */<a name="line.312"></a>
+<span class="sourceLineNo">313</span> public static void main(String[] args) throws Exception {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> HBaseConfiguration.create().writeXml(System.out);<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d9f3c819/apidocs/src-html/org/apache/hadoop/hbase/HColumnDescriptor.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/HColumnDescriptor.html b/apidocs/src-html/org/apache/hadoop/hbase/HColumnDescriptor.html
index 0af2352..e02b252 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/HColumnDescriptor.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/HColumnDescriptor.html
@@ -1257,7 +1257,7 @@
<span class="sourceLineNo">1249</span> public HColumnDescriptor setDFSReplication(short replication) {<a name="line.1249"></a>
<span class="sourceLineNo">1250</span> if (replication < 1 && replication != DEFAULT_DFS_REPLICATION) {<a name="line.1250"></a>
<span class="sourceLineNo">1251</span> throw new IllegalArgumentException(<a name="line.1251"></a>
-<span class="sourceLineNo">1252</span> "DFS replication factor cannot be less than 1 if explictly set.");<a name="line.1252"></a>
+<span class="sourceLineNo">1252</span> "DFS replication factor cannot be less than 1 if explicitly set.");<a name="line.1252"></a>
<span class="sourceLineNo">1253</span> }<a name="line.1253"></a>
<span class="sourceLineNo">1254</span> setValue(DFS_REPLICATION, Short.toString(replication));<a name="line.1254"></a>
<span class="sourceLineNo">1255</span> return this;<a name="line.1255"></a>