[18/29] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.BoundaryStripeFlushRequest.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.BoundaryStripeFlushRequest.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.BoundaryStripeFlushRequest.html
index 5dc6280..e5972e6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.BoundaryStripeFlushRequest.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.BoundaryStripeFlushRequest.html
@@ -83,110 +83,107 @@
 <span class="sourceLineNo">075</span>    StripeMultiFileWriter mw = null;<a 
name="line.75"></a>
 <span class="sourceLineNo">076</span>    try {<a name="line.76"></a>
 <span class="sourceLineNo">077</span>      mw = req.createWriter(); // Writer 
according to the policy.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(<a name="line.78"></a>
-<span class="sourceLineNo">079</span>          snapshot.getTimeRangeTracker(), 
cellsCount);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>      mw.init(storeScanner, factory);<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>      synchronized (flushLock) {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        success = true;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    } finally {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          try {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          } catch (Exception e) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        scanner.close();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      } catch (IOException ex) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      final TimeRangeTracker tracker, 
final long kvCount) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            /* isCompaction = */ false,<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            /* includesTags = */ true,<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>            /* shouldDropBehind = */ 
false,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            tracker);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        return writer;<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    };<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(cellsCount);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      mw.init(storeScanner, factory);<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>      synchronized (flushLock) {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        success = true;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    } finally {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          } catch (Exception e) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        scanner.close();<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      } catch (IOException ex) {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<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>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(final long kvCount) {<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            /* isCompaction = */ false,<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            /* includesTags = */ true,<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>            /* shouldDropBehind = */ 
false);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        return writer;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    };<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>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  public static class StripeFlushRequest 
{<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static class StripeFlushRequest 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    protected final CellComparator 
comparator;<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      this.comparator = comparator;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    @VisibleForTesting<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      writer.setNoStripeMetadata();<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      return writer;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      super(comparator);<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          null);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private final int targetCount;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    private final long targetKvs;<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    /**<a name="line.164"></a>
-<span class="sourceLineNo">165</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.166"></a>
-<span class="sourceLineNo">167</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>     */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      super(comparator);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      this.targetCount = targetCount;<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          OPEN_KEY, OPEN_KEY);<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>}<a name="line.181"></a>
+<span class="sourceLineNo">124</span>    protected final CellComparator 
comparator;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      this.comparator = comparator;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    @VisibleForTesting<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      writer.setNoStripeMetadata();<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      return writer;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      super(comparator);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>          null);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    private final int targetCount;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    private final long targetKvs;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.163"></a>
+<span class="sourceLineNo">164</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>     */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      super(comparator);<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      this.targetCount = targetCount;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          OPEN_KEY, OPEN_KEY);<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>    }<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.SizeStripeFlushRequest.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.SizeStripeFlushRequest.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.SizeStripeFlushRequest.html
index 5dc6280..e5972e6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.SizeStripeFlushRequest.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.SizeStripeFlushRequest.html
@@ -83,110 +83,107 @@
 <span class="sourceLineNo">075</span>    StripeMultiFileWriter mw = null;<a 
name="line.75"></a>
 <span class="sourceLineNo">076</span>    try {<a name="line.76"></a>
 <span class="sourceLineNo">077</span>      mw = req.createWriter(); // Writer 
according to the policy.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(<a name="line.78"></a>
-<span class="sourceLineNo">079</span>          snapshot.getTimeRangeTracker(), 
cellsCount);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>      mw.init(storeScanner, factory);<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>      synchronized (flushLock) {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        success = true;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    } finally {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          try {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          } catch (Exception e) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        scanner.close();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      } catch (IOException ex) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      final TimeRangeTracker tracker, 
final long kvCount) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            /* isCompaction = */ false,<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            /* includesTags = */ true,<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>            /* shouldDropBehind = */ 
false,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            tracker);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        return writer;<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    };<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(cellsCount);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      mw.init(storeScanner, factory);<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>      synchronized (flushLock) {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        success = true;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    } finally {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          } catch (Exception e) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        scanner.close();<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      } catch (IOException ex) {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<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>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(final long kvCount) {<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            /* isCompaction = */ false,<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            /* includesTags = */ true,<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>            /* shouldDropBehind = */ 
false);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        return writer;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    };<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>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  public static class StripeFlushRequest 
{<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static class StripeFlushRequest 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    protected final CellComparator 
comparator;<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      this.comparator = comparator;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    @VisibleForTesting<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      writer.setNoStripeMetadata();<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      return writer;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      super(comparator);<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          null);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private final int targetCount;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    private final long targetKvs;<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    /**<a name="line.164"></a>
-<span class="sourceLineNo">165</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.166"></a>
-<span class="sourceLineNo">167</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>     */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      super(comparator);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      this.targetCount = targetCount;<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          OPEN_KEY, OPEN_KEY);<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>}<a name="line.181"></a>
+<span class="sourceLineNo">124</span>    protected final CellComparator 
comparator;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      this.comparator = comparator;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    @VisibleForTesting<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      writer.setNoStripeMetadata();<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      return writer;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      super(comparator);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>          null);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    private final int targetCount;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    private final long targetKvs;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.163"></a>
+<span class="sourceLineNo">164</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>     */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      super(comparator);<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      this.targetCount = targetCount;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          OPEN_KEY, OPEN_KEY);<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>    }<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
index 5dc6280..e5972e6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
@@ -83,110 +83,107 @@
 <span class="sourceLineNo">075</span>    StripeMultiFileWriter mw = null;<a 
