hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [06/15] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Thu, 04 May 2017 14:58:53 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00788d32/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.html
index ffe4462..3e39a99 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.html
@@ -80,152 +80,155 @@
 <span class="sourceLineNo">072</span>        regionInfo = this.toString();<a name="line.72"></a>
 <span class="sourceLineNo">073</span>      }<a name="line.73"></a>
 <span class="sourceLineNo">074</span>      // Major compaction time has elapsed.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      long cfTTL = this.storeConfigInfo.getStoreFileTtl();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      if (filesToCompact.size() == 1) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        // Single file<a name="line.77"></a>
-<span class="sourceLineNo">078</span>        StoreFile sf = filesToCompact.iterator().next();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>        Long minTimestamp = sf.getMinimumTimestamp();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        long oldest = (minTimestamp == null) ? Long.MIN_VALUE : now - minTimestamp.longValue();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        if (sf.isMajorCompaction() &amp;&amp; (cfTTL == Long.MAX_VALUE || oldest &lt; cfTTL)) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>          float blockLocalityIndex =<a name="line.82"></a>
-<span class="sourceLineNo">083</span>            sf.getHDFSBlockDistribution().getBlockLocalityIndex(<a name="line.83"></a>
-<span class="sourceLineNo">084</span>            RSRpcServices.getHostname(comConf.conf, false));<a name="line.84"></a>
-<span class="sourceLineNo">085</span>          if (blockLocalityIndex &lt; comConf.getMinLocalityToForceCompact()) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>            LOG.debug("Major compaction triggered on only store " + regionInfo<a name="line.86"></a>
-<span class="sourceLineNo">087</span>              + "; to make hdfs blocks local, current blockLocalityIndex is "<a name="line.87"></a>
-<span class="sourceLineNo">088</span>              + blockLocalityIndex + " (min " + comConf.getMinLocalityToForceCompact() + ")");<a name="line.88"></a>
-<span class="sourceLineNo">089</span>            result = true;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>          } else {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>            LOG.debug("Skipping major compaction of " + regionInfo<a name="line.91"></a>
-<span class="sourceLineNo">092</span>              + " because one (major) compacted file only, oldestTime " + oldest<a name="line.92"></a>
-<span class="sourceLineNo">093</span>              + "ms is &lt; TTL=" + cfTTL + " and blockLocalityIndex is " + blockLocalityIndex<a name="line.93"></a>
-<span class="sourceLineNo">094</span>              + " (min " + comConf.getMinLocalityToForceCompact() + ")");<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        } else if (cfTTL != HConstants.FOREVER &amp;&amp; oldest &gt; cfTTL) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          LOG.debug("Major compaction triggered on store " + regionInfo<a name="line.97"></a>
-<span class="sourceLineNo">098</span>            + ", because keyvalues outdated; time since last major compaction "<a name="line.98"></a>
-<span class="sourceLineNo">099</span>            + (now - lowTimestamp) + "ms");<a name="line.99"></a>
-<span class="sourceLineNo">100</span>          result = true;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        }<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      } else {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        LOG.debug("Major compaction triggered on store " + regionInfo<a name="line.103"></a>
-<span class="sourceLineNo">104</span>          + "; time since last major compaction " + (now - lowTimestamp) + "ms");<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      result = true;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    return result;<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>  @Override<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  protected CompactionRequest createCompactionRequest(ArrayList&lt;StoreFile&gt;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    candidateSelection, boolean tryingMajor, boolean mayUseOffPeak, boolean mayBeStuck)<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    throws IOException {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (!tryingMajor) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      candidateSelection = filterBulk(candidateSelection);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      candidateSelection = applyCompactionPolicy(candidateSelection, mayUseOffPeak, mayBeStuck);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      candidateSelection = checkMinFilesCriteria(candidateSelection,<a name="line.118"></a>
-<span class="sourceLineNo">119</span>        comConf.getMinFilesToCompact());<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    return new CompactionRequest(candidateSelection);<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>    * -- Default minor compaction selection algorithm:<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    * choose CompactSelection from candidates --<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * First exclude bulk-load files if indicated in configuration.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    * Start at the oldest file and stop when you find the first file that<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * meets compaction criteria:<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    * (1) a recently-flushed, small file (i.e. &lt;= minCompactSize)<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    * OR<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    * (2) within the compactRatio of sum(newer_files)<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    * Given normal skew, any newer files will also meet this criteria<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    * &lt;p/&gt;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    * Additional Note:<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * If fileSizes.size() &gt;&gt; maxFilesToCompact, we will recurse on<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    * compact().  Consider the oldest files first to avoid a<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * situation where we always compact [end-threshold,end).  Then, the<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * last file becomes an aggregate of the previous compactions.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    *<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    * normal skew:<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    *<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    *         older ----&gt; newer (increasing seqID)<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>    *  --|-|- |-|- |-|---_-------_-------  minCompactSize<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    *    | |  | |  | |  | |  _  | |<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    *    | |  | |  | |  | | | | | |<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    *    | |  | |  | |  | | | | | |<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    * @param candidates pre-filtrate<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    * @return filtered subset<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  protected ArrayList&lt;StoreFile&gt; applyCompactionPolicy(ArrayList&lt;StoreFile&gt; candidates,<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    boolean mayUseOffPeak, boolean mayBeStuck) throws IOException {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    if (candidates.isEmpty()) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return candidates;<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>    // we're doing a minor compaction, let's see what files are applicable<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    int start = 0;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    double ratio = comConf.getCompactionRatio();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    if (mayUseOffPeak) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      ratio = comConf.getCompactionRatioOffPeak();<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      LOG.info("Running an off-peak compaction, selection ratio = " + ratio);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    // get store file sizes for incremental compacting selection.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    final int countOfFiles = candidates.size();<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    long[] fileSizes = new long[countOfFiles];<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    long[] sumSize = new long[countOfFiles];<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    for (int i = countOfFiles - 1; i &gt;= 0; --i) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      StoreFile file = candidates.get(i);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      fileSizes[i] = file.getReader().length();<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      // calculate the sum of fileSizes[i,i+maxFilesToCompact-1) for algo<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      int tooFar = i + comConf.getMaxFilesToCompact() - 1;<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      sumSize[i] = fileSizes[i]<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        + ((i + 1 &lt; countOfFiles) ? sumSize[i + 1] : 0)<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        - ((tooFar &lt; countOfFiles) ? fileSizes[tooFar] : 0);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>    while (countOfFiles - start &gt;= comConf.getMinFilesToCompact() &amp;&amp;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      fileSizes[start] &gt; Math.max(comConf.getMinCompactSize(),<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          (long) (sumSize[start + 1] * ratio))) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      ++start;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    if (start &lt; countOfFiles) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      LOG.info("Default compaction algorithm has selected " + (countOfFiles - start)<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        + " files from " + countOfFiles + " candidates");<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    } else if (mayBeStuck) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      // We may be stuck. Compact the latest files if we can.<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      int filesToLeave = candidates.size() - comConf.getMinFilesToCompact();<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      if (filesToLeave &gt;= 0) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        start = filesToLeave;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    candidates.subList(0, start).clear();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    return candidates;<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 heuristic method to decide whether to schedule a compaction request<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   * @param storeFiles files in the store.<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * @param filesCompacting files being scheduled to compact.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * @return true to schedule a request.<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public boolean needsCompaction(final Collection&lt;StoreFile&gt; storeFiles,<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      final List&lt;StoreFile&gt; filesCompacting) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    int numCandidates = storeFiles.size() - filesCompacting.size();<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    return numCandidates &gt;= comConf.getMinFilesToCompact();<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>  /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * Overwrite min threshold for compaction<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  public void setMinThreshold(int minThreshold) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    comConf.setMinFilesToCompact(minThreshold);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>}<a name="line.220"></a>
+<span class="sourceLineNo">075</span>      long cfTTL = HConstants.FOREVER;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      if (this.storeConfigInfo != null) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         cfTTL = this.storeConfigInfo.getStoreFileTtl();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      }<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      if (filesToCompact.size() == 1) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        // Single file<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        StoreFile sf = filesToCompact.iterator().next();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>        Long minTimestamp = sf.getMinimumTimestamp();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        long oldest = (minTimestamp == null) ? Long.MIN_VALUE : now - minTimestamp.longValue();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        if (sf.isMajorCompaction() &amp;&amp; (cfTTL == Long.MAX_VALUE || oldest &lt; cfTTL)) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          float blockLocalityIndex =<a name="line.85"></a>
+<span class="sourceLineNo">086</span>            sf.getHDFSBlockDistribution().getBlockLocalityIndex(<a name="line.86"></a>
+<span class="sourceLineNo">087</span>            RSRpcServices.getHostname(comConf.conf, false));<a name="line.87"></a>
+<span class="sourceLineNo">088</span>          if (blockLocalityIndex &lt; comConf.getMinLocalityToForceCompact()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>            LOG.debug("Major compaction triggered on only store " + regionInfo<a name="line.89"></a>
+<span class="sourceLineNo">090</span>              + "; to make hdfs blocks local, current blockLocalityIndex is "<a name="line.90"></a>
+<span class="sourceLineNo">091</span>              + blockLocalityIndex + " (min " + comConf.getMinLocalityToForceCompact() + ")");<a name="line.91"></a>
+<span class="sourceLineNo">092</span>            result = true;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>          } else {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>            LOG.debug("Skipping major compaction of " + regionInfo<a name="line.94"></a>
+<span class="sourceLineNo">095</span>              + " because one (major) compacted file only, oldestTime " + oldest<a name="line.95"></a>
+<span class="sourceLineNo">096</span>              + "ms is &lt; TTL=" + cfTTL + " and blockLocalityIndex is " + blockLocalityIndex<a name="line.96"></a>
+<span class="sourceLineNo">097</span>              + " (min " + comConf.getMinLocalityToForceCompact() + ")");<a name="line.97"></a>
+<span class="sourceLineNo">098</span>          }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        } else if (cfTTL != HConstants.FOREVER &amp;&amp; oldest &gt; cfTTL) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          LOG.debug("Major compaction triggered on store " + regionInfo<a name="line.100"></a>
+<span class="sourceLineNo">101</span>            + ", because keyvalues outdated; time since last major compaction "<a name="line.101"></a>
+<span class="sourceLineNo">102</span>            + (now - lowTimestamp) + "ms");<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          result = true;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      } else {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        LOG.debug("Major compaction triggered on store " + regionInfo<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          + "; time since last major compaction " + (now - lowTimestamp) + "ms");<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      }<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      result = true;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return result;<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>  @Override<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  protected CompactionRequest createCompactionRequest(ArrayList&lt;StoreFile&gt;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    candidateSelection, boolean tryingMajor, boolean mayUseOffPeak, boolean mayBeStuck)<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    throws IOException {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    if (!tryingMajor) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      candidateSelection = filterBulk(candidateSelection);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      candidateSelection = applyCompactionPolicy(candidateSelection, mayUseOffPeak, mayBeStuck);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      candidateSelection = checkMinFilesCriteria(candidateSelection,<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        comConf.getMinFilesToCompact());<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    return new CompactionRequest(candidateSelection);<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>    * -- Default minor compaction selection algorithm:<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    * choose CompactSelection from candidates --<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    * First exclude bulk-load files if indicated in configuration.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    * Start at the oldest file and stop when you find the first file that<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    * meets compaction criteria:<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    * (1) a recently-flushed, small file (i.e. &lt;= minCompactSize)<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    * OR<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    * (2) within the compactRatio of sum(newer_files)<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    * Given normal skew, any newer files will also meet this criteria<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    * &lt;p/&gt;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * Additional Note:<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    * If fileSizes.size() &gt;&gt; maxFilesToCompact, we will recurse on<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    * compact().  Consider the oldest files first to avoid a<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    * situation where we always compact [end-threshold,end).  Then, the<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    * last file becomes an aggregate of the previous compactions.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    *<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    * normal skew:<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    *<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    *         older ----&gt; newer (increasing seqID)<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    *     _<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    *    | |   _<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    *    | |  | |   _<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    *  --|-|- |-|- |-|---_-------_-------  minCompactSize<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    *    | |  | |  | |  | |  _  | |<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>    * @param candidates pre-filtrate<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    * @return filtered subset<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  protected ArrayList&lt;StoreFile&gt; applyCompactionPolicy(ArrayList&lt;StoreFile&gt; candidates,<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    boolean mayUseOffPeak, boolean mayBeStuck) throws IOException {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    if (candidates.isEmpty()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      return candidates;<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>    // we're doing a minor compaction, let's see what files are applicable<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    int start = 0;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    double ratio = comConf.getCompactionRatio();<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    if (mayUseOffPeak) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      ratio = comConf.getCompactionRatioOffPeak();<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      LOG.info("Running an off-peak compaction, selection ratio = " + ratio);<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>    // get store file sizes for incremental compacting selection.<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    final int countOfFiles = candidates.size();<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    long[] fileSizes = new long[countOfFiles];<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    long[] sumSize = new long[countOfFiles];<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    for (int i = countOfFiles - 1; i &gt;= 0; --i) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      StoreFile file = candidates.get(i);<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      fileSizes[i] = file.getReader().length();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      // calculate the sum of fileSizes[i,i+maxFilesToCompact-1) for algo<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      int tooFar = i + comConf.getMaxFilesToCompact() - 1;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      sumSize[i] = fileSizes[i]<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        + ((i + 1 &lt; countOfFiles) ? sumSize[i + 1] : 0)<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        - ((tooFar &lt; countOfFiles) ? fileSizes[tooFar] : 0);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    while (countOfFiles - start &gt;= comConf.getMinFilesToCompact() &amp;&amp;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      fileSizes[start] &gt; Math.max(comConf.getMinCompactSize(),<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          (long) (sumSize[start + 1] * ratio))) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      ++start;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    if (start &lt; countOfFiles) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      LOG.info("Default compaction algorithm has selected " + (countOfFiles - start)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        + " files from " + countOfFiles + " candidates");<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    } else if (mayBeStuck) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      // We may be stuck. Compact the latest files if we can.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      int filesToLeave = candidates.size() - comConf.getMinFilesToCompact();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      if (filesToLeave &gt;= 0) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        start = filesToLeave;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    candidates.subList(0, start).clear();<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    return candidates;<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>   * A heuristic method to decide whether to schedule a compaction request<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * @param storeFiles files in the store.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * @param filesCompacting files being scheduled to compact.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * @return true to schedule a request.<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  public boolean needsCompaction(final Collection&lt;StoreFile&gt; storeFiles,<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      final List&lt;StoreFile&gt; filesCompacting) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    int numCandidates = storeFiles.size() - filesCompacting.size();<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    return numCandidates &gt;= comConf.getMinFilesToCompact();<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>   * Overwrite min threshold for compaction<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   */<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  public void setMinThreshold(int minThreshold) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    comConf.setMinFilesToCompact(minThreshold);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>}<a name="line.223"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00788d32/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index b613845..d7bb035 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -70,14 +70,14 @@
 <span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  optionalArguments = {<a name="line.63"></a>
 <span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.66"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
 <span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.68"></a>
+<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
 <span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.70"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.70"></a>
 <span class="sourceLineNo">071</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;")})<a name="line.72"></a>
+<span class="sourceLineNo">072</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager")})<a name="line.72"></a>
 <span class="sourceLineNo">073</span>public class MasterStatusTmpl<a name="line.73"></a>
 <span class="sourceLineNo">074</span>  extends org.jamon.AbstractTemplateProxy<a name="line.74"></a>
 <span class="sourceLineNo">075</span>{<a name="line.75"></a>
@@ -135,40 +135,40 @@
 <span class="sourceLineNo">127</span>      return m_servers__IsNotDefault;<a name="line.127"></a>
 <span class="sourceLineNo">128</span>    }<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    private boolean m_servers__IsNotDefault;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // 25, 1<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.131"></a>
+<span class="sourceLineNo">130</span>    // 26, 1<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    public void setFilter(String filter)<a name="line.131"></a>
 <span class="sourceLineNo">132</span>    {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      // 25, 1<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.135"></a>
+<span class="sourceLineNo">133</span>      // 26, 1<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      m_filter = filter;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      m_filter__IsNotDefault = true;<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    public boolean getCatalogJanitorEnabled()<a name="line.137"></a>
+<span class="sourceLineNo">137</span>    public String getFilter()<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      return m_catalogJanitorEnabled;<a name="line.139"></a>
+<span class="sourceLineNo">139</span>      return m_filter;<a name="line.139"></a>
 <span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    private boolean m_catalogJanitorEnabled;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.142"></a>
+<span class="sourceLineNo">141</span>    private String m_filter;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    public boolean getFilter__IsNotDefault()<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span>      return m_filter__IsNotDefault;<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    // 29, 1<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.148"></a>
+<span class="sourceLineNo">146</span>    private boolean m_filter__IsNotDefault;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    // 25, 1<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      // 29, 1<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      m_assignmentManager = assignmentManager;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      m_assignmentManager__IsNotDefault = true;<a name="line.152"></a>
+<span class="sourceLineNo">150</span>      // 25, 1<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    public AssignmentManager getAssignmentManager()<a name="line.154"></a>
+<span class="sourceLineNo">154</span>    public boolean getCatalogJanitorEnabled()<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      return m_assignmentManager;<a name="line.156"></a>
+<span class="sourceLineNo">156</span>      return m_catalogJanitorEnabled;<a name="line.156"></a>
 <span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    private AssignmentManager m_assignmentManager;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.159"></a>
+<span class="sourceLineNo">158</span>    private boolean m_catalogJanitorEnabled;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      return m_assignmentManager__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">161</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.161"></a>
 <span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.163"></a>
+<span class="sourceLineNo">163</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    // 22, 1<a name="line.164"></a>
 <span class="sourceLineNo">165</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.165"></a>
 <span class="sourceLineNo">166</span>    {<a name="line.166"></a>
@@ -186,23 +186,23 @@
 <span class="sourceLineNo">178</span>      return m_metaLocation__IsNotDefault;<a name="line.178"></a>
 <span class="sourceLineNo">179</span>    }<a name="line.179"></a>
 <span class="sourceLineNo">180</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // 28, 1<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    public void setServerManager(ServerManager serverManager)<a name="line.182"></a>
+<span class="sourceLineNo">181</span>    // 29, 1<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.182"></a>
 <span class="sourceLineNo">183</span>    {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      // 28, 1<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      m_serverManager = serverManager;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      m_serverManager__IsNotDefault = true;<a name="line.186"></a>
+<span class="sourceLineNo">184</span>      // 29, 1<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      m_assignmentManager = assignmentManager;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      m_assignmentManager__IsNotDefault = true;<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public ServerManager getServerManager()<a name="line.188"></a>
+<span class="sourceLineNo">188</span>    public AssignmentManager getAssignmentManager()<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return m_serverManager;<a name="line.190"></a>
+<span class="sourceLineNo">190</span>      return m_assignmentManager;<a name="line.190"></a>
 <span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    private ServerManager m_serverManager;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    public boolean getServerManager__IsNotDefault()<a name="line.193"></a>
+<span class="sourceLineNo">192</span>    private AssignmentManager m_assignmentManager;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      return m_serverManager__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">195</span>      return m_assignmentManager__IsNotDefault;<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    private boolean m_serverManager__IsNotDefault;<a name="line.197"></a>
+<span class="sourceLineNo">197</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    // 21, 1<a name="line.198"></a>
 <span class="sourceLineNo">199</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.199"></a>
 <span class="sourceLineNo">200</span>    {<a name="line.200"></a>
@@ -220,23 +220,23 @@
 <span class="sourceLineNo">212</span>      return m_frags__IsNotDefault;<a name="line.212"></a>
 <span class="sourceLineNo">213</span>    }<a name="line.213"></a>
 <span class="sourceLineNo">214</span>    private boolean m_frags__IsNotDefault;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    // 26, 1<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    public void setFilter(String filter)<a name="line.216"></a>
+<span class="sourceLineNo">215</span>    // 24, 1<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.216"></a>
 <span class="sourceLineNo">217</span>    {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      // 26, 1<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      m_filter = filter;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      m_filter__IsNotDefault = true;<a name="line.220"></a>
+<span class="sourceLineNo">218</span>      // 24, 1<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      m_deadServers = deadServers;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      m_deadServers__IsNotDefault = true;<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    }<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    public String getFilter()<a name="line.222"></a>
+<span class="sourceLineNo">222</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      return m_filter;<a name="line.224"></a>
+<span class="sourceLineNo">224</span>      return m_deadServers;<a name="line.224"></a>
 <span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    private String m_filter;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    public boolean getFilter__IsNotDefault()<a name="line.227"></a>
+<span class="sourceLineNo">226</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    public boolean getDeadServers__IsNotDefault()<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      return m_filter__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">229</span>      return m_deadServers__IsNotDefault;<a name="line.229"></a>
 <span class="sourceLineNo">230</span>    }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    private boolean m_filter__IsNotDefault;<a name="line.231"></a>
+<span class="sourceLineNo">231</span>    private boolean m_deadServers__IsNotDefault;<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    // 27, 1<a name="line.232"></a>
 <span class="sourceLineNo">233</span>    public void setFormat(String format)<a name="line.233"></a>
 <span class="sourceLineNo">234</span>    {<a name="line.234"></a>
@@ -254,23 +254,23 @@
 <span class="sourceLineNo">246</span>      return m_format__IsNotDefault;<a name="line.246"></a>
 <span class="sourceLineNo">247</span>    }<a name="line.247"></a>
 <span class="sourceLineNo">248</span>    private boolean m_format__IsNotDefault;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    // 24, 1<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.250"></a>
+<span class="sourceLineNo">249</span>    // 28, 1<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    public void setServerManager(ServerManager serverManager)<a name="line.250"></a>
 <span class="sourceLineNo">251</span>    {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // 24, 1<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      m_deadServers = deadServers;<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      m_deadServers__IsNotDefault = true;<a name="line.254"></a>
+<span class="sourceLineNo">252</span>      // 28, 1<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      m_serverManager = serverManager;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      m_serverManager__IsNotDefault = true;<a name="line.254"></a>
 <span class="sourceLineNo">255</span>    }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.256"></a>
+<span class="sourceLineNo">256</span>    public ServerManager getServerManager()<a name="line.256"></a>
 <span class="sourceLineNo">257</span>    {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      return m_deadServers;<a name="line.258"></a>
+<span class="sourceLineNo">258</span>      return m_serverManager;<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    public boolean getDeadServers__IsNotDefault()<a name="line.261"></a>
+<span class="sourceLineNo">260</span>    private ServerManager m_serverManager;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    public boolean getServerManager__IsNotDefault()<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      return m_deadServers__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span>      return m_serverManager__IsNotDefault;<a name="line.263"></a>
 <span class="sourceLineNo">264</span>    }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    private boolean m_deadServers__IsNotDefault;<a name="line.265"></a>
+<span class="sourceLineNo">265</span>    private boolean m_serverManager__IsNotDefault;<a name="line.265"></a>
 <span class="sourceLineNo">266</span>  }<a name="line.266"></a>
 <span class="sourceLineNo">267</span>  @Override<a name="line.267"></a>
 <span class="sourceLineNo">268</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.268"></a>
@@ -289,17 +289,17 @@
 <span class="sourceLineNo">281</span>    return this;<a name="line.281"></a>
 <span class="sourceLineNo">282</span>  }<a name="line.282"></a>
 <span class="sourceLineNo">283</span>  <a name="line.283"></a>
-<span class="sourceLineNo">284</span>  protected boolean catalogJanitorEnabled;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.285"></a>
+<span class="sourceLineNo">284</span>  protected String filter;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.285"></a>
 <span class="sourceLineNo">286</span>  {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.287"></a>
+<span class="sourceLineNo">287</span>    (getImplData()).setFilter(p_filter);<a name="line.287"></a>
 <span class="sourceLineNo">288</span>    return this;<a name="line.288"></a>
 <span class="sourceLineNo">289</span>  }<a name="line.289"></a>
 <span class="sourceLineNo">290</span>  <a name="line.290"></a>
-<span class="sourceLineNo">291</span>  protected AssignmentManager assignmentManager;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.292"></a>
+<span class="sourceLineNo">291</span>  protected boolean catalogJanitorEnabled;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.292"></a>
 <span class="sourceLineNo">293</span>  {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.294"></a>
+<span class="sourceLineNo">294</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.294"></a>
 <span class="sourceLineNo">295</span>    return this;<a name="line.295"></a>
 <span class="sourceLineNo">296</span>  }<a name="line.296"></a>
 <span class="sourceLineNo">297</span>  <a name="line.297"></a>
@@ -310,10 +310,10 @@
 <span class="sourceLineNo">302</span>    return this;<a name="line.302"></a>
 <span class="sourceLineNo">303</span>  }<a name="line.303"></a>
 <span class="sourceLineNo">304</span>  <a name="line.304"></a>
-<span class="sourceLineNo">305</span>  protected ServerManager serverManager;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.306"></a>
+<span class="sourceLineNo">305</span>  protected AssignmentManager assignmentManager;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.306"></a>
 <span class="sourceLineNo">307</span>  {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.308"></a>
+<span class="sourceLineNo">308</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.308"></a>
 <span class="sourceLineNo">309</span>    return this;<a name="line.309"></a>
 <span class="sourceLineNo">310</span>  }<a name="line.310"></a>
 <span class="sourceLineNo">311</span>  <a name="line.311"></a>
@@ -324,10 +324,10 @@
 <span class="sourceLineNo">316</span>    return this;<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">319</span>  protected String filter;<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.320"></a>
+<span class="sourceLineNo">319</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.320"></a>
 <span class="sourceLineNo">321</span>  {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    (getImplData()).setFilter(p_filter);<a name="line.322"></a>
+<span class="sourceLineNo">322</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.322"></a>
 <span class="sourceLineNo">323</span>    return this;<a name="line.323"></a>
 <span class="sourceLineNo">324</span>  }<a name="line.324"></a>
 <span class="sourceLineNo">325</span>  <a name="line.325"></a>
@@ -338,10 +338,10 @@
 <span class="sourceLineNo">330</span>    return this;<a name="line.330"></a>
 <span class="sourceLineNo">331</span>  }<a name="line.331"></a>
 <span class="sourceLineNo">332</span>  <a name="line.332"></a>
-<span class="sourceLineNo">333</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.334"></a>
+<span class="sourceLineNo">333</span>  protected ServerManager serverManager;<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.334"></a>
 <span class="sourceLineNo">335</span>  {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.336"></a>
+<span class="sourceLineNo">336</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>    return this;<a name="line.337"></a>
 <span class="sourceLineNo">338</span>  }<a name="line.338"></a>
 <span class="sourceLineNo">339</span>  <a name="line.339"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00788d32/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
index b613845..d7bb035 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
@@ -70,14 +70,14 @@
 <span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.62"></a>
 <span class="sourceLineNo">063</span>  optionalArguments = {<a name="line.63"></a>
 <span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.66"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.66"></a>
 <span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.68"></a>
+<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
 <span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.70"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.70"></a>
 <span class="sourceLineNo">071</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;")})<a name="line.72"></a>
+<span class="sourceLineNo">072</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager")})<a name="line.72"></a>
 <span class="sourceLineNo">073</span>public class MasterStatusTmpl<a name="line.73"></a>
 <span class="sourceLineNo">074</span>  extends org.jamon.AbstractTemplateProxy<a name="line.74"></a>
 <span class="sourceLineNo">075</span>{<a name="line.75"></a>
@@ -135,40 +135,40 @@
 <span class="sourceLineNo">127</span>      return m_servers__IsNotDefault;<a name="line.127"></a>
 <span class="sourceLineNo">128</span>    }<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    private boolean m_servers__IsNotDefault;<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // 25, 1<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.131"></a>
+<span class="sourceLineNo">130</span>    // 26, 1<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    public void setFilter(String filter)<a name="line.131"></a>
 <span class="sourceLineNo">132</span>    {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      // 25, 1<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.135"></a>
+<span class="sourceLineNo">133</span>      // 26, 1<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      m_filter = filter;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      m_filter__IsNotDefault = true;<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    public boolean getCatalogJanitorEnabled()<a name="line.137"></a>
+<span class="sourceLineNo">137</span>    public String getFilter()<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      return m_catalogJanitorEnabled;<a name="line.139"></a>
+<span class="sourceLineNo">139</span>      return m_filter;<a name="line.139"></a>
 <span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    private boolean m_catalogJanitorEnabled;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.142"></a>
+<span class="sourceLineNo">141</span>    private String m_filter;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    public boolean getFilter__IsNotDefault()<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">144</span>      return m_filter__IsNotDefault;<a name="line.144"></a>
 <span class="sourceLineNo">145</span>    }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    // 29, 1<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.148"></a>
+<span class="sourceLineNo">146</span>    private boolean m_filter__IsNotDefault;<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    // 25, 1<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      // 29, 1<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      m_assignmentManager = assignmentManager;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      m_assignmentManager__IsNotDefault = true;<a name="line.152"></a>
+<span class="sourceLineNo">150</span>      // 25, 1<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    public AssignmentManager getAssignmentManager()<a name="line.154"></a>
+<span class="sourceLineNo">154</span>    public boolean getCatalogJanitorEnabled()<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      return m_assignmentManager;<a name="line.156"></a>
+<span class="sourceLineNo">156</span>      return m_catalogJanitorEnabled;<a name="line.156"></a>
 <span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    private AssignmentManager m_assignmentManager;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.159"></a>
+<span class="sourceLineNo">158</span>    private boolean m_catalogJanitorEnabled;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      return m_assignmentManager__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">161</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.161"></a>
 <span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.163"></a>
+<span class="sourceLineNo">163</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    // 22, 1<a name="line.164"></a>
 <span class="sourceLineNo">165</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.165"></a>
 <span class="sourceLineNo">166</span>    {<a name="line.166"></a>
@@ -186,23 +186,23 @@
 <span class="sourceLineNo">178</span>      return m_metaLocation__IsNotDefault;<a name="line.178"></a>
 <span class="sourceLineNo">179</span>    }<a name="line.179"></a>
 <span class="sourceLineNo">180</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // 28, 1<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    public void setServerManager(ServerManager serverManager)<a name="line.182"></a>
+<span class="sourceLineNo">181</span>    // 29, 1<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.182"></a>
 <span class="sourceLineNo">183</span>    {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      // 28, 1<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      m_serverManager = serverManager;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      m_serverManager__IsNotDefault = true;<a name="line.186"></a>
+<span class="sourceLineNo">184</span>      // 29, 1<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      m_assignmentManager = assignmentManager;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      m_assignmentManager__IsNotDefault = true;<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    public ServerManager getServerManager()<a name="line.188"></a>
+<span class="sourceLineNo">188</span>    public AssignmentManager getAssignmentManager()<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return m_serverManager;<a name="line.190"></a>
+<span class="sourceLineNo">190</span>      return m_assignmentManager;<a name="line.190"></a>
 <span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    private ServerManager m_serverManager;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    public boolean getServerManager__IsNotDefault()<a name="line.193"></a>
+<span class="sourceLineNo">192</span>    private AssignmentManager m_assignmentManager;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      return m_serverManager__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">195</span>      return m_assignmentManager__IsNotDefault;<a name="line.195"></a>
 <span class="sourceLineNo">196</span>    }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    private boolean m_serverManager__IsNotDefault;<a name="line.197"></a>
+<span class="sourceLineNo">197</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    // 21, 1<a name="line.198"></a>
 <span class="sourceLineNo">199</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.199"></a>
 <span class="sourceLineNo">200</span>    {<a name="line.200"></a>
@@ -220,23 +220,23 @@
 <span class="sourceLineNo">212</span>      return m_frags__IsNotDefault;<a name="line.212"></a>
 <span class="sourceLineNo">213</span>    }<a name="line.213"></a>
 <span class="sourceLineNo">214</span>    private boolean m_frags__IsNotDefault;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    // 26, 1<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    public void setFilter(String filter)<a name="line.216"></a>
+<span class="sourceLineNo">215</span>    // 24, 1<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.216"></a>
 <span class="sourceLineNo">217</span>    {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      // 26, 1<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      m_filter = filter;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      m_filter__IsNotDefault = true;<a name="line.220"></a>
+<span class="sourceLineNo">218</span>      // 24, 1<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      m_deadServers = deadServers;<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      m_deadServers__IsNotDefault = true;<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    }<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    public String getFilter()<a name="line.222"></a>
+<span class="sourceLineNo">222</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      return m_filter;<a name="line.224"></a>
+<span class="sourceLineNo">224</span>      return m_deadServers;<a name="line.224"></a>
 <span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    private String m_filter;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    public boolean getFilter__IsNotDefault()<a name="line.227"></a>
+<span class="sourceLineNo">226</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    public boolean getDeadServers__IsNotDefault()<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      return m_filter__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">229</span>      return m_deadServers__IsNotDefault;<a name="line.229"></a>
 <span class="sourceLineNo">230</span>    }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    private boolean m_filter__IsNotDefault;<a name="line.231"></a>
+<span class="sourceLineNo">231</span>    private boolean m_deadServers__IsNotDefault;<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    // 27, 1<a name="line.232"></a>
 <span class="sourceLineNo">233</span>    public void setFormat(String format)<a name="line.233"></a>
 <span class="sourceLineNo">234</span>    {<a name="line.234"></a>
@@ -254,23 +254,23 @@
 <span class="sourceLineNo">246</span>      return m_format__IsNotDefault;<a name="line.246"></a>
 <span class="sourceLineNo">247</span>    }<a name="line.247"></a>
 <span class="sourceLineNo">248</span>    private boolean m_format__IsNotDefault;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    // 24, 1<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.250"></a>
+<span class="sourceLineNo">249</span>    // 28, 1<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    public void setServerManager(ServerManager serverManager)<a name="line.250"></a>
 <span class="sourceLineNo">251</span>    {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      // 24, 1<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      m_deadServers = deadServers;<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      m_deadServers__IsNotDefault = true;<a name="line.254"></a>
+<span class="sourceLineNo">252</span>      // 28, 1<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      m_serverManager = serverManager;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      m_serverManager__IsNotDefault = true;<a name="line.254"></a>
 <span class="sourceLineNo">255</span>    }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.256"></a>
+<span class="sourceLineNo">256</span>    public ServerManager getServerManager()<a name="line.256"></a>
 <span class="sourceLineNo">257</span>    {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      return m_deadServers;<a name="line.258"></a>
+<span class="sourceLineNo">258</span>      return m_serverManager;<a name="line.258"></a>
 <span class="sourceLineNo">259</span>    }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    public boolean getDeadServers__IsNotDefault()<a name="line.261"></a>
+<span class="sourceLineNo">260</span>    private ServerManager m_serverManager;<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    public boolean getServerManager__IsNotDefault()<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      return m_deadServers__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span>      return m_serverManager__IsNotDefault;<a name="line.263"></a>
 <span class="sourceLineNo">264</span>    }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    private boolean m_deadServers__IsNotDefault;<a name="line.265"></a>
+<span class="sourceLineNo">265</span>    private boolean m_serverManager__IsNotDefault;<a name="line.265"></a>
 <span class="sourceLineNo">266</span>  }<a name="line.266"></a>
 <span class="sourceLineNo">267</span>  @Override<a name="line.267"></a>
 <span class="sourceLineNo">268</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.268"></a>
@@ -289,17 +289,17 @@
 <span class="sourceLineNo">281</span>    return this;<a name="line.281"></a>
 <span class="sourceLineNo">282</span>  }<a name="line.282"></a>
 <span class="sourceLineNo">283</span>  <a name="line.283"></a>
