Repository: hbase Updated Branches: refs/heads/master 705b3fa98 -> 0b799fdbf
http://git-wip-us.apache.org/repos/asf/hbase/blob/0b799fdb/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java index 739519f..aae04df 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java @@ -135,11 +135,11 @@ public class TestHeapMemoryManager { final ChoreService choreService = new ChoreService("TEST_SERVER_NAME"); heapMemoryManager.start(choreService); memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_HIGHER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_LOWER_MARK; - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up Thread.sleep(1500); // No changes should be made by tuner as we already have lot of empty space @@ -178,10 +178,10 @@ public class TestHeapMemoryManager { // do some offheap flushes also. So there should be decrease in memstore but // not as that when we don't have offheap flushes memStoreFlusher.flushType = FlushType.ABOVE_OFFHEAP_HIGHER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up waitForTune(memStoreFlusher, memStoreFlusher.memstoreSize); assertHeapSpaceDelta(-maxStepValue, oldMemstoreHeapSize, memStoreFlusher.memstoreSize); @@ -226,10 +226,10 @@ public class TestHeapMemoryManager { // do some offheap flushes also. So there should be decrease in memstore but // not as that when we don't have offheap flushes memStoreFlusher.flushType = FlushType.ABOVE_OFFHEAP_HIGHER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up waitForTune(memStoreFlusher, memStoreFlusher.memstoreSize); assertHeapSpaceDelta(-maxStepValue, oldMemstoreHeapSize, memStoreFlusher.memstoreSize); @@ -242,10 +242,10 @@ public class TestHeapMemoryManager { // flushes are due to onheap overhead. This should once again call for increase in // memstore size but that increase should be to the safe size memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_HIGHER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up waitForTune(memStoreFlusher, memStoreFlusher.memstoreSize); assertHeapSpaceDelta(maxStepValue, oldMemstoreHeapSize, memStoreFlusher.memstoreSize); @@ -308,10 +308,10 @@ public class TestHeapMemoryManager { final ChoreService choreService = new ChoreService("TEST_SERVER_NAME"); heapMemoryManager.start(choreService); memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_LOWER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up waitForTune(memStoreFlusher, memStoreFlusher.memstoreSize); assertHeapSpaceDelta(DefaultHeapMemoryTuner.DEFAULT_MAX_STEP_VALUE, oldMemstoreHeapSize, @@ -322,8 +322,8 @@ public class TestHeapMemoryManager { oldBlockCacheSize = blockCache.maxSize; // Do some more flushes before the next run of HeapMemoryTuner memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_LOWER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up waitForTune(memStoreFlusher, memStoreFlusher.memstoreSize); assertHeapSpaceDelta(DefaultHeapMemoryTuner.DEFAULT_MAX_STEP_VALUE, oldMemstoreHeapSize, @@ -357,10 +357,10 @@ public class TestHeapMemoryManager { heapMemoryManager.start(choreService); // this should not change anything with onheap memstore memStoreFlusher.flushType = FlushType.ABOVE_OFFHEAP_HIGHER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up Thread.sleep(1500); // No changes should be made by tuner as we already have lot of empty space @@ -444,9 +444,9 @@ public class TestHeapMemoryManager { final ChoreService choreService = new ChoreService("TEST_SERVER_NAME"); heapMemoryManager.start(choreService); memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_LOWER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); blockCache.evictBlock(null); // Allow the tuner to run once and do necessary memory up Thread.sleep(1500); @@ -455,9 +455,9 @@ public class TestHeapMemoryManager { assertEquals(oldBlockCacheSize, blockCache.maxSize); // Do some more flushes before the next run of HeapMemoryTuner memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_LOWER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); // Allow the tuner to run once and do necessary memory up waitForTune(memStoreFlusher, memStoreFlusher.memstoreSize); assertHeapSpaceDelta(DefaultHeapMemoryTuner.DEFAULT_MAX_STEP_VALUE, oldMemstoreHeapSize, @@ -490,9 +490,9 @@ public class TestHeapMemoryManager { final ChoreService choreService = new ChoreService("TEST_SERVER_NAME"); heapMemoryManager.start(choreService); memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_LOWER_MARK; - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); blockCache.evictBlock(null); blockCache.evictBlock(null); // Allow the tuner to run once and do necessary memory up @@ -502,7 +502,7 @@ public class TestHeapMemoryManager { assertEquals(oldBlockCacheSize, blockCache.maxSize); // Flushes that block updates memStoreFlusher.flushType = FlushType.ABOVE_ONHEAP_HIGHER_MARK; - memStoreFlusher.requestFlush(null, false); + memStoreFlusher.requestFlush(null, false, FlushLifeCycleTracker.DUMMY); blockCache.evictBlock(null); blockCache.evictBlock(null); blockCache.evictBlock(null); @@ -805,7 +805,8 @@ public class TestHeapMemoryManager { } @Override - public void requestFlush(HRegion region, boolean forceFlushAllStores) { + public void requestFlush(HRegion region, boolean forceFlushAllStores, + FlushLifeCycleTracker tracker) { this.listener.flushRequested(flushType, region); } http://git-wip-us.apache.org/repos/asf/hbase/blob/0b799fdb/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java index 40abf79..99cf91d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java @@ -31,20 +31,20 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.DroppedSnapshotException; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.monitoring.MonitoredTask; -import org.apache.hadoop.hbase.regionserver.HRegion.PrepareFlushResult; import org.apache.hadoop.hbase.regionserver.HRegion.FlushResult; +import org.apache.hadoop.hbase.regionserver.HRegion.PrepareFlushResult; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -83,7 +83,8 @@ public class TestSplitWalDataLoss { testUtil.startMiniCluster(2); Admin admin = testUtil.getAdmin(); admin.createNamespace(namespace); - admin.createTable(new HTableDescriptor(tableName).addFamily(new HColumnDescriptor(family))); + admin.createTable(TableDescriptorBuilder.newBuilder(tableName) + .addColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build()); testUtil.waitTableAvailable(tableName); } @@ -136,7 +137,7 @@ public class TestSplitWalDataLoss { long oldestSeqIdOfStore = region.getOldestSeqIdOfStore(family); LOG.info("CHANGE OLDEST " + oldestSeqIdOfStore); assertTrue(oldestSeqIdOfStore > HConstants.NO_SEQNUM); - rs.cacheFlusher.requestFlush(spiedRegion, false); + rs.cacheFlusher.requestFlush(spiedRegion, false, FlushLifeCycleTracker.DUMMY); synchronized (flushed) { while (!flushed.booleanValue()) { flushed.wait(); http://git-wip-us.apache.org/repos/asf/hbase/blob/0b799fdb/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java index e420959..3f6fa3b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java @@ -72,6 +72,7 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.monitoring.MonitoredTask; import org.apache.hadoop.hbase.regionserver.DefaultStoreEngine; import org.apache.hadoop.hbase.regionserver.DefaultStoreFlusher; +import org.apache.hadoop.hbase.regionserver.FlushLifeCycleTracker; import org.apache.hadoop.hbase.regionserver.FlushRequestListener; import org.apache.hadoop.hbase.regionserver.FlushRequester; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -650,15 +651,16 @@ public abstract class AbstractTestWALReplay { public CustomStoreFlusher(Configuration conf, HStore store) { super(conf, store); } + @Override public List<Path> flushSnapshot(MemStoreSnapshot snapshot, long cacheFlushId, - MonitoredTask status, ThroughputController throughputController) throws IOException { + MonitoredTask status, ThroughputController throughputController, + FlushLifeCycleTracker tracker) throws IOException { if (throwExceptionWhenFlushing.get()) { throw new IOException("Simulated exception by tests"); } - return super.flushSnapshot(snapshot, cacheFlushId, status, throughputController); + return super.flushSnapshot(snapshot, cacheFlushId, status, throughputController, tracker); } - }; /** @@ -831,16 +833,14 @@ public abstract class AbstractTestWALReplay { WAL newWal = createWAL(newConf, hbaseRootDir, logName); final AtomicInteger flushcount = new AtomicInteger(0); try { - final HRegion region = - new HRegion(basedir, newWal, newFS, newConf, hri, htd, null) { + final HRegion region = new HRegion(basedir, newWal, newFS, newConf, hri, htd, null) { @Override protected FlushResultImpl internalFlushcache(final WAL wal, final long myseqid, final Collection<HStore> storesToFlush, MonitoredTask status, - boolean writeFlushWalMarker) - throws IOException { + boolean writeFlushWalMarker, FlushLifeCycleTracker tracker) throws IOException { LOG.info("InternalFlushCache Invoked"); FlushResultImpl fs = super.internalFlushcache(wal, myseqid, storesToFlush, - Mockito.mock(MonitoredTask.class), writeFlushWalMarker); + Mockito.mock(MonitoredTask.class), writeFlushWalMarker, tracker); flushcount.incrementAndGet(); return fs; } @@ -1117,7 +1117,7 @@ public abstract class AbstractTestWALReplay { private HRegion r; @Override - public void requestFlush(HRegion region, boolean force) { + public void requestFlush(HRegion region, boolean force, FlushLifeCycleTracker tracker) { try { r.flush(force); } catch (IOException e) { @@ -1127,8 +1127,6 @@ public abstract class AbstractTestWALReplay { @Override public void requestDelayedFlush(HRegion region, long when, boolean forceFlushAllStores) { - // TODO Auto-generated method stub - } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/0b799fdb/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java index 276487a..d196b64 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java @@ -112,6 +112,7 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessControlService; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.CheckPermissionsRequest; +import org.apache.hadoop.hbase.regionserver.FlushLifeCycleTracker; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost; @@ -807,7 +808,8 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction action = new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preFlush(ObserverContextImpl.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preFlush(ObserverContextImpl.createAndPrepare(RCP_ENV), + FlushLifeCycleTracker.DUMMY); return null; } }; http://git-wip-us.apache.org/repos/asf/hbase/blob/0b799fdb/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java index 724641f..3cab572 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java @@ -58,6 +58,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment; import org.apache.hadoop.hbase.filter.BinaryComparator; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; +import org.apache.hadoop.hbase.regionserver.FlushLifeCycleTracker; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost; @@ -814,7 +815,8 @@ public class TestWithDisabledAuthorization extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - ACCESS_CONTROLLER.preFlush(ObserverContextImpl.createAndPrepare(RCP_ENV)); + ACCESS_CONTROLLER.preFlush(ObserverContextImpl.createAndPrepare(RCP_ENV), + FlushLifeCycleTracker.DUMMY); return null; } }, SUPERUSER, USER_ADMIN, USER_RW, USER_RO, USER_OWNER, USER_CREATE, USER_QUAL, USER_NONE); http://git-wip-us.apache.org/repos/asf/hbase/blob/0b799fdb/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java index c67d7bf..6224495 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java @@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.regionserver.DelegatingInternalScanner; +import org.apache.hadoop.hbase.regionserver.FlushLifeCycleTracker; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.regionserver.RegionScanner; @@ -311,7 +312,7 @@ public class TestCoprocessorScanPolicy { @Override public InternalScanner preFlush(ObserverContext<RegionCoprocessorEnvironment> c, Store store, - InternalScanner scanner) throws IOException { + InternalScanner scanner, FlushLifeCycleTracker tracker) throws IOException { return wrap(store, scanner); }