name="line.75"></a>
 <span class="sourceLineNo">076</span>    try {<a name="line.76"></a>
 <span class="sourceLineNo">077</span>      mw = req.createWriter(); // Writer 
according to the policy.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(<a name="line.78"></a>
-<span class="sourceLineNo">079</span>          snapshot.getTimeRangeTracker(), 
cellsCount);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>      mw.init(storeScanner, factory);<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>      synchronized (flushLock) {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        success = true;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    } finally {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          try {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          } catch (Exception e) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        scanner.close();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      } catch (IOException ex) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      final TimeRangeTracker tracker, 
final long kvCount) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            /* isCompaction = */ false,<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            /* includesTags = */ true,<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>            /* shouldDropBehind = */ 
false,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            tracker);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        return writer;<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    };<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(cellsCount);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      mw.init(storeScanner, factory);<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>      synchronized (flushLock) {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        success = true;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    } finally {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          } catch (Exception e) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        scanner.close();<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      } catch (IOException ex) {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<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>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(final long kvCount) {<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            /* isCompaction = */ false,<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            /* includesTags = */ true,<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>            /* shouldDropBehind = */ 
false);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        return writer;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    };<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>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  public static class StripeFlushRequest 
{<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static class StripeFlushRequest 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    protected final CellComparator 
comparator;<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      this.comparator = comparator;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    @VisibleForTesting<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      writer.setNoStripeMetadata();<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      return writer;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      super(comparator);<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          null);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private final int targetCount;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    private final long targetKvs;<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    /**<a name="line.164"></a>
-<span class="sourceLineNo">165</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.166"></a>
-<span class="sourceLineNo">167</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>     */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      super(comparator);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      this.targetCount = targetCount;<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          OPEN_KEY, OPEN_KEY);<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>}<a name="line.181"></a>
+<span class="sourceLineNo">124</span>    protected final CellComparator 
comparator;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      this.comparator = comparator;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    @VisibleForTesting<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      writer.setNoStripeMetadata();<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      return writer;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      super(comparator);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>          null);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    private final int targetCount;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    private final long targetKvs;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.163"></a>
+<span class="sourceLineNo">164</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>     */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      super(comparator);<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      this.targetCount = targetCount;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          OPEN_KEY, OPEN_KEY);<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>    }<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
index 5dc6280..e5972e6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
@@ -83,110 +83,107 @@
 <span class="sourceLineNo">075</span>    StripeMultiFileWriter mw = null;<a 