-<span class="sourceLineNo">284</span>  protected boolean catalogJanitorEnabled;<a name="line.284"></a>
-<span class="sourceLineNo">285</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.285"></a>
+<span class="sourceLineNo">284</span>  protected String filter;<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.285"></a>
 <span class="sourceLineNo">286</span>  {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.287"></a>
+<span class="sourceLineNo">287</span>    (getImplData()).setFilter(p_filter);<a name="line.287"></a>
 <span class="sourceLineNo">288</span>    return this;<a name="line.288"></a>
 <span class="sourceLineNo">289</span>  }<a name="line.289"></a>
 <span class="sourceLineNo">290</span>  <a name="line.290"></a>
-<span class="sourceLineNo">291</span>  protected AssignmentManager assignmentManager;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.292"></a>
+<span class="sourceLineNo">291</span>  protected boolean catalogJanitorEnabled;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.292"></a>
 <span class="sourceLineNo">293</span>  {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.294"></a>
+<span class="sourceLineNo">294</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.294"></a>
 <span class="sourceLineNo">295</span>    return this;<a name="line.295"></a>
 <span class="sourceLineNo">296</span>  }<a name="line.296"></a>
 <span class="sourceLineNo">297</span>  <a name="line.297"></a>
@@ -310,10 +310,10 @@
 <span class="sourceLineNo">302</span>    return this;<a name="line.302"></a>
 <span class="sourceLineNo">303</span>  }<a name="line.303"></a>
 <span class="sourceLineNo">304</span>  <a name="line.304"></a>
