hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [11/29] hbase-site git commit: Published site at .
Date Mon, 09 Oct 2017 15:12:55 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e6ae7c3e/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHStore.FaultyFileSystem.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHStore.FaultyFileSystem.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHStore.FaultyFileSystem.html
index f49cc1a..956e7fd 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHStore.FaultyFileSystem.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHStore.FaultyFileSystem.html
@@ -523,1289 +523,1320 @@
 <span class="sourceLineNo">515</span>    assertCheck();<a name="line.515"></a>
 <span class="sourceLineNo">516</span>  }<a name="line.516"></a>
 <span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>  /**<a name="line.518"></a>
-<span class="sourceLineNo">519</span>   * Getting data from files only<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   * @throws IOException<a name="line.520"></a>
-<span class="sourceLineNo">521</span>   */<a name="line.521"></a>
-<span class="sourceLineNo">522</span>  @Test<a name="line.522"></a>
-<span class="sourceLineNo">523</span>  public void testGet_FromFilesOnly() throws IOException {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    init(this.name.getMethodName());<a name="line.524"></a>
-<span class="sourceLineNo">525</span><a name="line.525"></a>
-<span class="sourceLineNo">526</span>    //Put data in memstore<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    this.store.add(new KeyValue(row, family, qf2, 1, (byte[])null), null);<a name="line.528"></a>
-<span class="sourceLineNo">529</span>    //flush<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    flush(1);<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>    //Add more data<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    this.store.add(new KeyValue(row, family, qf3, 1, (byte[])null), null);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    this.store.add(new KeyValue(row, family, qf4, 1, (byte[])null), null);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    //flush<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    flush(2);<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span>    //Add more data<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    this.store.add(new KeyValue(row, family, qf5, 1, (byte[])null), null);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    this.store.add(new KeyValue(row, family, qf6, 1, (byte[])null), null);<a name="line.540"></a>
-<span class="sourceLineNo">541</span>    //flush<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    flush(3);<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>    //Get<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    result = HBaseTestingUtility.getFromStoreFile(store,<a name="line.545"></a>
-<span class="sourceLineNo">546</span>        get.getRow(),<a name="line.546"></a>
-<span class="sourceLineNo">547</span>        qualifiers);<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    //this.store.get(get, qualifiers, result);<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span>    //Need to sort the result since multiple files<a name="line.550"></a>
-<span class="sourceLineNo">551</span>    Collections.sort(result, CellComparator.COMPARATOR);<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span>    //Compare<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    assertCheck();<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  }<a name="line.555"></a>
+<span class="sourceLineNo">518</span>  @Test<a name="line.518"></a>
+<span class="sourceLineNo">519</span>  public void testTimeRangeIfSomeCellsAreDroppedInFlush() throws IOException {<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    testTimeRangeIfSomeCellsAreDroppedInFlush(1);<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    testTimeRangeIfSomeCellsAreDroppedInFlush(3);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    testTimeRangeIfSomeCellsAreDroppedInFlush(5);<a name="line.522"></a>
+<span class="sourceLineNo">523</span>  }<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span>  private void testTimeRangeIfSomeCellsAreDroppedInFlush(int maxVersion) throws IOException {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    init(this.name.getMethodName(), TEST_UTIL.getConfiguration(),<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    ColumnFamilyDescriptorBuilder.newBuilder(family).setMaxVersions(maxVersion).build());<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    long currentTs = 100;<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    long minTs = currentTs;<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    // the extra cell won't be flushed to disk,<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    // so the min of timerange will be different between memStore and hfile.<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    for (int i = 0; i != (maxVersion + 1); ++i) {<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      this.store.add(new KeyValue(row, family, qf1, ++currentTs, (byte[])null), null);<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      if (i == 1) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>        minTs = currentTs;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      }<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    }<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    flushStore(store, id++);<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span>    Collection&lt;HStoreFile&gt; files = store.getStorefiles();<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    assertEquals(1, files.size());<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    HStoreFile f = files.iterator().next();<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    f.initReader();<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    StoreFileReader reader = f.getReader();<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    assertEquals(minTs, reader.timeRange.getMin());<a name="line.545"></a>
+<span class="sourceLineNo">546</span>    assertEquals(currentTs, reader.timeRange.getMax());<a name="line.546"></a>
+<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span>  /**<a name="line.549"></a>
+<span class="sourceLineNo">550</span>   * Getting data from files only<a name="line.550"></a>
+<span class="sourceLineNo">551</span>   * @throws IOException<a name="line.551"></a>
+<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
+<span class="sourceLineNo">553</span>  @Test<a name="line.553"></a>
+<span class="sourceLineNo">554</span>  public void testGet_FromFilesOnly() throws IOException {<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    init(this.name.getMethodName());<a name="line.555"></a>
 <span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span>  /**<a name="line.557"></a>
-<span class="sourceLineNo">558</span>   * Getting data from memstore and files<a name="line.558"></a>
-<span class="sourceLineNo">559</span>   * @throws IOException<a name="line.559"></a>
-<span class="sourceLineNo">560</span>   */<a name="line.560"></a>
-<span class="sourceLineNo">561</span>  @Test<a name="line.561"></a>
-<span class="sourceLineNo">562</span>  public void testGet_FromMemStoreAndFiles() throws IOException {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>    init(this.name.getMethodName());<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span>    //Put data in memstore<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    this.store.add(new KeyValue(row, family, qf2, 1, (byte[])null), null);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    //flush<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    flush(1);<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>    //Add more data<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    this.store.add(new KeyValue(row, family, qf3, 1, (byte[])null), null);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    this.store.add(new KeyValue(row, family, qf4, 1, (byte[])null), null);<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    //flush<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    flush(2);<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>    //Add more data<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    this.store.add(new KeyValue(row, family, qf5, 1, (byte[])null), null);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    this.store.add(new KeyValue(row, family, qf6, 1, (byte[])null), null);<a name="line.579"></a>
+<span class="sourceLineNo">557</span>    //Put data in memstore<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    this.store.add(new KeyValue(row, family, qf2, 1, (byte[])null), null);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    //flush<a name="line.560"></a>
+<span class="sourceLineNo">561</span>    flush(1);<a name="line.561"></a>
+<span class="sourceLineNo">562</span><a name="line.562"></a>
+<span class="sourceLineNo">563</span>    //Add more data<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    this.store.add(new KeyValue(row, family, qf3, 1, (byte[])null), null);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    this.store.add(new KeyValue(row, family, qf4, 1, (byte[])null), null);<a name="line.565"></a>
+<span class="sourceLineNo">566</span>    //flush<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    flush(2);<a name="line.567"></a>
+<span class="sourceLineNo">568</span><a name="line.568"></a>
+<span class="sourceLineNo">569</span>    //Add more data<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    this.store.add(new KeyValue(row, family, qf5, 1, (byte[])null), null);<a name="line.570"></a>
+<span class="sourceLineNo">571</span>    this.store.add(new KeyValue(row, family, qf6, 1, (byte[])null), null);<a name="line.571"></a>
+<span class="sourceLineNo">572</span>    //flush<a name="line.572"></a>
+<span class="sourceLineNo">573</span>    flush(3);<a name="line.573"></a>
+<span class="sourceLineNo">574</span><a name="line.574"></a>
+<span class="sourceLineNo">575</span>    //Get<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    result = HBaseTestingUtility.getFromStoreFile(store,<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        get.getRow(),<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        qualifiers);<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    //this.store.get(get, qualifiers, result);<a name="line.579"></a>
 <span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>    //Get<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    result = HBaseTestingUtility.getFromStoreFile(store,<a name="line.582"></a>
-<span class="sourceLineNo">583</span>        get.getRow(), qualifiers);<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>    //Need to sort the result since multiple files<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    Collections.sort(result, CellComparator.COMPARATOR);<a name="line.586"></a>
+<span class="sourceLineNo">581</span>    //Need to sort the result since multiple files<a name="line.581"></a>
+<span class="sourceLineNo">582</span>    Collections.sort(result, CellComparator.COMPARATOR);<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span>    //Compare<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    assertCheck();<a name="line.585"></a>
+<span class="sourceLineNo">586</span>  }<a name="line.586"></a>
 <span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>    //Compare<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    assertCheck();<a name="line.589"></a>
