You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/11/26 05:30:04 UTC
[39/51] [partial] hbase git commit: Published site at
e73a9594c218ed969a2f5b0b356d7b8d0e1474c0.
http://git-wip-us.apache.org/repos/asf/hbase/blob/a986dfe6/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index c9515ab..920ba6b 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -233,31 +233,31 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/
<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.29">bcn</a></pre>
</li>
</ul>
-<a name="format">
+<a name="bcv">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>format</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.30">format</a></pre>
+<h4>bcv</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.30">bcv</a></pre>
</li>
</ul>
-<a name="bcv">
+<a name="filter">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>bcv</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">bcv</a></pre>
+<h4>filter</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">filter</a></pre>
</li>
</ul>
-<a name="filter">
+<a name="format">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>filter</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">filter</a></pre>
+<h4>format</h4>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">format</a></pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a986dfe6/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 5e18334..4dc47a8 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -458,12 +458,12 @@
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PrettyPrinter.Unit</span></a></li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">ChecksumType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PrettyPrinter.Unit</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a986dfe6/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 3500e78..41abfd2 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -148,9 +148,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALFactory.Providers</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.Version.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALKey.Version</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">RegionGroupingProvider.Strategies</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.Version.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALKey.Version</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALFactory.Providers</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a986dfe6/devapidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html b/devapidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
index 05d486a..6dc8b84 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/HBaseConfiguration.html
@@ -129,108 +129,129 @@
<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> * @return whether to show HBase Configuration in servlet<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public static boolean isShowConfInServlet() {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> boolean isShowConf = false;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> try {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (Class.forName("org.apache.hadoop.conf.ConfServlet") != null) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> isShowConf = true;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> } catch (LinkageError e) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // should we handle it more aggressively in addition to log the error?<a name="line.133"></a>
-<span class="sourceLineNo">134</span> LOG.warn("Error thrown: ", e);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> } catch (ClassNotFoundException ce) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> LOG.debug("ClassNotFound: ConfServlet");<a name="line.136"></a>
-<span class="sourceLineNo">137</span> // ignore<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> return isShowConf;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * Get the value of the <code>name</code> property as an <code>int</code>, possibly<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * referring to the deprecated name of the configuration property.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * If no such property exists, the provided default value is returned,<a name="line.145"></a>
-<span class="sourceLineNo">146</span> * or if the specified value is not a valid <code>int</code>,<a name="line.146"></a>
-<span class="sourceLineNo">147</span> * then an error is thrown.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> *<a name="line.148"></a>
-<span class="sourceLineNo">149</span> * @param name property name.<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @param deprecatedName a deprecatedName for the property to use<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * if non-deprecated name is not used<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param defaultValue default value.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @throws NumberFormatException when the value is invalid<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @return property value as an <code>int</code>,<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * or <code>defaultValue</code>.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // TODO: developer note: This duplicates the functionality of deprecated<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // property support in Configuration in Hadoop 2. But since Hadoop-1 does not<a name="line.158"></a>
-<span class="sourceLineNo">159</span> // contain these changes, we will do our own as usual. Replace these when H2 is default.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public static int getInt(Configuration conf, String name,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> String deprecatedName, int defaultValue) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> if (conf.get(deprecatedName) != null) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> LOG.warn(String.format("Config option \"%s\" is deprecated. Instead, use \"%s\""<a name="line.163"></a>
-<span class="sourceLineNo">164</span> , deprecatedName, name));<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return conf.getInt(deprecatedName, defaultValue);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> } else {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return conf.getInt(name, defaultValue);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<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> /**<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * Get the password from the Configuration instance using the<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * getPassword method if it exists. If not, then fall back to the<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * general get method for configuration elements.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> *<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * @param conf configuration instance for accessing the passwords<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * @param alias the name of the password element<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * @param defPass the default password<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @return String password or default password<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @throws IOException<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> public static String getPassword(Configuration conf, String alias,<a name="line.182"></a>
-<span class="sourceLineNo">183</span> String defPass) throws IOException {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> String passwd = null;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> try {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> Method m = Configuration.class.getMethod("getPassword", String.class);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> char[] p = (char[]) m.invoke(conf, alias);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> if (p != null) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> LOG.debug(String.format("Config option \"%s\" was found through" +<a name="line.189"></a>
-<span class="sourceLineNo">190</span> " the Configuration getPassword method.", alias));<a name="line.190"></a>
-<span class="sourceLineNo">191</span> passwd = new String(p);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> } else {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> LOG.debug(String.format(<a name="line.193"></a>
-<span class="sourceLineNo">194</span> "Config option \"%s\" was not found. Using provided default value",<a name="line.194"></a>
-<span class="sourceLineNo">195</span> alias));<a name="line.195"></a>
-<span class="sourceLineNo">196</span> passwd = defPass;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } catch (NoSuchMethodException e) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> // this is a version of Hadoop where the credential<a name="line.199"></a>
-<span class="sourceLineNo">200</span> //provider API doesn't exist yet<a name="line.200"></a>
-<span class="sourceLineNo">201</span> LOG.debug(String.format(<a name="line.201"></a>
-<span class="sourceLineNo">202</span> "Credential.getPassword method is not available." +<a name="line.202"></a>
-<span class="sourceLineNo">203</span> " Falling back to configuration."));<a name="line.203"></a>
-<span class="sourceLineNo">204</span> passwd = conf.get(alias, defPass);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> } catch (SecurityException e) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> throw new IOException(e.getMessage(), e);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> } catch (IllegalAccessException e) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> throw new IOException(e.getMessage(), e);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> } catch (IllegalArgumentException e) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> throw new IOException(e.getMessage(), e);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> } catch (InvocationTargetException e) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> throw new IOException(e.getMessage(), e);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return passwd;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> /**<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * For debugging. Dump configurations to system output as xml format.<a name="line.218"></a>
-<span class="sourceLineNo">219</span> * Master and RS configurations can also be dumped using<a name="line.219"></a>
-<span class="sourceLineNo">220</span> * http services. e.g. "curl http://master:16010/dump"<a name="line.220"></a>
-<span class="sourceLineNo">221</span> */<a name="line.221"></a>
-<span class="sourceLineNo">222</span> public static void main(String[] args) throws Exception {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> HBaseConfiguration.create().writeXml(System.out);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span>}<a name="line.225"></a>
+<span class="sourceLineNo">124</span> * Returns a subset of the configuration properties, matching the given key prefix.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * The prefix is stripped from the return keys, ie. when calling with a prefix of "myprefix",<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * the entry "myprefix.key1 = value1" would be returned as "key1 = value1". If an entry's<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * key matches the prefix exactly ("myprefix = value2"), it will <strong>not</strong> be<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * included in the results, since it would show up as an entry with an empty key.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public static Configuration subset(Configuration srcConf, String prefix) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> Configuration newConf = new Configuration(false);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> for (Entry<String, String> entry : srcConf) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (entry.getKey().startsWith(prefix)) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> String newKey = entry.getKey().substring(prefix.length());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> // avoid entries that would produce an empty key<a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (!newKey.isEmpty()) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> newConf.set(newKey, entry.getValue());<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> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return newConf;<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">145</span> * @return whether to show HBase Configuration in servlet<a name="line.145"></a>
+<span class="sourceLineNo">146</span> */<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static boolean isShowConfInServlet() {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> boolean isShowConf = false;<a name="line.148"></a>
+<span class="sourceLineNo">149</span> try {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> if (Class.forName("org.apache.hadoop.conf.ConfServlet") != null) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> isShowConf = true;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> } catch (LinkageError e) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> // should we handle it more aggressively in addition to log the error?<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.warn("Error thrown: ", e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> } catch (ClassNotFoundException ce) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> LOG.debug("ClassNotFound: ConfServlet");<a name="line.157"></a>
+<span class="sourceLineNo">158</span> // ignore<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> return isShowConf;<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>
+<span class="sourceLineNo">163</span> /**<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * Get the value of the <code>name</code> property as an <code>int</code>, possibly<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * referring to the deprecated name of the configuration property.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * If no such property exists, the provided default value is returned,<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * or if the specified value is not a valid <code>int</code>,<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * then an error is thrown.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> *<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * @param name property name.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @param deprecatedName a deprecatedName for the property to use<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * if non-deprecated name is not used<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @param defaultValue default value.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * @throws NumberFormatException when the value is invalid<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * @return property value as an <code>int</code>,<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * or <code>defaultValue</code>.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> // TODO: developer note: This duplicates the functionality of deprecated<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // property support in Configuration in Hadoop 2. But since Hadoop-1 does not<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // contain these changes, we will do our own as usual. Replace these when H2 is default.<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public static int getInt(Configuration conf, String name,<a name="line.181"></a>
+<span class="sourceLineNo">182</span> String deprecatedName, int defaultValue) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (conf.get(deprecatedName) != null) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> LOG.warn(String.format("Config option \"%s\" is deprecated. Instead, use \"%s\""<a name="line.184"></a>
+<span class="sourceLineNo">185</span> , deprecatedName, name));<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return conf.getInt(deprecatedName, defaultValue);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> } else {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return conf.getInt(name, defaultValue);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Get the password from the Configuration instance using the<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * getPassword method if it exists. If not, then fall back to the<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * general get method for configuration elements.<a name="line.195"></a>
+<span class="sourceLineNo">196</span> *<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * @param conf configuration instance for accessing the passwords<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @param alias the name of the password element<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @param defPass the default password<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * @return String password or default password<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * @throws IOException<a name="line.201"></a>
+<span class="sourceLineNo">202</span> */<a name="line.202"></a>
+<span class="sourceLineNo">203</span> public static String getPassword(Configuration conf, String alias,<a name="line.203"></a>
+<span class="sourceLineNo">204</span> String defPass) throws IOException {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> String passwd = null;<a name="line.205"></a>
+<span class="sourceLineNo">206</span> try {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> Method m = Configuration.class.getMethod("getPassword", String.class);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> char[] p = (char[]) m.invoke(conf, alias);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (p != null) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> LOG.debug(String.format("Config option \"%s\" was found through" +<a name="line.210"></a>
+<span class="sourceLineNo">211</span> " the Configuration getPassword method.", alias));<a name="line.211"></a>
+<span class="sourceLineNo">212</span> passwd = new String(p);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> } else {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> LOG.debug(String.format(<a name="line.214"></a>
+<span class="sourceLineNo">215</span> "Config option \"%s\" was not found. Using provided default value",<a name="line.215"></a>
+<span class="sourceLineNo">216</span> alias));<a name="line.216"></a>
+<span class="sourceLineNo">217</span> passwd = defPass;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> } catch (NoSuchMethodException e) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> // this is a version of Hadoop where the credential<a name="line.220"></a>
+<span class="sourceLineNo">221</span> //provider API doesn't exist yet<a name="line.221"></a>
+<span class="sourceLineNo">222</span> LOG.debug(String.format(<a name="line.222"></a>
+<span class="sourceLineNo">223</span> "Credential.getPassword method is not available." +<a name="line.223"></a>
+<span class="sourceLineNo">224</span> " Falling back to configuration."));<a name="line.224"></a>
+<span class="sourceLineNo">225</span> passwd = conf.get(alias, defPass);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> } catch (SecurityException e) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> throw new IOException(e.getMessage(), e);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> } catch (IllegalAccessException e) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> throw new IOException(e.getMessage(), e);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> } catch (IllegalArgumentException e) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> throw new IOException(e.getMessage(), e);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> } catch (InvocationTargetException e) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> throw new IOException(e.getMessage(), e);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return passwd;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * For debugging. Dump configurations to system output as xml format.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * Master and RS configurations can also be dumped using<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * http services. e.g. "curl http://master:16010/dump"<a name="line.241"></a>
+<span class="sourceLineNo">242</span> */<a name="line.242"></a>
+<span class="sourceLineNo">243</span> public static void main(String[] args) throws Exception {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> HBaseConfiguration.create().writeXml(System.out);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>}<a name="line.246"></a>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a986dfe6/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html b/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html
index 32998ff..bc2bc32 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ZNodeClearer.html
@@ -37,136 +37,181 @@
<span class="sourceLineNo">029</span>import org.apache.commons.logging.Log;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import org.apache.commons.logging.LogFactory;<a name="line.30"></a>
<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * <p>Contains a set of methods for the collaboration between the start/stop scripts and the<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * servers. It allows to delete immediately the znode when the master or the regions server crashes.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * The region server / master writes a specific file when it starts / becomes main master. When they<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * end properly, they delete the file.</p><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * <p>In the script, we check for the existence of these files when the program ends. If they still<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * exist we conclude that the server crashed, likely without deleting their znode. To have a faster<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * recovery we delete immediately the znode.</p><a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <p>The strategy depends on the server type. For a region server we store the znode path in the<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * file, and use it to delete it. for a master, as the znode path constant whatever the server, we<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * check its content to make sure that the backup server is not now in charge.</p><a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>public class ZNodeClearer {<a name="line.47"></a>
-<span class="sourceLineNo">048</span> private static final Log LOG = LogFactory.getLog(ZNodeClearer.class);<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> private ZNodeClearer() {}<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Logs the errors without failing on exception.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public static void writeMyEphemeralNodeOnDisk(String fileContent) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> String fileName = ZNodeClearer.getMyEphemeralNodeFileName();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> if (fileName == null) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> LOG.warn("Environment variable HBASE_ZNODE_FILE not set; znodes will not be cleared " +<a name="line.58"></a>
-<span class="sourceLineNo">059</span> "on crash by start scripts (Longer MTTR!)");<a name="line.59"></a>
-<span class="sourceLineNo">060</span> return;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> FileWriter fstream;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> try {<a name="line.64"></a>
-<span class="sourceLineNo">065</span> fstream = new FileWriter(fileName);<a name="line.65"></a>
-<span class="sourceLineNo">066</span> } catch (IOException e) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> LOG.warn("Can't write znode file "+fileName, e);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> BufferedWriter out = new BufferedWriter(fstream);<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> try {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> try {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> out.write(fileContent + "\n");<a name="line.75"></a>
-<span class="sourceLineNo">076</span> } finally {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> try {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> out.close();<a name="line.78"></a>
-<span class="sourceLineNo">079</span> } finally {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> fstream.close();<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> } catch (IOException e) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> LOG.warn("Can't write znode file "+fileName, e);<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><a name="line.87"></a>
-<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * read the content of znode file, expects a single line.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> */<a name="line.90"></a>
-<span class="sourceLineNo">091</span> public static String readMyEphemeralNodeOnDisk() throws IOException {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> String fileName = getMyEphemeralNodeFileName();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> if (fileName == null){<a name="line.93"></a>
-<span class="sourceLineNo">094</span> throw new FileNotFoundException("No filename; set environment variable HBASE_ZNODE_FILE");<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> FileReader znodeFile = new FileReader(fileName);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> BufferedReader br = null;<a name="line.97"></a>
-<span class="sourceLineNo">098</span> try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> br = new BufferedReader(znodeFile);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> String file_content = br.readLine();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> return file_content;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> } finally {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> if (br != null) br.close();<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * Get the name of the file used to store the znode contents<a name="line.108"></a>
-<span class="sourceLineNo">109</span> */<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public static String getMyEphemeralNodeFileName() {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return System.getenv().get("HBASE_ZNODE_FILE");<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * delete the znode file<a name="line.115"></a>
-<span class="sourceLineNo">116</span> */<a name="line.116"></a>
-<span class="sourceLineNo">117</span> public static void deleteMyEphemeralNodeOnDisk() {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> String fileName = getMyEphemeralNodeFileName();<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> if (fileName != null) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> new File(fileName).delete();<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> /**<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * Delete the master znode if its content (ServerName string) is the same<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * as the one in the znode file. (env: HBASE_ZNODE_FILE).<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @return true on successful deletion, false otherwise.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static boolean clear(Configuration conf) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> Configuration tempConf = new Configuration(conf);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> tempConf.setInt("zookeeper.recovery.retry", 0);<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> ZooKeeperWatcher zkw;<a name="line.134"></a>
-<span class="sourceLineNo">135</span> try {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> zkw = new ZooKeeperWatcher(tempConf, "clean znode for master",<a name="line.136"></a>
-<span class="sourceLineNo">137</span> new Abortable() {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> @Override public void abort(String why, Throwable e) {}<a name="line.138"></a>
-<span class="sourceLineNo">139</span> @Override public boolean isAborted() { return false; }<a name="line.139"></a>
-<span class="sourceLineNo">140</span> });<a name="line.140"></a>
-<span class="sourceLineNo">141</span> } catch (IOException e) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> LOG.warn("Can't connect to zookeeper to read the master znode", e);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> return false;<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> String znodeFileContent;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> try {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> znodeFileContent = ZNodeClearer.readMyEphemeralNodeOnDisk();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return MasterAddressTracker.deleteIfEquals(zkw, znodeFileContent);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } catch (FileNotFoundException fnfe) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> // If no file, just keep going -- return success.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> LOG.warn("Can't find the znode file; presume non-fatal", fnfe);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> return true;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> } catch (IOException e) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.warn("Can't read the content of the znode file", e);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return false;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> } finally {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> zkw.close();<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">032</span>import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.zookeeper.KeeperException;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * <p>Contains a set of methods for the collaboration between the start/stop scripts and the<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * servers. It allows to delete immediately the znode when the master or the regions server crashes.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * The region server / master writes a specific file when it starts / becomes main master. When they<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * end properly, they delete the file.</p><a name="line.42"></a>
+<span class="sourceLineNo">043</span> * <p>In the script, we check for the existence of these files when the program ends. If they still<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * exist we conclude that the server crashed, likely without deleting their znode. To have a faster<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * recovery we delete immediately the znode.</p><a name="line.45"></a>
+<span class="sourceLineNo">046</span> * <p>The strategy depends on the server type. For a region server we store the znode path in the<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * file, and use it to delete it. for a master, as the znode path constant whatever the server, we<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * check its content to make sure that the backup server is not now in charge.</p><a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public class ZNodeClearer {<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private static final Log LOG = LogFactory.getLog(ZNodeClearer.class);<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> private ZNodeClearer() {}<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> * Logs the errors without failing on exception.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> */<a name="line.57"></a>
+<span class="sourceLineNo">058</span> public static void writeMyEphemeralNodeOnDisk(String fileContent) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> String fileName = ZNodeClearer.getMyEphemeralNodeFileName();<a name="line.59"></a>
+<span class="sourceLineNo">060</span> if (fileName == null) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> LOG.warn("Environment variable HBASE_ZNODE_FILE not set; znodes will not be cleared " +<a name="line.61"></a>
+<span class="sourceLineNo">062</span> "on crash by start scripts (Longer MTTR!)");<a name="line.62"></a>
+<span class="sourceLineNo">063</span> return;<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> FileWriter fstream;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> try {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> fstream = new FileWriter(fileName);<a name="line.68"></a>
+<span class="sourceLineNo">069</span> } catch (IOException e) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> LOG.warn("Can't write znode file "+fileName, e);<a name="line.70"></a>
+<span class="sourceLineNo">071</span> return;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> BufferedWriter out = new BufferedWriter(fstream);<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> try {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> try {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> out.write(fileContent + "\n");<a name="line.78"></a>
+<span class="sourceLineNo">079</span> } finally {<a name="line.79"></a>
+<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> out.close();<a name="line.81"></a>
+<span class="sourceLineNo">082</span> } finally {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> fstream.close();<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> } catch (IOException e) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> LOG.warn("Can't write znode file "+fileName, e);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> /**<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * read the content of znode file, expects a single line.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public static String readMyEphemeralNodeOnDisk() throws IOException {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> String fileName = getMyEphemeralNodeFileName();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> if (fileName == null){<a name="line.96"></a>
+<span class="sourceLineNo">097</span> throw new FileNotFoundException("No filename; set environment variable HBASE_ZNODE_FILE");<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> FileReader znodeFile = new FileReader(fileName);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> BufferedReader br = null;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> try {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> br = new BufferedReader(znodeFile);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> String file_content = br.readLine();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> return file_content;<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } finally {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (br != null) br.close();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<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> * Get the name of the file used to store the znode contents<a name="line.111"></a>
+<span class="sourceLineNo">112</span> */<a name="line.112"></a>
+<span class="sourceLineNo">113</span> public static String getMyEphemeralNodeFileName() {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return System.getenv().get("HBASE_ZNODE_FILE");<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> * delete the znode file<a name="line.118"></a>
+<span class="sourceLineNo">119</span> */<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public static void deleteMyEphemeralNodeOnDisk() {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> String fileName = getMyEphemeralNodeFileName();<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> if (fileName != null) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> new File(fileName).delete();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span> <a name="line.127"></a>
+<span class="sourceLineNo">128</span> /**<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * See HBASE-14861. We are extracting master ServerName from rsZnodePath<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * example: "/hbase/rs/server.example.com,16020,1448266496481"<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @param rsZnodePath from HBASE_ZNODE_FILE<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * @return String representation of ServerName or null if fails<a name="line.132"></a>
+<span class="sourceLineNo">133</span> */<a name="line.133"></a>
+<span class="sourceLineNo">134</span> <a name="line.134"></a>
+<span class="sourceLineNo">135</span> public static String parseMasterServerName(String rsZnodePath) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> String masterServerName = null;<a name="line.136"></a>
+<span class="sourceLineNo">137</span> try {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> String[] rsZnodeParts = rsZnodePath.split("/");<a name="line.138"></a>
+<span class="sourceLineNo">139</span> masterServerName = rsZnodeParts[rsZnodeParts.length -1];<a name="line.139"></a>
+<span class="sourceLineNo">140</span> } catch (IndexOutOfBoundsException e) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> LOG.warn("String " + rsZnodePath + " has wrong fromat", e);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return masterServerName; <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> /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * <a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @return true if cluster is configured with master-rs collocation <a name="line.148"></a>
+<span class="sourceLineNo">149</span> */<a name="line.149"></a>
+<span class="sourceLineNo">150</span> private static boolean tablesOnMaster(Configuration conf) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> boolean tablesOnMaster = true;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> String confValue = conf.get(BaseLoadBalancer.TABLES_ON_MASTER);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> if (confValue != null && confValue.equalsIgnoreCase("none")) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> tablesOnMaster = false;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span> return tablesOnMaster;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<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> * Delete the master znode if its content (ServerName string) is the same<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * as the one in the znode file. (env: HBASE_ZNODE_FILE). I case of master-rs<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * colloaction we extract ServerName string from rsZnode path.(HBASE-14861)<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @return true on successful deletion, false otherwise.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> */<a name="line.164"></a>
+<span class="sourceLineNo">165</span> public static boolean clear(Configuration conf) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> Configuration tempConf = new Configuration(conf);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> tempConf.setInt("zookeeper.recovery.retry", 0);<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> ZooKeeperWatcher zkw;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> try {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> zkw = new ZooKeeperWatcher(tempConf, "clean znode for master",<a name="line.171"></a>
+<span class="sourceLineNo">172</span> new Abortable() {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> @Override public void abort(String why, Throwable e) {}<a name="line.173"></a>
+<span class="sourceLineNo">174</span> @Override public boolean isAborted() { return false; }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> });<a name="line.175"></a>
+<span class="sourceLineNo">176</span> } catch (IOException e) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> LOG.warn("Can't connect to zookeeper to read the master znode", e);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> return false;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> String znodeFileContent;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> try {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> znodeFileContent = ZNodeClearer.readMyEphemeralNodeOnDisk();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if(ZNodeClearer.tablesOnMaster(conf)) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> //In case of master crash also remove rsZnode since master is also regionserver <a name="line.185"></a>
+<span class="sourceLineNo">186</span> ZKUtil.deleteNodeFailSilent(zkw, znodeFileContent); <a name="line.186"></a>
+<span class="sourceLineNo">187</span> return MasterAddressTracker.deleteIfEquals(zkw, <a name="line.187"></a>
+<span class="sourceLineNo">188</span> ZNodeClearer.parseMasterServerName(znodeFileContent));<a name="line.188"></a>
+<span class="sourceLineNo">189</span> } else {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return MasterAddressTracker.deleteIfEquals(zkw, znodeFileContent);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> } catch (FileNotFoundException fnfe) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> // If no file, just keep going -- return success.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> LOG.warn("Can't find the znode file; presume non-fatal", fnfe);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> return true;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> } catch (IOException e) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> LOG.warn("Can't read the content of the znode file", e);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return false;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } catch (KeeperException e) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> LOG.warn("Zookeeper exception deleting znode", e);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return false;<a name="line.201"></a>
+<span class="sourceLineNo">202</span> } finally {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> zkw.close();<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>}<a name="line.206"></a>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a986dfe6/devapidocs/src-html/org/apache/hadoop/hbase/io/BoundedByteBufferPool.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/BoundedByteBufferPool.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/BoundedByteBufferPool.html
index 36ae76e..ab83264 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/BoundedByteBufferPool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/BoundedByteBufferPool.html
@@ -84,118 +84,122 @@
<span class="sourceLineNo">076</span> // queued buffers in any transition.<a name="line.76"></a>
<span class="sourceLineNo">077</span> private final AtomicLong stateRef = new AtomicLong();<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static int toCountOfBuffers(long state) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return (int)state;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> private static int toTotalCapacity(long state) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return (int)(state >>> 32);<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> private static long toState(int countOfBuffers, int totalCapacity) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return ((long)totalCapacity << 32) | totalCapacity;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> private static long subtractOneBufferFromState(long state, int capacity) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return state - ((long)capacity << 32) - 1;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> // For reporting, only used in the log<a name="line.95"></a>
-<span class="sourceLineNo">096</span> private final AtomicLong allocationsRef = new AtomicLong();<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> * @param maxByteBufferSizeToCache<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @param initialByteBufferSize<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @param maxToCache<a name="line.101"></a>
-<span class="sourceLineNo">102</span> */<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public BoundedByteBufferPool(final int maxByteBufferSizeToCache, final int initialByteBufferSize,<a name="line.103"></a>
-<span class="sourceLineNo">104</span> final int maxToCache) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> this.maxByteBufferSizeToCache = maxByteBufferSizeToCache;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> this.runningAverageRef = new AtomicInteger(initialByteBufferSize);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> this.maxToCache = maxToCache;<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> public ByteBuffer getBuffer() {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ByteBuffer bb = buffers.poll();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> if (bb != null) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> long state;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> while (true) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> long prevState = stateRef.get();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> state = subtractOneBufferFromState(prevState, bb.capacity());<a name="line.116"></a>
-<span class="sourceLineNo">117</span> if (stateRef.compareAndSet(prevState, state)) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> break;<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> // Clear sets limit == capacity. Postion == 0.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> bb.clear();<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> if (LOG.isTraceEnabled()) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> int countOfBuffers = toCountOfBuffers(state);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> int totalCapacity = toTotalCapacity(state);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> LOG.trace("totalCapacity=" + totalCapacity + ", count=" + countOfBuffers);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> return bb;<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> int runningAverage = runningAverageRef.get();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> bb = ByteBuffer.allocateDirect(runningAverage);<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (LOG.isTraceEnabled()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> long allocations = allocationsRef.incrementAndGet();<a name="line.136"></a>
-<span class="sourceLineNo">137</span> LOG.trace("runningAverage=" + runningAverage + ", alloctions=" + allocations);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span> return bb;<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> public void putBuffer(ByteBuffer bb) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> // If buffer is larger than we want to keep around, just let it go.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> if (bb.capacity() > maxByteBufferSizeToCache) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> return;<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> int countOfBuffers;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> int totalCapacity;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> while (true) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> long prevState = stateRef.get();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> countOfBuffers = toCountOfBuffers(prevState);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> if (countOfBuffers >= maxToCache) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> if (LOG.isWarnEnabled()) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.warn("At capacity: " + countOfBuffers);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span> return;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span> countOfBuffers++;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assert 0 < countOfBuffers && countOfBuffers <= maxToCache;<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> totalCapacity = toTotalCapacity(prevState) + bb.capacity();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> if (totalCapacity < 0) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (LOG.isWarnEnabled()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> LOG.warn("Overflowed total capacity.");<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> return;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> long state = toState(countOfBuffers, totalCapacity);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (stateRef.compareAndSet(prevState, state)) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> break;<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><a name="line.175"></a>
-<span class="sourceLineNo">176</span> // ConcurrentLinkQueue#offer says "this method will never return false"<a name="line.176"></a>
-<span class="sourceLineNo">177</span> buffers.offer(bb);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> int runningAverageUpdate = Math.min(<a name="line.179"></a>
-<span class="sourceLineNo">180</span> totalCapacity / countOfBuffers, // size will never be 0.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> maxByteBufferSizeToCache);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> while (true) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> int prev = runningAverageRef.get();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (prev >= runningAverageUpdate || // only rises, never recedes<a name="line.184"></a>
-<span class="sourceLineNo">185</span> runningAverageRef.compareAndSet(prev, runningAverageUpdate)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> break;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>}<a name="line.190"></a>
+<span class="sourceLineNo">079</span> @VisibleForTesting<a name="line.79"></a>
+<span class="sourceLineNo">080</span> static int toCountOfBuffers(long state) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return (int)state;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> @VisibleForTesting<a name="line.84"></a>
+<span class="sourceLineNo">085</span> static int toTotalCapacity(long state) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return (int)(state >>> 32);<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> @VisibleForTesting<a name="line.89"></a>
+<span class="sourceLineNo">090</span> static long toState(int countOfBuffers, int totalCapacity) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> return ((long)totalCapacity << 32) | countOfBuffers;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> @VisibleForTesting<a name="line.94"></a>
+<span class="sourceLineNo">095</span> static long subtractOneBufferFromState(long state, int capacity) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> return state - ((long)capacity << 32) - 1;<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> // For reporting, only used in the log<a name="line.99"></a>
+<span class="sourceLineNo">100</span> private final AtomicLong allocationsRef = new AtomicLong();<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * @param maxByteBufferSizeToCache<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @param initialByteBufferSize<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * @param maxToCache<a name="line.105"></a>
+<span class="sourceLineNo">106</span> */<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public BoundedByteBufferPool(final int maxByteBufferSizeToCache, final int initialByteBufferSize,<a name="line.107"></a>
+<span class="sourceLineNo">108</span> final int maxToCache) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> this.maxByteBufferSizeToCache = maxByteBufferSizeToCache;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> this.runningAverageRef = new AtomicInteger(initialByteBufferSize);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> this.maxToCache = maxToCache;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> public ByteBuffer getBuffer() {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> ByteBuffer bb = buffers.poll();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (bb != null) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> long state;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> while (true) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> long prevState = stateRef.get();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> state = subtractOneBufferFromState(prevState, bb.capacity());<a name="line.120"></a>
+<span class="sourceLineNo">121</span> if (stateRef.compareAndSet(prevState, state)) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> break;<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> // Clear sets limit == capacity. Postion == 0.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> bb.clear();<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> if (LOG.isTraceEnabled()) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> int countOfBuffers = toCountOfBuffers(state);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> int totalCapacity = toTotalCapacity(state);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> LOG.trace("totalCapacity=" + totalCapacity + ", count=" + countOfBuffers);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span> return bb;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> int runningAverage = runningAverageRef.get();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> bb = ByteBuffer.allocateDirect(runningAverage);<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (LOG.isTraceEnabled()) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> long allocations = allocationsRef.incrementAndGet();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> LOG.trace("runningAverage=" + runningAverage + ", alloctions=" + allocations);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return bb;<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> public void putBuffer(ByteBuffer bb) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> // If buffer is larger than we want to keep around, just let it go.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> if (bb.capacity() > maxByteBufferSizeToCache) {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> return;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> int countOfBuffers;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> int totalCapacity;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> while (true) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> long prevState = stateRef.get();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> countOfBuffers = toCountOfBuffers(prevState);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> if (countOfBuffers >= maxToCache) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> if (LOG.isWarnEnabled()) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> LOG.warn("At capacity: " + countOfBuffers);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span> return;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span> countOfBuffers++;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> assert 0 < countOfBuffers && countOfBuffers <= maxToCache;<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> totalCapacity = toTotalCapacity(prevState) + bb.capacity();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> if (totalCapacity < 0) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (LOG.isWarnEnabled()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> LOG.warn("Overflowed total capacity.");<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return;<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> long state = toState(countOfBuffers, totalCapacity);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (stateRef.compareAndSet(prevState, state)) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> break;<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> // ConcurrentLinkQueue#offer says "this method will never return false"<a name="line.180"></a>
+<span class="sourceLineNo">181</span> buffers.offer(bb);<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span> int runningAverageUpdate = Math.min(<a name="line.183"></a>
+<span class="sourceLineNo">184</span> totalCapacity / countOfBuffers, // size will never be 0.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> maxByteBufferSizeToCache);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> while (true) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> int prev = runningAverageRef.get();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (prev >= runningAverageUpdate || // only rises, never recedes<a name="line.188"></a>
+<span class="sourceLineNo">189</span> runningAverageRef.compareAndSet(prev, runningAverageUpdate)) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> break;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<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>}<a name="line.194"></a>