-<span class="sourceLineNo">305</span>  protected ServerManager serverManager;<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.306"></a>
+<span class="sourceLineNo">305</span>  protected AssignmentManager assignmentManager;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.306"></a>
 <span class="sourceLineNo">307</span>  {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.308"></a>
+<span class="sourceLineNo">308</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.308"></a>
 <span class="sourceLineNo">309</span>    return this;<a name="line.309"></a>
 <span class="sourceLineNo">310</span>  }<a name="line.310"></a>
 <span class="sourceLineNo">311</span>  <a name="line.311"></a>
@@ -324,10 +324,10 @@
 <span class="sourceLineNo">316</span>    return this;<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">319</span>  protected String filter;<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.320"></a>
+<span class="sourceLineNo">319</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.320"></a>
 <span class="sourceLineNo">321</span>  {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    (getImplData()).setFilter(p_filter);<a name="line.322"></a>
+<span class="sourceLineNo">322</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.322"></a>
 <span class="sourceLineNo">323</span>    return this;<a name="line.323"></a>
 <span class="sourceLineNo">324</span>  }<a name="line.324"></a>
 <span class="sourceLineNo">325</span>  <a name="line.325"></a>
@@ -338,10 +338,10 @@
 <span class="sourceLineNo">330</span>    return this;<a name="line.330"></a>
 <span class="sourceLineNo">331</span>  }<a name="line.331"></a>
 <span class="sourceLineNo">332</span>  <a name="line.332"></a>
-<span class="sourceLineNo">333</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.334"></a>
+<span class="sourceLineNo">333</span>  protected ServerManager serverManager;<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.334"></a>
 <span class="sourceLineNo">335</span>  {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.336"></a>
+<span class="sourceLineNo">336</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.336"></a>
 <span class="sourceLineNo">337</span>    return this;<a name="line.337"></a>
 <span class="sourceLineNo">338</span>  }<a name="line.338"></a>
 <span class="sourceLineNo">339</span>  <a name="line.339"></a>


Mime
View raw message