-<span class="sourceLineNo">590</span>  }<a name="line.590"></a>
-<span class="sourceLineNo">591</span><a name="line.591"></a>
-<span class="sourceLineNo">592</span>  private void flush(int storeFilessize) throws IOException{<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    this.store.snapshot();<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    flushStore(store, id++);<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    assertEquals(storeFilessize, this.store.getStorefiles().size());<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    assertEquals(0, ((AbstractMemStore)this.store.memstore).getActive().getCellsCount());<a name="line.596"></a>
-<span class="sourceLineNo">597</span>  }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span>  private void assertCheck() {<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    assertEquals(expected.size(), result.size());<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    for(int i=0; i&lt;expected.size(); i++) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      assertEquals(expected.get(i), result.get(i));<a name="line.602"></a>
-<span class="sourceLineNo">603</span>    }<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  }<a name="line.604"></a>
-<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span>  @After<a name="line.606"></a>
-<span class="sourceLineNo">607</span>  public void tearDown() throws Exception {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>    EnvironmentEdgeManagerTestHelper.reset();<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    if (store != null) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>      try {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>        store.close();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      } catch (IOException e) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      }<a name="line.613"></a>
-<span class="sourceLineNo">614</span>      store = null;<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    if (region != null) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      region.close();<a name="line.617"></a>
-<span class="sourceLineNo">618</span>      region = null;<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    }<a name="line.619"></a>
-<span class="sourceLineNo">620</span>  }<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span>  @AfterClass<a name="line.622"></a>
-<span class="sourceLineNo">623</span>  public static void tearDownAfterClass() throws IOException {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    TEST_UTIL.cleanupTestDir();<a name="line.624"></a>
-<span class="sourceLineNo">625</span>  }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span>  @Test<a name="line.627"></a>
-<span class="sourceLineNo">628</span>  public void testHandleErrorsInFlush() throws Exception {<a name="line.628"></a>
-<span class="sourceLineNo">629</span>    LOG.info("Setting up a faulty file system that cannot write");<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span>    final Configuration conf = HBaseConfiguration.create();<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    User user = User.createUserForTesting(conf,<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        "testhandleerrorsinflush", new String[]{"foo"});<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    // Inject our faulty LocalFileSystem<a name="line.634"></a>
-<span class="sourceLineNo">635</span>    conf.setClass("fs.file.impl", FaultyFileSystem.class,<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        FileSystem.class);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    user.runAs(new PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      @Override<a name="line.638"></a>
-<span class="sourceLineNo">639</span>      public Object run() throws Exception {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        // Make sure it worked (above is sensitive to caching details in hadoop core)<a name="line.640"></a>
-<span class="sourceLineNo">641</span>        FileSystem fs = FileSystem.get(conf);<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        assertEquals(FaultyFileSystem.class, fs.getClass());<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span>        // Initialize region<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        init(name.getMethodName(), conf);<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>        LOG.info("Adding some data");<a name="line.647"></a>
-<span class="sourceLineNo">648</span>        store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.648"></a>
-<span class="sourceLineNo">649</span>        store.add(new KeyValue(row, family, qf2, 1, (byte[])null), null);<a name="line.649"></a>
-<span class="sourceLineNo">650</span>        store.add(new KeyValue(row, family, qf3, 1, (byte[])null), null);<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>        LOG.info("Before flush, we should have no files");<a name="line.652"></a>
-<span class="sourceLineNo">653</span><a name="line.653"></a>
-<span class="sourceLineNo">654</span>        Collection&lt;StoreFileInfo&gt; files =<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          store.getRegionFileSystem().getStoreFiles(store.getColumnFamilyName());<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        assertEquals(0, files != null ? files.size() : 0);<a name="line.656"></a>
+<span class="sourceLineNo">588</span>  /**<a name="line.588"></a>
+<span class="sourceLineNo">589</span>   * Getting data from memstore and files<a name="line.589"></a>
+<span class="sourceLineNo">590</span>   * @throws IOException<a name="line.590"></a>
+<span class="sourceLineNo">591</span>   */<a name="line.591"></a>
+<span class="sourceLineNo">592</span>  @Test<a name="line.592"></a>
+<span class="sourceLineNo">593</span>  public void testGet_FromMemStoreAndFiles() throws IOException {<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    init(this.name.getMethodName());<a name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span>    //Put data in memstore<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.597"></a>
+<span class="sourceLineNo">598</span>    this.store.add(new KeyValue(row, family, qf2, 1, (byte[])null), null);<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    //flush<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    flush(1);<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span>    //Add more data<a name="line.602"></a>
+<span class="sourceLineNo">603</span>    this.store.add(new KeyValue(row, family, qf3, 1, (byte[])null), null);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>    this.store.add(new KeyValue(row, family, qf4, 1, (byte[])null), null);<a name="line.604"></a>
+<span class="sourceLineNo">605</span>    //flush<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    flush(2);<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    //Add more data<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    this.store.add(new KeyValue(row, family, qf5, 1, (byte[])null), null);<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    this.store.add(new KeyValue(row, family, qf6, 1, (byte[])null), null);<a name="line.610"></a>
+<span class="sourceLineNo">611</span><a name="line.611"></a>
+<span class="sourceLineNo">612</span>    //Get<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    result = HBaseTestingUtility.getFromStoreFile(store,<a name="line.613"></a>
+<span class="sourceLineNo">614</span>        get.getRow(), qualifiers);<a name="line.614"></a>
+<span class="sourceLineNo">615</span><a name="line.615"></a>
+<span class="sourceLineNo">616</span>    //Need to sort the result since multiple files<a name="line.616"></a>
+<span class="sourceLineNo">617</span>    Collections.sort(result, CellComparator.COMPARATOR);<a name="line.617"></a>
+<span class="sourceLineNo">618</span><a name="line.618"></a>
+<span class="sourceLineNo">619</span>    //Compare<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    assertCheck();<a name="line.620"></a>
+<span class="sourceLineNo">621</span>  }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span>  private void flush(int storeFilessize) throws IOException{<a name="line.623"></a>
+<span class="sourceLineNo">624</span>    this.store.snapshot();<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    flushStore(store, id++);<a name="line.625"></a>
+<span class="sourceLineNo">626</span>    assertEquals(storeFilessize, this.store.getStorefiles().size());<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    assertEquals(0, ((AbstractMemStore)this.store.memstore).getActive().getCellsCount());<a name="line.627"></a>
+<span class="sourceLineNo">628</span>  }<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span>  private void assertCheck() {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    assertEquals(expected.size(), result.size());<a name="line.631"></a>
+<span class="sourceLineNo">632</span>    for(int i=0; i&lt;expected.size(); i++) {<a name="line.632"></a>
+<span class="sourceLineNo">633</span>      assertEquals(expected.get(i), result.get(i));<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    }<a name="line.634"></a>
+<span class="sourceLineNo">635</span>  }<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span>  @After<a name="line.637"></a>
+<span class="sourceLineNo">638</span>  public void tearDown() throws Exception {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>    EnvironmentEdgeManagerTestHelper.reset();<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    if (store != null) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      try {<a name="line.641"></a>
+<span class="sourceLineNo">642</span>        store.close();<a name="line.642"></a>
+<span class="sourceLineNo">643</span>      } catch (IOException e) {<a name="line.643"></a>
+<span class="sourceLineNo">644</span>      }<a name="line.644"></a>
+<span class="sourceLineNo">645</span>      store = null;<a name="line.645"></a>
+<span class="sourceLineNo">646</span>    }<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    if (region != null) {<a name="line.647"></a>
+<span class="sourceLineNo">648</span>      region.close();<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      region = null;<a name="line.649"></a>
+<span class="sourceLineNo">650</span>    }<a name="line.650"></a>
+<span class="sourceLineNo">651</span>  }<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>  @AfterClass<a name="line.653"></a>
+<span class="sourceLineNo">654</span>  public static void tearDownAfterClass() throws IOException {<a name="line.654"></a>
+<span class="sourceLineNo">655</span>    TEST_UTIL.cleanupTestDir();<a name="line.655"></a>
+<span class="sourceLineNo">656</span>  }<a name="line.656"></a>
 <span class="sourceLineNo">657</span><a name="line.657"></a>
-<span class="sourceLineNo">658</span>        //flush<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        try {<a name="line.659"></a>
-<span class="sourceLineNo">660</span>          LOG.info("Flushing");<a name="line.660"></a>
-<span class="sourceLineNo">661</span>          flush(1);<a name="line.661"></a>
-<span class="sourceLineNo">662</span>          fail("Didn't bubble up IOE!");<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        } catch (IOException ioe) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>          assertTrue(ioe.getMessage().contains("Fault injected"));<a name="line.664"></a>
-<span class="sourceLineNo">665</span>        }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span>        LOG.info("After failed flush, we should still have no files!");<a name="line.667"></a>
-<span class="sourceLineNo">668</span>        files = store.getRegionFileSystem().getStoreFiles(store.getColumnFamilyName());<a name="line.668"></a>
-<span class="sourceLineNo">669</span>        assertEquals(0, files != null ? files.size() : 0);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>        store.getHRegion().getWAL().close();<a name="line.670"></a>
-<span class="sourceLineNo">671</span>        return null;<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      }<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    });<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    FileSystem.closeAllForUGI(user.getUGI());<a name="line.674"></a>
-<span class="sourceLineNo">675</span>  }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span>  /**<a name="line.677"></a>
-<span class="sourceLineNo">678</span>   * Faulty file system that will fail if you write past its fault position the FIRST TIME<a name="line.678"></a>
-<span class="sourceLineNo">679</span>   * only; thereafter it will succeed.  Used by {@link TestHRegion} too.<a name="line.679"></a>
-<span class="sourceLineNo">680</span>   */<a name="line.680"></a>
-<span class="sourceLineNo">681</span>  static class FaultyFileSystem extends FilterFileSystem {<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    List&lt;SoftReference&lt;FaultyOutputStream&gt;&gt; outStreams = new ArrayList&lt;&gt;();<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    private long faultPos = 200;<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    AtomicBoolean fault = new AtomicBoolean(true);<a name="line.684"></a>
-<span class="sourceLineNo">685</span><a name="line.685"></a>
-<span class="sourceLineNo">686</span>    public FaultyFileSystem() {<a name="line.686"></a>
-<span class="sourceLineNo">687</span>      super(new LocalFileSystem());<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      System.err.println("Creating faulty!");<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>    @Override<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    public FSDataOutputStream create(Path p) throws IOException {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      return new FaultyOutputStream(super.create(p), faultPos, fault);<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    }<a name="line.694"></a>
-<span class="sourceLineNo">695</span><a name="line.695"></a>
-<span class="sourceLineNo">696</span>    @Override<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    public FSDataOutputStream create(Path f, FsPermission permission,<a name="line.697"></a>
-<span class="sourceLineNo">698</span>        boolean overwrite, int bufferSize, short replication, long blockSize,<a name="line.698"></a>
-<span class="sourceLineNo">699</span>        Progressable progress) throws IOException {<a name="line.699"></a>
-<span class="sourceLineNo">700</span>      return new FaultyOutputStream(super.create(f, permission,<a name="line.700"></a>
-<span class="sourceLineNo">701</span>          overwrite, bufferSize, replication, blockSize, progress), faultPos, fault);<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    }<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>    @Override<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    public FSDataOutputStream createNonRecursive(Path f, boolean overwrite,<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        int bufferSize, short replication, long blockSize, Progressable progress)<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    throws IOException {<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      // Fake it.  Call create instead.  The default implementation throws an IOE<a name="line.708"></a>
-<span class="sourceLineNo">709</span>      // that this is not supported.<a name="line.709"></a>
-<span class="sourceLineNo">710</span>      return create(f, overwrite, bufferSize, replication, blockSize, progress);<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    }<a name="line.711"></a>
-<span class="sourceLineNo">712</span>  }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span>  static class FaultyOutputStream extends FSDataOutputStream {<a name="line.714"></a>
-<span class="sourceLineNo">715</span>    volatile long faultPos = Long.MAX_VALUE;<a name="line.715"></a>
-<span class="sourceLineNo">716</span>    private final AtomicBoolean fault;<a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span>    public FaultyOutputStream(FSDataOutputStream out, long faultPos, final AtomicBoolean fault)<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    throws IOException {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>      super(out, null);<a name="line.720"></a>
-<span class="sourceLineNo">721</span>      this.faultPos = faultPos;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      this.fault = fault;<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    }<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>    @Override<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    public void write(byte[] buf, int offset, int length) throws IOException {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      System.err.println("faulty stream write at pos " + getPos());<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      injectFault();<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      super.write(buf, offset, length);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>    }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span>    private void injectFault() throws IOException {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      if (this.fault.get() &amp;&amp; getPos() &gt;= faultPos) {<a name="line.733"></a>
-<span class="sourceLineNo">734</span>        throw new IOException("Fault injected");<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    }<a name="line.736"></a>
-<span class="sourceLineNo">737</span>  }<a name="line.737"></a>
-<span class="sourceLineNo">738</span><a name="line.738"></a>
-<span class="sourceLineNo">739</span>  private static void flushStore(HStore store, long id) throws IOException {<a name="line.739"></a>
-<span class="sourceLineNo">740</span>    StoreFlushContext storeFlushCtx = store.createFlushContext(id);<a name="line.740"></a>
-<span class="sourceLineNo">741</span>    storeFlushCtx.prepare();<a name="line.741"></a>
-<span class="sourceLineNo">742</span>    storeFlushCtx.flushCache(Mockito.mock(MonitoredTask.class));<a name="line.742"></a>
-<span class="sourceLineNo">743</span>    storeFlushCtx.commit(Mockito.mock(MonitoredTask.class));<a name="line.743"></a>
-<span class="sourceLineNo">744</span>  }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span>  /**<a name="line.746"></a>
-<span class="sourceLineNo">747</span>   * Generate a list of KeyValues for testing based on given parameters<a name="line.747"></a>
-<span class="sourceLineNo">748</span>   * @param timestamps<a name="line.748"></a>
-<span class="sourceLineNo">749</span>   * @param numRows<a name="line.749"></a>
-<span class="sourceLineNo">750</span>   * @param qualifier<a name="line.750"></a>
-<span class="sourceLineNo">751</span>   * @param family<a name="line.751"></a>
-<span class="sourceLineNo">752</span>   * @return<a name="line.752"></a>
-<span class="sourceLineNo">753</span>   */<a name="line.753"></a>
-<span class="sourceLineNo">754</span>  List&lt;Cell&gt; getKeyValueSet(long[] timestamps, int numRows,<a name="line.754"></a>
-<span class="sourceLineNo">755</span>      byte[] qualifier, byte[] family) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    List&lt;Cell&gt; kvList = new ArrayList&lt;&gt;();<a name="line.756"></a>
-<span class="sourceLineNo">757</span>    for (int i=1;i&lt;=numRows;i++) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      byte[] b = Bytes.toBytes(i);<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      for (long timestamp: timestamps) {<a name="line.759"></a>
-<span class="sourceLineNo">760</span>        kvList.add(new KeyValue(b, family, qualifier, timestamp, b));<a name="line.760"></a>
-<span class="sourceLineNo">761</span>      }<a name="line.761"></a>
-<span class="sourceLineNo">762</span>    }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    return kvList;<a name="line.763"></a>
-<span class="sourceLineNo">764</span>  }<a name="line.764"></a>
-<span class="sourceLineNo">765</span><a name="line.765"></a>
-<span class="sourceLineNo">766</span>  /**<a name="line.766"></a>
-<span class="sourceLineNo">767</span>   * Test to ensure correctness when using Stores with multiple timestamps<a name="line.767"></a>
-<span class="sourceLineNo">768</span>   * @throws IOException<a name="line.768"></a>
-<span class="sourceLineNo">769</span>   */<a name="line.769"></a>
-<span class="sourceLineNo">770</span>  @Test<a name="line.770"></a>
-<span class="sourceLineNo">771</span>  public void testMultipleTimestamps() throws IOException {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>    int numRows = 1;<a name="line.772"></a>
-<span class="sourceLineNo">773</span>    long[] timestamps1 = new long[] {1,5,10,20};<a name="line.773"></a>
-<span class="sourceLineNo">774</span>    long[] timestamps2 = new long[] {30,80};<a name="line.774"></a>
-<span class="sourceLineNo">775</span><a name="line.775"></a>
-<span class="sourceLineNo">776</span>    init(this.name.getMethodName());<a name="line.776"></a>
-<span class="sourceLineNo">777</span><a name="line.777"></a>
-<span class="sourceLineNo">778</span>    List&lt;Cell&gt; kvList1 = getKeyValueSet(timestamps1,numRows, qf1, family);<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    for (Cell kv : kvList1) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      this.store.add(kv, null);<a name="line.780"></a>
-<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
-<span class="sourceLineNo">782</span><a name="line.782"></a>
-<span class="sourceLineNo">783</span>    this.store.snapshot();<a name="line.783"></a>
-<span class="sourceLineNo">784</span>    flushStore(store, id++);<a name="line.784"></a>
-<span class="sourceLineNo">785</span><a name="line.785"></a>
-<span class="sourceLineNo">786</span>    List&lt;Cell&gt; kvList2 = getKeyValueSet(timestamps2,numRows, qf1, family);<a name="line.786"></a>
-<span class="sourceLineNo">787</span>    for(Cell kv : kvList2) {<a name="line.787"></a>
-<span class="sourceLineNo">788</span>      this.store.add(kv, null);<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    }<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span>    List&lt;Cell&gt; result;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    Get get = new Get(Bytes.toBytes(1));<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    get.addColumn(family,qf1);<a name="line.793"></a>
-<span class="sourceLineNo">794</span><a name="line.794"></a>
-<span class="sourceLineNo">795</span>    get.setTimeRange(0,15);<a name="line.795"></a>
-<span class="sourceLineNo">796</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    assertTrue(result.size()&gt;0);<a name="line.797"></a>
-<span class="sourceLineNo">798</span><a name="line.798"></a>
-<span class="sourceLineNo">799</span>    get.setTimeRange(40,90);<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.800"></a>
-<span class="sourceLineNo">801</span>    assertTrue(result.size()&gt;0);<a name="line.801"></a>
-<span class="sourceLineNo">802</span><a name="line.802"></a>
-<span class="sourceLineNo">803</span>    get.setTimeRange(10,45);<a name="line.803"></a>
-<span class="sourceLineNo">804</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    assertTrue(result.size()&gt;0);<a name="line.805"></a>
+<span class="sourceLineNo">658</span>  @Test<a name="line.658"></a>
+<span class="sourceLineNo">659</span>  public void testHandleErrorsInFlush() throws Exception {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    LOG.info("Setting up a faulty file system that cannot write");<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span>    final Configuration conf = HBaseConfiguration.create();<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    User user = User.createUserForTesting(conf,<a name="line.663"></a>
+<span class="sourceLineNo">664</span>        "testhandleerrorsinflush", new String[]{"foo"});<a name="line.664"></a>
+<span class="sourceLineNo">665</span>    // Inject our faulty LocalFileSystem<a name="line.665"></a>
+<span class="sourceLineNo">666</span>    conf.setClass("fs.file.impl", FaultyFileSystem.class,<a name="line.666"></a>
+<span class="sourceLineNo">667</span>        FileSystem.class);<a name="line.667"></a>
+<span class="sourceLineNo">668</span>    user.runAs(new PrivilegedExceptionAction&lt;Object&gt;() {<a name="line.668"></a>
+<span class="sourceLineNo">669</span>      @Override<a name="line.669"></a>
+<span class="sourceLineNo">670</span>      public Object run() throws Exception {<a name="line.670"></a>
+<span class="sourceLineNo">671</span>        // Make sure it worked (above is sensitive to caching details in hadoop core)<a name="line.671"></a>
+<span class="sourceLineNo">672</span>        FileSystem fs = FileSystem.get(conf);<a name="line.672"></a>
+<span class="sourceLineNo">673</span>        assertEquals(FaultyFileSystem.class, fs.getClass());<a name="line.673"></a>
+<span class="sourceLineNo">674</span><a name="line.674"></a>
+<span class="sourceLineNo">675</span>        // Initialize region<a name="line.675"></a>
+<span class="sourceLineNo">676</span>        init(name.getMethodName(), conf);<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>        LOG.info("Adding some data");<a name="line.678"></a>
+<span class="sourceLineNo">679</span>        store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.679"></a>
+<span class="sourceLineNo">680</span>        store.add(new KeyValue(row, family, qf2, 1, (byte[])null), null);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>        store.add(new KeyValue(row, family, qf3, 1, (byte[])null), null);<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span>        LOG.info("Before flush, we should have no files");<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span>        Collection&lt;StoreFileInfo&gt; files =<a name="line.685"></a>
+<span class="sourceLineNo">686</span>          store.getRegionFileSystem().getStoreFiles(store.getColumnFamilyName());<a name="line.686"></a>
+<span class="sourceLineNo">687</span>        assertEquals(0, files != null ? files.size() : 0);<a name="line.687"></a>
+<span class="sourceLineNo">688</span><a name="line.688"></a>
+<span class="sourceLineNo">689</span>        //flush<a name="line.689"></a>
+<span class="sourceLineNo">690</span>        try {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>          LOG.info("Flushing");<a name="line.691"></a>
+<span class="sourceLineNo">692</span>          flush(1);<a name="line.692"></a>
+<span class="sourceLineNo">693</span>          fail("Didn't bubble up IOE!");<a name="line.693"></a>
+<span class="sourceLineNo">694</span>        } catch (IOException ioe) {<a name="line.694"></a>
+<span class="sourceLineNo">695</span>          assertTrue(ioe.getMessage().contains("Fault injected"));<a name="line.695"></a>
+<span class="sourceLineNo">696</span>        }<a name="line.696"></a>
+<span class="sourceLineNo">697</span><a name="line.697"></a>
+<span class="sourceLineNo">698</span>        LOG.info("After failed flush, we should still have no files!");<a name="line.698"></a>
+<span class="sourceLineNo">699</span>        files = store.getRegionFileSystem().getStoreFiles(store.getColumnFamilyName());<a name="line.699"></a>
+<span class="sourceLineNo">700</span>        assertEquals(0, files != null ? files.size() : 0);<a name="line.700"></a>
+<span class="sourceLineNo">701</span>        store.getHRegion().getWAL().close();<a name="line.701"></a>
+<span class="sourceLineNo">702</span>        return null;<a name="line.702"></a>
+<span class="sourceLineNo">703</span>      }<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    });<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    FileSystem.closeAllForUGI(user.getUGI());<a name="line.705"></a>
+<span class="sourceLineNo">706</span>  }<a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span>  /**<a name="line.708"></a>
+<span class="sourceLineNo">709</span>   * Faulty file system that will fail if you write past its fault position the FIRST TIME<a name="line.709"></a>
+<span class="sourceLineNo">710</span>   * only; thereafter it will succeed.  Used by {@link TestHRegion} too.<a name="line.710"></a>
+<span class="sourceLineNo">711</span>   */<a name="line.711"></a>
+<span class="sourceLineNo">712</span>  static class FaultyFileSystem extends FilterFileSystem {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>    List&lt;SoftReference&lt;FaultyOutputStream&gt;&gt; outStreams = new ArrayList&lt;&gt;();<a name="line.713"></a>
+<span class="sourceLineNo">714</span>    private long faultPos = 200;<a name="line.714"></a>
+<span class="sourceLineNo">715</span>    AtomicBoolean fault = new AtomicBoolean(true);<a name="line.715"></a>
+<span class="sourceLineNo">716</span><a name="line.716"></a>
+<span class="sourceLineNo">717</span>    public FaultyFileSystem() {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>      super(new LocalFileSystem());<a name="line.718"></a>
+<span class="sourceLineNo">719</span>      System.err.println("Creating faulty!");<a name="line.719"></a>
+<span class="sourceLineNo">720</span>    }<a name="line.720"></a>
+<span class="sourceLineNo">721</span><a name="line.721"></a>
+<span class="sourceLineNo">722</span>    @Override<a name="line.722"></a>
+<span class="sourceLineNo">723</span>    public FSDataOutputStream create(Path p) throws IOException {<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      return new FaultyOutputStream(super.create(p), faultPos, fault);<a name="line.724"></a>
+<span class="sourceLineNo">725</span>    }<a name="line.725"></a>
+<span class="sourceLineNo">726</span><a name="line.726"></a>
+<span class="sourceLineNo">727</span>    @Override<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    public FSDataOutputStream create(Path f, FsPermission permission,<a name="line.728"></a>
+<span class="sourceLineNo">729</span>        boolean overwrite, int bufferSize, short replication, long blockSize,<a name="line.729"></a>
+<span class="sourceLineNo">730</span>        Progressable progress) throws IOException {<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      return new FaultyOutputStream(super.create(f, permission,<a name="line.731"></a>
+<span class="sourceLineNo">732</span>          overwrite, bufferSize, replication, blockSize, progress), faultPos, fault);<a name="line.732"></a>
+<span class="sourceLineNo">733</span>    }<a name="line.733"></a>
+<span class="sourceLineNo">734</span><a name="line.734"></a>
+<span class="sourceLineNo">735</span>    @Override<a name="line.735"></a>
+<span class="sourceLineNo">736</span>    public FSDataOutputStream createNonRecursive(Path f, boolean overwrite,<a name="line.736"></a>
+<span class="sourceLineNo">737</span>        int bufferSize, short replication, long blockSize, Progressable progress)<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    throws IOException {<a name="line.738"></a>
+<span class="sourceLineNo">739</span>      // Fake it.  Call create instead.  The default implementation throws an IOE<a name="line.739"></a>
+<span class="sourceLineNo">740</span>      // that this is not supported.<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      return create(f, overwrite, bufferSize, replication, blockSize, progress);<a name="line.741"></a>
+<span class="sourceLineNo">742</span>    }<a name="line.742"></a>
+<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
+<span class="sourceLineNo">744</span><a name="line.744"></a>
+<span class="sourceLineNo">745</span>  static class FaultyOutputStream extends FSDataOutputStream {<a name="line.745"></a>
+<span class="sourceLineNo">746</span>    volatile long faultPos = Long.MAX_VALUE;<a name="line.746"></a>
+<span class="sourceLineNo">747</span>    private final AtomicBoolean fault;<a name="line.747"></a>
+<span class="sourceLineNo">748</span><a name="line.748"></a>
+<span class="sourceLineNo">749</span>    public FaultyOutputStream(FSDataOutputStream out, long faultPos, final AtomicBoolean fault)<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    throws IOException {<a name="line.750"></a>
+<span class="sourceLineNo">751</span>      super(out, null);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>      this.faultPos = faultPos;<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      this.fault = fault;<a name="line.753"></a>
+<span class="sourceLineNo">754</span>    }<a name="line.754"></a>
+<span class="sourceLineNo">755</span><a name="line.755"></a>
+<span class="sourceLineNo">756</span>    @Override<a name="line.756"></a>
+<span class="sourceLineNo">757</span>    public void write(byte[] buf, int offset, int length) throws IOException {<a name="line.757"></a>
+<span class="sourceLineNo">758</span>      System.err.println("faulty stream write at pos " + getPos());<a name="line.758"></a>
+<span class="sourceLineNo">759</span>      injectFault();<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      super.write(buf, offset, length);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span>    private void injectFault() throws IOException {<a name="line.763"></a>
+<span class="sourceLineNo">764</span>      if (this.fault.get() &amp;&amp; getPos() &gt;= faultPos) {<a name="line.764"></a>
+<span class="sourceLineNo">765</span>        throw new IOException("Fault injected");<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      }<a name="line.766"></a>
+<span class="sourceLineNo">767</span>    }<a name="line.767"></a>
+<span class="sourceLineNo">768</span>  }<a name="line.768"></a>
+<span class="sourceLineNo">769</span><a name="line.769"></a>
+<span class="sourceLineNo">770</span>  private static void flushStore(HStore store, long id) throws IOException {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>    StoreFlushContext storeFlushCtx = store.createFlushContext(id);<a name="line.771"></a>
+<span class="sourceLineNo">772</span>    storeFlushCtx.prepare();<a name="line.772"></a>
+<span class="sourceLineNo">773</span>    storeFlushCtx.flushCache(Mockito.mock(MonitoredTask.class));<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    storeFlushCtx.commit(Mockito.mock(MonitoredTask.class));<a name="line.774"></a>
+<span class="sourceLineNo">775</span>  }<a name="line.775"></a>
+<span class="sourceLineNo">776</span><a name="line.776"></a>
+<span class="sourceLineNo">777</span>  /**<a name="line.777"></a>
+<span class="sourceLineNo">778</span>   * Generate a list of KeyValues for testing based on given parameters<a name="line.778"></a>
+<span class="sourceLineNo">779</span>   * @param timestamps<a name="line.779"></a>
+<span class="sourceLineNo">780</span>   * @param numRows<a name="line.780"></a>
+<span class="sourceLineNo">781</span>   * @param qualifier<a name="line.781"></a>
+<span class="sourceLineNo">782</span>   * @param family<a name="line.782"></a>
+<span class="sourceLineNo">783</span>   * @return<a name="line.783"></a>
+<span class="sourceLineNo">784</span>   */<a name="line.784"></a>
+<span class="sourceLineNo">785</span>  List&lt;Cell&gt; getKeyValueSet(long[] timestamps, int numRows,<a name="line.785"></a>
+<span class="sourceLineNo">786</span>      byte[] qualifier, byte[] family) {<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    List&lt;Cell&gt; kvList = new ArrayList&lt;&gt;();<a name="line.787"></a>
+<span class="sourceLineNo">788</span>    for (int i=1;i&lt;=numRows;i++) {<a name="line.788"></a>
+<span class="sourceLineNo">789</span>      byte[] b = Bytes.toBytes(i);<a name="line.789"></a>
+<span class="sourceLineNo">790</span>      for (long timestamp: timestamps) {<a name="line.790"></a>
+<span class="sourceLineNo">791</span>        kvList.add(new KeyValue(b, family, qualifier, timestamp, b));<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      }<a name="line.792"></a>
+<span class="sourceLineNo">793</span>    }<a name="line.793"></a>
+<span class="sourceLineNo">794</span>    return kvList;<a name="line.794"></a>
+<span class="sourceLineNo">795</span>  }<a name="line.795"></a>
+<span class="sourceLineNo">796</span><a name="line.796"></a>
+<span class="sourceLineNo">797</span>  /**<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * Test to ensure correctness when using Stores with multiple timestamps<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * @throws IOException<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   */<a name="line.800"></a>
+<span class="sourceLineNo">801</span>  @Test<a name="line.801"></a>
+<span class="sourceLineNo">802</span>  public void testMultipleTimestamps() throws IOException {<a name="line.802"></a>
+<span class="sourceLineNo">803</span>    int numRows = 1;<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    long[] timestamps1 = new long[] {1,5,10,20};<a name="line.804"></a>
+<span class="sourceLineNo">805</span>    long[] timestamps2 = new long[] {30,80};<a name="line.805"></a>
 <span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    get.setTimeRange(80,145);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.808"></a>
-<span class="sourceLineNo">809</span>    assertTrue(result.size()&gt;0);<a name="line.809"></a>
-<span class="sourceLineNo">810</span><a name="line.810"></a>
-<span class="sourceLineNo">811</span>    get.setTimeRange(1,2);<a name="line.811"></a>
-<span class="sourceLineNo">812</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.812"></a>
-<span class="sourceLineNo">813</span>    assertTrue(result.size()&gt;0);<a name="line.813"></a>
-<span class="sourceLineNo">814</span><a name="line.814"></a>
-<span class="sourceLineNo">815</span>    get.setTimeRange(90,200);<a name="line.815"></a>
-<span class="sourceLineNo">816</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.816"></a>
-<span class="sourceLineNo">817</span>    assertTrue(result.size()==0);<a name="line.817"></a>
-<span class="sourceLineNo">818</span>  }<a name="line.818"></a>
-<span class="sourceLineNo">819</span><a name="line.819"></a>
-<span class="sourceLineNo">820</span>  /**<a name="line.820"></a>
-<span class="sourceLineNo">821</span>   * Test for HBASE-3492 - Test split on empty colfam (no store files).<a name="line.821"></a>
-<span class="sourceLineNo">822</span>   *<a name="line.822"></a>
-<span class="sourceLineNo">823</span>   * @throws IOException When the IO operations fail.<a name="line.823"></a>
-<span class="sourceLineNo">824</span>   */<a name="line.824"></a>
-<span class="sourceLineNo">825</span>  @Test<a name="line.825"></a>
-<span class="sourceLineNo">826</span>  public void testSplitWithEmptyColFam() throws IOException {<a name="line.826"></a>
-<span class="sourceLineNo">827</span>    init(this.name.getMethodName());<a name="line.827"></a>
-<span class="sourceLineNo">828</span>    assertFalse(store.getSplitPoint().isPresent());<a name="line.828"></a>
-<span class="sourceLineNo">829</span>    store.getHRegion().forceSplit(null);<a name="line.829"></a>
-<span class="sourceLineNo">830</span>    assertFalse(store.getSplitPoint().isPresent());<a name="line.830"></a>
-<span class="sourceLineNo">831</span>    store.getHRegion().clearSplit();<a name="line.831"></a>
-<span class="sourceLineNo">832</span>  }<a name="line.832"></a>
+<span class="sourceLineNo">807</span>    init(this.name.getMethodName());<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>    List&lt;Cell&gt; kvList1 = getKeyValueSet(timestamps1,numRows, qf1, family);<a name="line.809"></a>
+<span class="sourceLineNo">810</span>    for (Cell kv : kvList1) {<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      this.store.add(kv, null);<a name="line.811"></a>
+<span class="sourceLineNo">812</span>    }<a name="line.812"></a>
+<span class="sourceLineNo">813</span><a name="line.813"></a>
+<span class="sourceLineNo">814</span>    this.store.snapshot();<a name="line.814"></a>
+<span class="sourceLineNo">815</span>    flushStore(store, id++);<a name="line.815"></a>
+<span class="sourceLineNo">816</span><a name="line.816"></a>
+<span class="sourceLineNo">817</span>    List&lt;Cell&gt; kvList2 = getKeyValueSet(timestamps2,numRows, qf1, family);<a name="line.817"></a>
+<span class="sourceLineNo">818</span>    for(Cell kv : kvList2) {<a name="line.818"></a>
+<span class="sourceLineNo">819</span>      this.store.add(kv, null);<a name="line.819"></a>
+<span class="sourceLineNo">820</span>    }<a name="line.820"></a>
+<span class="sourceLineNo">821</span><a name="line.821"></a>
+<span class="sourceLineNo">822</span>    List&lt;Cell&gt; result;<a name="line.822"></a>
+<span class="sourceLineNo">823</span>    Get get = new Get(Bytes.toBytes(1));<a name="line.823"></a>
+<span class="sourceLineNo">824</span>    get.addColumn(family,qf1);<a name="line.824"></a>
+<span class="sourceLineNo">825</span><a name="line.825"></a>
+<span class="sourceLineNo">826</span>    get.setTimeRange(0,15);<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.827"></a>
+<span class="sourceLineNo">828</span>    assertTrue(result.size()&gt;0);<a name="line.828"></a>
+<span class="sourceLineNo">829</span><a name="line.829"></a>
+<span class="sourceLineNo">830</span>    get.setTimeRange(40,90);<a name="line.830"></a>
+<span class="sourceLineNo">831</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.831"></a>
+<span class="sourceLineNo">832</span>    assertTrue(result.size()&gt;0);<a name="line.832"></a>
 <span class="sourceLineNo">833</span><a name="line.833"></a>
-<span class="sourceLineNo">834</span>  @Test<a name="line.834"></a>
-<span class="sourceLineNo">835</span>  public void testStoreUsesConfigurationFromHcdAndHtd() throws Exception {<a name="line.835"></a>
-<span class="sourceLineNo">836</span>    final String CONFIG_KEY = "hbase.regionserver.thread.compaction.throttle";<a name="line.836"></a>
-<span class="sourceLineNo">837</span>    long anyValue = 10;<a name="line.837"></a>
-<span class="sourceLineNo">838</span><a name="line.838"></a>
-<span class="sourceLineNo">839</span>    // We'll check that it uses correct config and propagates it appropriately by going thru<a name="line.839"></a>
-<span class="sourceLineNo">840</span>    // the simplest "real" path I can find - "throttleCompaction", which just checks whether<a name="line.840"></a>
-<span class="sourceLineNo">841</span>    // a number we pass in is higher than some config value, inside compactionPolicy.<a name="line.841"></a>
-<span class="sourceLineNo">842</span>    Configuration conf = HBaseConfiguration.create();<a name="line.842"></a>
-<span class="sourceLineNo">843</span>    conf.setLong(CONFIG_KEY, anyValue);<a name="line.843"></a>
-<span class="sourceLineNo">844</span>    init(name.getMethodName() + "-xml", conf);<a name="line.844"></a>
-<span class="sourceLineNo">845</span>    assertTrue(store.throttleCompaction(anyValue + 1));<a name="line.845"></a>
-<span class="sourceLineNo">846</span>    assertFalse(store.throttleCompaction(anyValue));<a name="line.846"></a>
-<span class="sourceLineNo">847</span><a name="line.847"></a>
-<span class="sourceLineNo">848</span>    // HTD overrides XML.<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    --anyValue;<a name="line.849"></a>
-<span class="sourceLineNo">850</span>    init(name.getMethodName() + "-htd", conf, TableDescriptorBuilder<a name="line.850"></a>
-<span class="sourceLineNo">851</span>        .newBuilder(TableName.valueOf(table)).setValue(CONFIG_KEY, Long.toString(anyValue)),<a name="line.851"></a>
-<span class="sourceLineNo">852</span>      ColumnFamilyDescriptorBuilder.of(family));<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    assertTrue(store.throttleCompaction(anyValue + 1));<a name="line.853"></a>
-<span class="sourceLineNo">854</span>    assertFalse(store.throttleCompaction(anyValue));<a name="line.854"></a>
-<span class="sourceLineNo">855</span><a name="line.855"></a>
-<span class="sourceLineNo">856</span>    // HCD overrides them both.<a name="line.856"></a>
-<span class="sourceLineNo">857</span>    --anyValue;<a name="line.857"></a>
-<span class="sourceLineNo">858</span>    init(name.getMethodName() + "-hcd", conf,<a name="line.858"></a>
-<span class="sourceLineNo">859</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(table)).setValue(CONFIG_KEY,<a name="line.859"></a>
-<span class="sourceLineNo">860</span>        Long.toString(anyValue)),<a name="line.860"></a>
-<span class="sourceLineNo">861</span>      ColumnFamilyDescriptorBuilder.newBuilder(family).setValue(CONFIG_KEY, Long.toString(anyValue))<a name="line.861"></a>
-<span class="sourceLineNo">862</span>          .build());<a name="line.862"></a>
-<span class="sourceLineNo">863</span>    assertTrue(store.throttleCompaction(anyValue + 1));<a name="line.863"></a>
-<span class="sourceLineNo">864</span>    assertFalse(store.throttleCompaction(anyValue));<a name="line.864"></a>
-<span class="sourceLineNo">865</span>  }<a name="line.865"></a>
-<span class="sourceLineNo">866</span><a name="line.866"></a>
-<span class="sourceLineNo">867</span>  public static class DummyStoreEngine extends DefaultStoreEngine {<a name="line.867"></a>
-<span class="sourceLineNo">868</span>    public static DefaultCompactor lastCreatedCompactor = null;<a name="line.868"></a>
+<span class="sourceLineNo">834</span>    get.setTimeRange(10,45);<a name="line.834"></a>
+<span class="sourceLineNo">835</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    assertTrue(result.size()&gt;0);<a name="line.836"></a>
+<span class="sourceLineNo">837</span><a name="line.837"></a>
+<span class="sourceLineNo">838</span>    get.setTimeRange(80,145);<a name="line.838"></a>
+<span class="sourceLineNo">839</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.839"></a>
+<span class="sourceLineNo">840</span>    assertTrue(result.size()&gt;0);<a name="line.840"></a>
+<span class="sourceLineNo">841</span><a name="line.841"></a>
+<span class="sourceLineNo">842</span>    get.setTimeRange(1,2);<a name="line.842"></a>
+<span class="sourceLineNo">843</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.843"></a>
+<span class="sourceLineNo">844</span>    assertTrue(result.size()&gt;0);<a name="line.844"></a>
+<span class="sourceLineNo">845</span><a name="line.845"></a>
+<span class="sourceLineNo">846</span>    get.setTimeRange(90,200);<a name="line.846"></a>
+<span class="sourceLineNo">847</span>    result = HBaseTestingUtility.getFromStoreFile(store, get);<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    assertTrue(result.size()==0);<a name="line.848"></a>
+<span class="sourceLineNo">849</span>  }<a name="line.849"></a>
+<span class="sourceLineNo">850</span><a name="line.850"></a>
+<span class="sourceLineNo">851</span>  /**<a name="line.851"></a>
+<span class="sourceLineNo">852</span>   * Test for HBASE-3492 - Test split on empty colfam (no store files).<a name="line.852"></a>
+<span class="sourceLineNo">853</span>   *<a name="line.853"></a>
+<span class="sourceLineNo">854</span>   * @throws IOException When the IO operations fail.<a name="line.854"></a>
+<span class="sourceLineNo">855</span>   */<a name="line.855"></a>
+<span class="sourceLineNo">856</span>  @Test<a name="line.856"></a>
+<span class="sourceLineNo">857</span>  public void testSplitWithEmptyColFam() throws IOException {<a name="line.857"></a>
+<span class="sourceLineNo">858</span>    init(this.name.getMethodName());<a name="line.858"></a>
+<span class="sourceLineNo">859</span>    assertFalse(store.getSplitPoint().isPresent());<a name="line.859"></a>
+<span class="sourceLineNo">860</span>    store.getHRegion().forceSplit(null);<a name="line.860"></a>
+<span class="sourceLineNo">861</span>    assertFalse(store.getSplitPoint().isPresent());<a name="line.861"></a>
+<span class="sourceLineNo">862</span>    store.getHRegion().clearSplit();<a name="line.862"></a>
+<span class="sourceLineNo">863</span>  }<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>  @Test<a name="line.865"></a>
+<span class="sourceLineNo">866</span>  public void testStoreUsesConfigurationFromHcdAndHtd() throws Exception {<a name="line.866"></a>
+<span class="sourceLineNo">867</span>    final String CONFIG_KEY = "hbase.regionserver.thread.compaction.throttle";<a name="line.867"></a>
+<span class="sourceLineNo">868</span>    long anyValue = 10;<a name="line.868"></a>
 <span class="sourceLineNo">869</span><a name="line.869"></a>
-<span class="sourceLineNo">870</span>    @Override<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    protected void createComponents(Configuration conf, HStore store, CellComparator comparator)<a name="line.871"></a>
-<span class="sourceLineNo">872</span>        throws IOException {<a name="line.872"></a>
-<span class="sourceLineNo">873</span>      super.createComponents(conf, store, comparator);<a name="line.873"></a>
-<span class="sourceLineNo">874</span>      lastCreatedCompactor = this.compactor;<a name="line.874"></a>
-<span class="sourceLineNo">875</span>    }<a name="line.875"></a>
-<span class="sourceLineNo">876</span>  }<a name="line.876"></a>
-<span class="sourceLineNo">877</span><a name="line.877"></a>
-<span class="sourceLineNo">878</span>  @Test<a name="line.878"></a>
-<span class="sourceLineNo">879</span>  public void testStoreUsesSearchEngineOverride() throws Exception {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>    Configuration conf = HBaseConfiguration.create();<a name="line.880"></a>
-<span class="sourceLineNo">881</span>    conf.set(StoreEngine.STORE_ENGINE_CLASS_KEY, DummyStoreEngine.class.getName());<a name="line.881"></a>
-<span class="sourceLineNo">882</span>    init(this.name.getMethodName(), conf);<a name="line.882"></a>
-<span class="sourceLineNo">883</span>    assertEquals(DummyStoreEngine.lastCreatedCompactor,<a name="line.883"></a>
-<span class="sourceLineNo">884</span>      this.store.storeEngine.getCompactor());<a name="line.884"></a>
-<span class="sourceLineNo">885</span>  }<a name="line.885"></a>
+<span class="sourceLineNo">870</span>    // We'll check that it uses correct config and propagates it appropriately by going thru<a name="line.870"></a>
+<span class="sourceLineNo">871</span>    // the simplest "real" path I can find - "throttleCompaction", which just checks whether<a name="line.871"></a>
+<span class="sourceLineNo">872</span>    // a number we pass in is higher than some config value, inside compactionPolicy.<a name="line.872"></a>
+<span class="sourceLineNo">873</span>    Configuration conf = HBaseConfiguration.create();<a name="line.873"></a>
+<span class="sourceLineNo">874</span>    conf.setLong(CONFIG_KEY, anyValue);<a name="line.874"></a>
+<span class="sourceLineNo">875</span>    init(name.getMethodName() + "-xml", conf);<a name="line.875"></a>
+<span class="sourceLineNo">876</span>    assertTrue(store.throttleCompaction(anyValue + 1));<a name="line.876"></a>
+<span class="sourceLineNo">877</span>    assertFalse(store.throttleCompaction(anyValue));<a name="line.877"></a>
+<span class="sourceLineNo">878</span><a name="line.878"></a>
+<span class="sourceLineNo">879</span>    // HTD overrides XML.<a name="line.879"></a>
+<span class="sourceLineNo">880</span>    --anyValue;<a name="line.880"></a>
+<span class="sourceLineNo">881</span>    init(name.getMethodName() + "-htd", conf, TableDescriptorBuilder<a name="line.881"></a>
+<span class="sourceLineNo">882</span>        .newBuilder(TableName.valueOf(table)).setValue(CONFIG_KEY, Long.toString(anyValue)),<a name="line.882"></a>
+<span class="sourceLineNo">883</span>      ColumnFamilyDescriptorBuilder.of(family));<a name="line.883"></a>
+<span class="sourceLineNo">884</span>    assertTrue(store.throttleCompaction(anyValue + 1));<a name="line.884"></a>
+<span class="sourceLineNo">885</span>    assertFalse(store.throttleCompaction(anyValue));<a name="line.885"></a>
 <span class="sourceLineNo">886</span><a name="line.886"></a>
-<span class="sourceLineNo">887</span>  private void addStoreFile() throws IOException {<a name="line.887"></a>
-<span class="sourceLineNo">888</span>    HStoreFile f = this.store.getStorefiles().iterator().next();<a name="line.888"></a>
-<span class="sourceLineNo">889</span>    Path storedir = f.getPath().getParent();<a name="line.889"></a>
-<span class="sourceLineNo">890</span>    long seqid = this.store.getMaxSequenceId().orElse(0L);<a name="line.890"></a>
-<span class="sourceLineNo">891</span>    Configuration c = TEST_UTIL.getConfiguration();<a name="line.891"></a>
-<span class="sourceLineNo">892</span>    FileSystem fs = FileSystem.get(c);<a name="line.892"></a>
-<span class="sourceLineNo">893</span>    HFileContext fileContext = new HFileContextBuilder().withBlockSize(BLOCKSIZE_SMALL).build();<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    StoreFileWriter w = new StoreFileWriter.Builder(c, new CacheConfig(c),<a name="line.894"></a>
-<span class="sourceLineNo">895</span>        fs)<a name="line.895"></a>
-<span class="sourceLineNo">896</span>            .withOutputDir(storedir)<a name="line.896"></a>
-<span class="sourceLineNo">897</span>            .withFileContext(fileContext)<a name="line.897"></a>
-<span class="sourceLineNo">898</span>            .build();<a name="line.898"></a>
-<span class="sourceLineNo">899</span>    w.appendMetadata(seqid + 1, false);<a name="line.899"></a>
-<span class="sourceLineNo">900</span>    w.close();<a name="line.900"></a>
-<span class="sourceLineNo">901</span>    LOG.info("Added store file:" + w.getPath());<a name="line.901"></a>
-<span class="sourceLineNo">902</span>  }<a name="line.902"></a>
-<span class="sourceLineNo">903</span><a name="line.903"></a>
-<span class="sourceLineNo">904</span>  private void archiveStoreFile(int index) throws IOException {<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    Collection&lt;HStoreFile&gt; files = this.store.getStorefiles();<a name="line.905"></a>
-<span class="sourceLineNo">906</span>    HStoreFile sf = null;<a name="line.906"></a>
-<span class="sourceLineNo">907</span>    Iterator&lt;HStoreFile&gt; it = files.iterator();<a name="line.907"></a>
-<span class="sourceLineNo">908</span>    for (int i = 0; i &lt;= index; i++) {<a name="line.908"></a>
-<span class="sourceLineNo">909</span>      sf = it.next();<a name="line.909"></a>
-<span class="sourceLineNo">910</span>    }<a name="line.910"></a>
-<span class="sourceLineNo">911</span>    store.getRegionFileSystem().removeStoreFiles(store.getColumnFamilyName(), Lists.newArrayList(sf));<a name="line.911"></a>
-<span class="sourceLineNo">912</span>  }<a name="line.912"></a>
-<span class="sourceLineNo">913</span><a name="line.913"></a>
-<span class="sourceLineNo">914</span>  private void closeCompactedFile(int index) throws IOException {<a name="line.914"></a>
-<span class="sourceLineNo">915</span>    Collection&lt;HStoreFile&gt; files =<a name="line.915"></a>
-<span class="sourceLineNo">916</span>        this.store.getStoreEngine().getStoreFileManager().getCompactedfiles();<a name="line.916"></a>
-<span class="sourceLineNo">917</span>    HStoreFile sf = null;<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    Iterator&lt;HStoreFile&gt; it = files.iterator();<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    for (int i = 0; i &lt;= index; i++) {<a name="line.919"></a>
-<span class="sourceLineNo">920</span>      sf = it.next();<a name="line.920"></a>
-<span class="sourceLineNo">921</span>    }<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    sf.closeStoreFile(true);<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    store.getStoreEngine().getStoreFileManager().removeCompactedFiles(Lists.newArrayList(sf));<a name="line.923"></a>
-<span class="sourceLineNo">924</span>  }<a name="line.924"></a>
-<span class="sourceLineNo">925</span><a name="line.925"></a>
-<span class="sourceLineNo">926</span>  @Test<a name="line.926"></a>
-<span class="sourceLineNo">927</span>  public void testRefreshStoreFiles() throws Exception {<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    init(name.getMethodName());<a name="line.928"></a>
-<span class="sourceLineNo">929</span><a name="line.929"></a>
-<span class="sourceLineNo">930</span>    assertEquals(0, this.store.getStorefilesCount());<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span>    // Test refreshing store files when no store files are there<a name="line.932"></a>
-<span class="sourceLineNo">933</span>    store.refreshStoreFiles();<a name="line.933"></a>
-<span class="sourceLineNo">934</span>    assertEquals(0, this.store.getStorefilesCount());<a name="line.934"></a>
-<span class="sourceLineNo">935</span><a name="line.935"></a>
-<span class="sourceLineNo">936</span>    // add some data, flush<a name="line.936"></a>
-<span class="sourceLineNo">937</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.937"></a>
-<span class="sourceLineNo">938</span>    flush(1);<a name="line.938"></a>
-<span class="sourceLineNo">939</span>    assertEquals(1, this.store.getStorefilesCount());<a name="line.939"></a>
-<span class="sourceLineNo">940</span><a name="line.940"></a>
-<span class="sourceLineNo">941</span>    // add one more file<a name="line.941"></a>
-<span class="sourceLineNo">942</span>    addStoreFile();<a name="line.942"></a>
-<span class="sourceLineNo">943</span><a name="line.943"></a>
-<span class="sourceLineNo">944</span>    assertEquals(1, this.store.getStorefilesCount());<a name="line.944"></a>
-<span class="sourceLineNo">945</span>    store.refreshStoreFiles();<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    assertEquals(2, this.store.getStorefilesCount());<a name="line.946"></a>
-<span class="sourceLineNo">947</span><a name="line.947"></a>
-<span class="sourceLineNo">948</span>    // add three more files<a name="line.948"></a>
-<span class="sourceLineNo">949</span>    addStoreFile();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>    addStoreFile();<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    addStoreFile();<a name="line.951"></a>
-<span class="sourceLineNo">952</span><a name="line.952"></a>
-<span class="sourceLineNo">953</span>    assertEquals(2, this.store.getStorefilesCount());<a name="line.953"></a>
-<span class="sourceLineNo">954</span>    store.refreshStoreFiles();<a name="line.954"></a>
-<span class="sourceLineNo">955</span>    assertEquals(5, this.store.getStorefilesCount());<a name="line.955"></a>
+<span class="sourceLineNo">887</span>    // HCD overrides them both.<a name="line.887"></a>
+<span class="sourceLineNo">888</span>    --anyValue;<a name="line.888"></a>
+<span class="sourceLineNo">889</span>    init(name.getMethodName() + "-hcd", conf,<a name="line.889"></a>
+<span class="sourceLineNo">890</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(table)).setValue(CONFIG_KEY,<a name="line.890"></a>
+<span class="sourceLineNo">891</span>        Long.toString(anyValue)),<a name="line.891"></a>
+<span class="sourceLineNo">892</span>      ColumnFamilyDescriptorBuilder.newBuilder(family).setValue(CONFIG_KEY, Long.toString(anyValue))<a name="line.892"></a>
+<span class="sourceLineNo">893</span>          .build());<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    assertTrue(store.throttleCompaction(anyValue + 1));<a name="line.894"></a>
+<span class="sourceLineNo">895</span>    assertFalse(store.throttleCompaction(anyValue));<a name="line.895"></a>
+<span class="sourceLineNo">896</span>  }<a name="line.896"></a>
+<span class="sourceLineNo">897</span><a name="line.897"></a>
+<span class="sourceLineNo">898</span>  public static class DummyStoreEngine extends DefaultStoreEngine {<a name="line.898"></a>
+<span class="sourceLineNo">899</span>    public static DefaultCompactor lastCreatedCompactor = null;<a name="line.899"></a>
+<span class="sourceLineNo">900</span><a name="line.900"></a>
+<span class="sourceLineNo">901</span>    @Override<a name="line.901"></a>
+<span class="sourceLineNo">902</span>    protected void createComponents(Configuration conf, HStore store, CellComparator comparator)<a name="line.902"></a>
+<span class="sourceLineNo">903</span>        throws IOException {<a name="line.903"></a>
+<span class="sourceLineNo">904</span>      super.createComponents(conf, store, comparator);<a name="line.904"></a>
+<span class="sourceLineNo">905</span>      lastCreatedCompactor = this.compactor;<a name="line.905"></a>
+<span class="sourceLineNo">906</span>    }<a name="line.906"></a>
+<span class="sourceLineNo">907</span>  }<a name="line.907"></a>
+<span class="sourceLineNo">908</span><a name="line.908"></a>
+<span class="sourceLineNo">909</span>  @Test<a name="line.909"></a>
+<span class="sourceLineNo">910</span>  public void testStoreUsesSearchEngineOverride() throws Exception {<a name="line.910"></a>
+<span class="sourceLineNo">911</span>    Configuration conf = HBaseConfiguration.create();<a name="line.911"></a>
+<span class="sourceLineNo">912</span>    conf.set(StoreEngine.STORE_ENGINE_CLASS_KEY, DummyStoreEngine.class.getName());<a name="line.912"></a>
+<span class="sourceLineNo">913</span>    init(this.name.getMethodName(), conf);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    assertEquals(DummyStoreEngine.lastCreatedCompactor,<a name="line.914"></a>
+<span class="sourceLineNo">915</span>      this.store.storeEngine.getCompactor());<a name="line.915"></a>
+<span class="sourceLineNo">916</span>  }<a name="line.916"></a>
+<span class="sourceLineNo">917</span><a name="line.917"></a>
+<span class="sourceLineNo">918</span>  private void addStoreFile() throws IOException {<a name="line.918"></a>
+<span class="sourceLineNo">919</span>    HStoreFile f = this.store.getStorefiles().iterator().next();<a name="line.919"></a>
+<span class="sourceLineNo">920</span>    Path storedir = f.getPath().getParent();<a name="line.920"></a>
+<span class="sourceLineNo">921</span>    long seqid = this.store.getMaxSequenceId().orElse(0L);<a name="line.921"></a>
+<span class="sourceLineNo">922</span>    Configuration c = TEST_UTIL.getConfiguration();<a name="line.922"></a>
+<span class="sourceLineNo">923</span>    FileSystem fs = FileSystem.get(c);<a name="line.923"></a>
+<span class="sourceLineNo">924</span>    HFileContext fileContext = new HFileContextBuilder().withBlockSize(BLOCKSIZE_SMALL).build();<a name="line.924"></a>
+<span class="sourceLineNo">925</span>    StoreFileWriter w = new StoreFileWriter.Builder(c, new CacheConfig(c),<a name="line.925"></a>
+<span class="sourceLineNo">926</span>        fs)<a name="line.926"></a>
+<span class="sourceLineNo">927</span>            .withOutputDir(storedir)<a name="line.927"></a>
+<span class="sourceLineNo">928</span>            .withFileContext(fileContext)<a name="line.928"></a>
+<span class="sourceLineNo">929</span>            .build();<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    w.appendMetadata(seqid + 1, false);<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    w.close();<a name="line.931"></a>
+<span class="sourceLineNo">932</span>    LOG.info("Added store file:" + w.getPath());<a name="line.932"></a>
+<span class="sourceLineNo">933</span>  }<a name="line.933"></a>
+<span class="sourceLineNo">934</span><a name="line.934"></a>
+<span class="sourceLineNo">935</span>  private void archiveStoreFile(int index) throws IOException {<a name="line.935"></a>
+<span class="sourceLineNo">936</span>    Collection&lt;HStoreFile&gt; files = this.store.getStorefiles();<a name="line.936"></a>
+<span class="sourceLineNo">937</span>    HStoreFile sf = null;<a name="line.937"></a>
+<span class="sourceLineNo">938</span>    Iterator&lt;HStoreFile&gt; it = files.iterator();<a name="line.938"></a>
+<span class="sourceLineNo">939</span>    for (int i = 0; i &lt;= index; i++) {<a name="line.939"></a>
+<span class="sourceLineNo">940</span>      sf = it.next();<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    }<a name="line.941"></a>
+<span class="sourceLineNo">942</span>    store.getRegionFileSystem().removeStoreFiles(store.getColumnFamilyName(), Lists.newArrayList(sf));<a name="line.942"></a>
+<span class="sourceLineNo">943</span>  }<a name="line.943"></a>
+<span class="sourceLineNo">944</span><a name="line.944"></a>
+<span class="sourceLineNo">945</span>  private void closeCompactedFile(int index) throws IOException {<a name="line.945"></a>
+<span class="sourceLineNo">946</span>    Collection&lt;HStoreFile&gt; files =<a name="line.946"></a>
+<span class="sourceLineNo">947</span>        this.store.getStoreEngine().getStoreFileManager().getCompactedfiles();<a name="line.947"></a>
+<span class="sourceLineNo">948</span>    HStoreFile sf = null;<a name="line.948"></a>
+<span class="sourceLineNo">949</span>    Iterator&lt;HStoreFile&gt; it = files.iterator();<a name="line.949"></a>
+<span class="sourceLineNo">950</span>    for (int i = 0; i &lt;= index; i++) {<a name="line.950"></a>
+<span class="sourceLineNo">951</span>      sf = it.next();<a name="line.951"></a>
+<span class="sourceLineNo">952</span>    }<a name="line.952"></a>
+<span class="sourceLineNo">953</span>    sf.closeStoreFile(true);<a name="line.953"></a>
+<span class="sourceLineNo">954</span>    store.getStoreEngine().getStoreFileManager().removeCompactedFiles(Lists.newArrayList(sf));<a name="line.954"></a>
+<span class="sourceLineNo">955</span>  }<a name="line.955"></a>
 <span class="sourceLineNo">956</span><a name="line.956"></a>
-<span class="sourceLineNo">957</span>    closeCompactedFile(0);<a name="line.957"></a>
-<span class="sourceLineNo">958</span>    archiveStoreFile(0);<a name="line.958"></a>
-<span class="sourceLineNo">959</span><a name="line.959"></a>
-<span class="sourceLineNo">960</span>    assertEquals(5, this.store.getStorefilesCount());<a name="line.960"></a>
-<span class="sourceLineNo">961</span>    store.refreshStoreFiles();<a name="line.961"></a>
-<span class="sourceLineNo">962</span>    assertEquals(4, this.store.getStorefilesCount());<a name="line.962"></a>
-<span class="sourceLineNo">963</span><a name="line.963"></a>
-<span class="sourceLineNo">964</span>    archiveStoreFile(0);<a name="line.964"></a>
-<span class="sourceLineNo">965</span>    archiveStoreFile(1);<a name="line.965"></a>
-<span class="sourceLineNo">966</span>    archiveStoreFile(2);<a name="line.966"></a>
-<span class="sourceLineNo">967</span><a name="line.967"></a>
-<span class="sourceLineNo">968</span>    assertEquals(4, this.store.getStorefilesCount());<a name="line.968"></a>
-<span class="sourceLineNo">969</span>    store.refreshStoreFiles();<a name="line.969"></a>
+<span class="sourceLineNo">957</span>  @Test<a name="line.957"></a>
+<span class="sourceLineNo">958</span>  public void testRefreshStoreFiles() throws Exception {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>    init(name.getMethodName());<a name="line.959"></a>
+<span class="sourceLineNo">960</span><a name="line.960"></a>
+<span class="sourceLineNo">961</span>    assertEquals(0, this.store.getStorefilesCount());<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span>    // Test refreshing store files when no store files are there<a name="line.963"></a>
+<span class="sourceLineNo">964</span>    store.refreshStoreFiles();<a name="line.964"></a>
+<span class="sourceLineNo">965</span>    assertEquals(0, this.store.getStorefilesCount());<a name="line.965"></a>
+<span class="sourceLineNo">966</span><a name="line.966"></a>
+<span class="sourceLineNo">967</span>    // add some data, flush<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    flush(1);<a name="line.969"></a>
 <span class="sourceLineNo">970</span>    assertEquals(1, this.store.getStorefilesCount());<a name="line.970"></a>
 <span class="sourceLineNo">971</span><a name="line.971"></a>
-<span class="sourceLineNo">972</span>    archiveStoreFile(0);<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    store.refreshStoreFiles();<a name="line.973"></a>
-<span class="sourceLineNo">974</span>    assertEquals(0, this.store.getStorefilesCount());<a name="line.974"></a>
-<span class="sourceLineNo">975</span>  }<a name="line.975"></a>
-<span class="sourceLineNo">976</span><a name="line.976"></a>
-<span class="sourceLineNo">977</span>  @SuppressWarnings("unchecked")<a name="line.977"></a>
-<span class="sourceLineNo">978</span>  @Test<a name="line.978"></a>
-<span class="sourceLineNo">979</span>  public void testRefreshStoreFilesNotChanged() throws IOException {<a name="line.979"></a>
-<span class="sourceLineNo">980</span>    init(name.getMethodName());<a name="line.980"></a>
-<span class="sourceLineNo">981</span><a name="line.981"></a>
-<span class="sourceLineNo">982</span>    assertEquals(0, this.store.getStorefilesCount());<a name="line.982"></a>
+<span class="sourceLineNo">972</span>    // add one more file<a name="line.972"></a>
+<span class="sourceLineNo">973</span>    addStoreFile();<a name="line.973"></a>
+<span class="sourceLineNo">974</span><a name="line.974"></a>
+<span class="sourceLineNo">975</span>    assertEquals(1, this.store.getStorefilesCount());<a name="line.975"></a>
+<span class="sourceLineNo">976</span>    store.refreshStoreFiles();<a name="line.976"></a>
+<span class="sourceLineNo">977</span>    assertEquals(2, this.store.getStorefilesCount());<a name="line.977"></a>
+<span class="sourceLineNo">978</span><a name="line.978"></a>
+<span class="sourceLineNo">979</span>    // add three more files<a name="line.979"></a>
+<span class="sourceLineNo">980</span>    addStoreFile();<a name="line.980"></a>
+<span class="sourceLineNo">981</span>    addStoreFile();<a name="line.981"></a>
+<span class="sourceLineNo">982</span>    addStoreFile();<a name="line.982"></a>
 <span class="sourceLineNo">983</span><a name="line.983"></a>
-<span class="sourceLineNo">984</span>    // add some data, flush<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);<a name="line.985"></a>
-<span class="sourceLineNo">986</span>    flush(1);<a name="line.986"></a>
-<span class="sourceLineNo">987</span>    // add one more file<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    addStoreFile();<a name="line.988"></a>
-<span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    HStore spiedStore = spy(store);<a name="line.990"></a>
-<span class="sourceLineNo">991</span><a name="line.991"></a>
-<span class="sourceLineNo">992</span>    // call first time after files changed<a name="line.992"></a>
-<span class="sourceLineNo">993</span>    spiedStore.refreshStoreFiles();<a name="line.993"></a>
-<span class="sourceLineNo">994</span>    assertEquals(2, this.store.getStorefilesCount());<a name="line.994"></a>
-<span class="sourceLineNo">995</span>    verify(spiedStore, times(1)).replaceStoreFiles(any(Collection.class), any(Collection.class));<a name="line.995"></a>
-<span class="sourceLineNo">996</span><a name="line.996"></a>
-<span class="sourceLineNo">99

<TRUNCATED>

Mime
View raw message