name="line.75"></a>
 <span class="sourceLineNo">076</span>    try {<a name="line.76"></a>
 <span class="sourceLineNo">077</span>      mw = req.createWriter(); // Writer 
according to the policy.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(<a name="line.78"></a>
-<span class="sourceLineNo">079</span>          snapshot.getTimeRangeTracker(), 
cellsCount);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>      mw.init(storeScanner, factory);<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>      synchronized (flushLock) {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        success = true;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    } finally {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          try {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          } catch (Exception e) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      try {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        scanner.close();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      } catch (IOException ex) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      final TimeRangeTracker tracker, 
final long kvCount) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.113"></a>
-<span class="sourceLineNo">114</span>            /* isCompaction = */ false,<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.115"></a>
-<span class="sourceLineNo">116</span>            /* includesTags = */ true,<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>            /* shouldDropBehind = */ 
false,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            tracker);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        return writer;<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>      }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    };<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">078</span>      StripeMultiFileWriter.WriterFactory 
factory = createWriterFactory(cellsCount);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      StoreScanner storeScanner = 
(scanner instanceof StoreScanner) ? (StoreScanner)scanner : null;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>      mw.init(storeScanner, factory);<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>      synchronized (flushLock) {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>        performFlush(scanner, mw, 
smallestReadPoint, throughputController);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        result = 
mw.commitWriters(cacheFlushSeqNum, false);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        success = true;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    } finally {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      if (!success &amp;&amp; (mw != 
null)) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        for (Path leftoverFile : 
mw.abortWriters()) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            
store.getFileSystem().delete(leftoverFile, false);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          } catch (Exception e) {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>            LOG.error("Failed to delete a 
file after failed flush: " + e);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>        }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        scanner.close();<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      } catch (IOException ex) {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>        LOG.warn("Failed to close flush 
scanner, ignoring", ex);<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>    return result;<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>  private 
StripeMultiFileWriter.WriterFactory createWriterFactory(final long kvCount) {<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    return new 
StripeMultiFileWriter.WriterFactory() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      @Override<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      public StoreFileWriter 
createWriter() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        StoreFileWriter writer = 
store.createWriterInTmp(<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            kvCount, 
store.getColumnFamilyDescriptor().getCompressionType(),<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            /* isCompaction = */ false,<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>            /* includeMVCCReadpoint = */ 
true,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>            /* includesTags = */ true,<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>            /* shouldDropBehind = */ 
false);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        return writer;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    };<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>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  public static class StripeFlushRequest 
{<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  /** Stripe flush request wrapper that 
writes a non-striped file. */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public static class StripeFlushRequest 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    protected final CellComparator 
comparator;<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      this.comparator = comparator;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    @VisibleForTesting<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      writer.setNoStripeMetadata();<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      return writer;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      super(comparator);<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>          null);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private final int targetCount;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    private final long targetKvs;<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    /**<a name="line.164"></a>
-<span class="sourceLineNo">165</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.165"></a>
-<span class="sourceLineNo">166</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.166"></a>
-<span class="sourceLineNo">167</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>     */<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      super(comparator);<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      this.targetCount = targetCount;<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          OPEN_KEY, OPEN_KEY);<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>}<a name="line.181"></a>
+<span class="sourceLineNo">124</span>    protected final CellComparator 
comparator;<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    public 
StripeFlushRequest(CellComparator comparator) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      this.comparator = comparator;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    @VisibleForTesting<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      StripeMultiFileWriter writer = new 
StripeMultiFileWriter.SizeMultiWriter(comparator, 1,<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          Long.MAX_VALUE, OPEN_KEY, 
OPEN_KEY);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      writer.setNoStripeMetadata();<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      return writer;<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>  /** Stripe flush request wrapper based 
on boundaries. */<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public static class 
BoundaryStripeFlushRequest extends StripeFlushRequest {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    private final List&lt;byte[]&gt; 
targetBoundaries;<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    /** @param targetBoundaries New files 
should be written with these boundaries. */<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    public 
BoundaryStripeFlushRequest(CellComparator comparator, List&lt;byte[]&gt; 
targetBoundaries) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      super(comparator);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      this.targetBoundaries = 
targetBoundaries;<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>    @Override<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      return new 
StripeMultiFileWriter.BoundaryMultiWriter(comparator, targetBoundaries, null,<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>          null);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  /** Stripe flush request wrapper based 
on size. */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public static class 
SizeStripeFlushRequest extends StripeFlushRequest {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    private final int targetCount;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>    private final long targetKvs;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    /**<a name="line.161"></a>
+<span class="sourceLineNo">162</span>     * @param targetCount The maximum 
number of stripes to flush into.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>     * @param targetKvs The KV count of 
each segment. If targetKvs*targetCount is less than<a name="line.163"></a>
+<span class="sourceLineNo">164</span>     *                  total number of 
kvs, all the overflow data goes into the last stripe.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>     */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    public 
SizeStripeFlushRequest(CellComparator comparator, int targetCount, long 
targetKvs) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      super(comparator);<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      this.targetCount = targetCount;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      this.targetKvs = targetKvs;<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>    @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public StripeMultiFileWriter 
createWriter() throws IOException {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      return new 
StripeMultiFileWriter.SizeMultiWriter(comparator, this.targetCount, 
this.targetKvs,<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          OPEN_KEY, OPEN_KEY);<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>    }<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 2fda347..815f06a 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171008" />
+    <meta name="Date-Revision-yyyymmdd" content="20171009" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Export Control
@@ -336,7 +336,7 @@ for more details.</p>
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-08</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-09</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/hbase-annotations/dependencies.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependencies.html 
b/hbase-annotations/dependencies.html
index ce6d556..8a5bee4 100644
--- a/hbase-annotations/dependencies.html
+++ b/hbase-annotations/dependencies.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171008" />
+    <meta name="Date-Revision-yyyymmdd" content="20171009" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase - Annotations &#x2013; Project Dependencies</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -272,7 +272,7 @@
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-08</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-09</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/hbase-annotations/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-convergence.html 
b/hbase-annotations/dependency-convergence.html
index 45d7684..a8e468b 100644
--- a/hbase-annotations/dependency-convergence.html
+++ b/hbase-annotations/dependency-convergence.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171008" />
+    <meta name="Date-Revision-yyyymmdd" content="20171009" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase - Annotations &#x2013; Reactor Dependency 
Convergence</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -724,7 +724,7 @@
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-08</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-09</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/hbase-annotations/dependency-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-info.html 
b/hbase-annotations/dependency-info.html
index c0ef528..434dc39 100644
--- a/hbase-annotations/dependency-info.html
+++ b/hbase-annotations/dependency-info.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171008" />
+    <meta name="Date-Revision-yyyymmdd" content="20171009" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase - Annotations &#x2013; Dependency Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -147,7 +147,7 @@
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-08</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-09</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/hbase-annotations/dependency-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-management.html 
b/hbase-annotations/dependency-management.html
index 0bb5034..0dbb070 100644
--- a/hbase-annotations/dependency-management.html
+++ b/hbase-annotations/dependency-management.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20171008" />
+    <meta name="Date-Revision-yyyymmdd" content="20171009" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase - Annotations &#x2013; Project Dependency 
Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -766,7 +766,7 @@
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-08</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2017-10-09</li>
             </p>
                 </div>