http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java index a497bf4..59a0c31 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java @@ -71,7 +71,7 @@ public class TestRegionReplicas { private static final int NB_SERVERS = 1; private static Table table; - private static final byte[] row = "TestRegionReplicas".getBytes(); + private static final byte[] row = Bytes.toBytes("TestRegionReplicas"); private static HRegionInfo hriPrimary; private static HRegionInfo hriSecondary;
http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.java index d1bf773..9a02a9d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.java @@ -111,7 +111,7 @@ public class TestRegionReplicasWithModifyTable { List<HRegion> onlineRegions2 = getSecondaryRS().getRegions(tableName); List<HRegion> onlineRegions3 = getTertiaryRS().getRegions(tableName); int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); - assertEquals("the number of regions should be more than 1", totalRegions, 3); + assertEquals("the number of regions should be more than 1", 3, totalRegions); } finally { disableAndDeleteTable(tableName); } @@ -132,7 +132,7 @@ public class TestRegionReplicasWithModifyTable { List<HRegion> onlineRegions2 = getSecondaryRS().getRegions(tableName); List<HRegion> onlineRegions3 = getTertiaryRS().getRegions(tableName); int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); - assertEquals("the number of regions should be equal to 30", totalRegions, 30); + assertEquals("the number of regions should be equal to 30", 30, totalRegions); } finally { disableAndDeleteTable(tableName); } @@ -148,7 +148,7 @@ public class TestRegionReplicasWithModifyTable { List<HRegion> onlineRegions2 = getSecondaryRS().getRegions(tableName); List<HRegion> onlineRegions3 = getTertiaryRS().getRegions(tableName); int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); - assertEquals("the number of regions should be 3", totalRegions, 3); + assertEquals("the number of regions should be 3", 3, totalRegions); } finally { disableAndDeleteTable(tableName); } @@ -164,7 +164,7 @@ public class TestRegionReplicasWithModifyTable { List<HRegion> onlineRegions2 = getSecondaryRS().getRegions(tableName); List<HRegion> onlineRegions3 = getTertiaryRS().getRegions(tableName); int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); - assertEquals("the number of regions should be reduced to 2", totalRegions, 2); + assertEquals("the number of regions should be reduced to 2", 2, totalRegions); } finally { disableAndDeleteTable(tableName); } @@ -181,7 +181,7 @@ public class TestRegionReplicasWithModifyTable { List<HRegion> onlineRegions2 = getSecondaryRS().getRegions(tableName); List<HRegion> onlineRegions3 = getTertiaryRS().getRegions(tableName); int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); - assertEquals("the number of regions should be reduced to 40", totalRegions, 40); + assertEquals("the number of regions should be reduced to 40", 40, totalRegions); } finally { disableAndDeleteTable(tableName); } @@ -198,7 +198,7 @@ public class TestRegionReplicasWithModifyTable { List<HRegion> onlineRegions2 = getSecondaryRS().getRegions(tableName); List<HRegion> onlineRegions3 = getTertiaryRS().getRegions(tableName); int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); - assertEquals("the number of regions should be equal to 45", totalRegions, 3 * 15); + assertEquals("the number of regions should be equal to 45", 3 * 15, totalRegions); } finally { disableAndDeleteTable(tableName); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java index 0122674..6172d61 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAccounting.java @@ -37,7 +37,7 @@ public class TestRegionServerAccounting { // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); MemStoreSize memstoreSize = - new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + new MemStoreSize(3L * 1024 * 1024 * 1024, 1L * 1024 * 1024 * 1024); regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_HIGHER_MARK, regionServerAccounting.isAboveHighWaterMark()); @@ -50,7 +50,7 @@ public class TestRegionServerAccounting { // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); MemStoreSize memstoreSize = - new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + new MemStoreSize(3L * 1024 * 1024 * 1024, 1L * 1024 * 1024 * 1024); regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_LOWER_MARK, regionServerAccounting.isAboveLowWaterMark()); @@ -60,12 +60,12 @@ public class TestRegionServerAccounting { public void testOffheapMemstoreHigherWaterMarkLimitsDueToDataSize() { Configuration conf = HBaseConfiguration.create(); // setting 1G as offheap data size - conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1l * 1024l)); + conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1L * 1024)); // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach offheap limit as data size is higher and not due to heap size MemStoreSize memstoreSize = - new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + new MemStoreSize(3L * 1024 * 1024 * 1024, 1L * 1024 * 1024 * 1024); regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_OFFHEAP_HIGHER_MARK, regionServerAccounting.isAboveHighWaterMark()); @@ -76,12 +76,12 @@ public class TestRegionServerAccounting { Configuration conf = HBaseConfiguration.create(); conf.setFloat(MemorySizeUtil.MEMSTORE_SIZE_KEY, 0.2f); // setting 1G as offheap data size - conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1l * 1024l)); + conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1L * 1024)); // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach higher limit as heap size is higher and not due to offheap size MemStoreSize memstoreSize = - new MemStoreSize((long) (3l * 1024l * 1024l), (long) (2l * 1024l * 1024l * 1024l)); + new MemStoreSize(3L * 1024 * 1024, 2L * 1024 * 1024 * 1024); regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_HIGHER_MARK, regionServerAccounting.isAboveHighWaterMark()); @@ -91,12 +91,12 @@ public class TestRegionServerAccounting { public void testOffheapMemstoreLowerWaterMarkLimitsDueToDataSize() { Configuration conf = HBaseConfiguration.create(); // setting 1G as offheap data size - conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1l * 1024l)); + conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1L * 1024)); // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach offheap limit as data size is higher and not due to heap size MemStoreSize memstoreSize = - new MemStoreSize((long) (3l * 1024l * 1024l * 1024l), (long) (1l * 1024l * 1024l * 1024l)); + new MemStoreSize(3L * 1024 * 1024 * 1024, 1L * 1024 * 1024 * 1024); regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_OFFHEAP_LOWER_MARK, regionServerAccounting.isAboveLowWaterMark()); @@ -107,12 +107,12 @@ public class TestRegionServerAccounting { Configuration conf = HBaseConfiguration.create(); conf.setFloat(MemorySizeUtil.MEMSTORE_SIZE_KEY, 0.2f); // setting 1G as offheap data size - conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1l * 1024l)); + conf.setLong(MemorySizeUtil.OFFHEAP_MEMSTORE_SIZE_KEY, (1L * 1024)); // try for default cases RegionServerAccounting regionServerAccounting = new RegionServerAccounting(conf); // this will breach higher limit as heap size is higher and not due to offheap size MemStoreSize memstoreSize = - new MemStoreSize((long) (3l * 1024l * 1024l), (long) (2l * 1024l * 1024l * 1024l)); + new MemStoreSize(3L * 1024 * 1024, 2L * 1024 * 1024 * 1024); regionServerAccounting.incGlobalMemStoreSize(memstoreSize); assertEquals(FlushType.ABOVE_ONHEAP_LOWER_MARK, regionServerAccounting.isAboveLowWaterMark()); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java index ea27ee5..b63b844 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java @@ -32,13 +32,10 @@ import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.master.HMaster; -import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; -import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; -import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos; -import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionRequest; import org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; @@ -51,6 +48,11 @@ import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionRequest; + /** * Tests on the region server, without the master. @@ -61,7 +63,7 @@ public class TestRegionServerNoMaster { private static final Logger LOG = LoggerFactory.getLogger(TestRegionServerNoMaster.class); private static final int NB_SERVERS = 1; private static Table table; - private static final byte[] row = "ee".getBytes(); + private static final byte[] row = Bytes.toBytes("ee"); private static HRegionInfo hri; http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java index c6dce67..afbb48d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java @@ -117,7 +117,8 @@ public class TestScanner { // Increment the least significant character so we get to next row. secondRowBytes[START_KEY_BYTES.length - 1]++; thirdRowBytes = START_KEY_BYTES.clone(); - thirdRowBytes[START_KEY_BYTES.length - 1] += 2; + thirdRowBytes[START_KEY_BYTES.length - 1] = + (byte) (thirdRowBytes[START_KEY_BYTES.length - 1] + 2); col1 = Bytes.toBytes("column1"); } @@ -589,6 +590,7 @@ public class TestScanner { if (flushIndex == count) { LOG.info("Starting flush at flush index " + flushIndex); Thread t = new Thread() { + @Override public void run() { try { region.flush(true); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java index 0c014fd..63ea993 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java @@ -233,6 +233,7 @@ public class TestScannerWithBulkload { // Create a scanner and then do bulk load final CountDownLatch latch = new CountDownLatch(1); new Thread() { + @Override public void run() { try { Put put1 = new Put(Bytes.toBytes("row5")); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java index 613282f..8519c3c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java @@ -76,7 +76,7 @@ public class TestSplitLogWorker { private SplitLogWorker slw; private ExecutorService executorService; - class DummyServer implements Server { + static class DummyServer implements Server { private ZKWatcher zkw; private Configuration conf; private CoordinatedStateManager cm; http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index ab2d4b4..c80fc2e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -673,7 +673,7 @@ public class TestSplitTransactionOnCluster { FileSystem fs = TESTING_UTIL.getDFSCluster().getFileSystem(); Map<String, Path> storefiles = FSUtils.getTableStoreFilePathMap(null, fs, rootDir, tableName); - assertEquals("Expected nothing but found " + storefiles.toString(), storefiles.size(), 0); + assertEquals("Expected nothing but found " + storefiles.toString(), 0, storefiles.size()); // find a splittable region. Refresh the regions list regions = cluster.getRegions(tableName); @@ -696,8 +696,8 @@ public class TestSplitTransactionOnCluster { HBaseFsck.debugLsr(conf, new Path("/")); Map<String, Path> storefilesAfter = FSUtils.getTableStoreFilePathMap(null, fs, rootDir, tableName); - assertEquals("Expected nothing but found " + storefilesAfter.toString(), - storefilesAfter.size(), 0); + assertEquals("Expected nothing but found " + storefilesAfter.toString(), 0, + storefilesAfter.size()); hri = region.getRegionInfo(); // split parent AssignmentManager am = cluster.getMaster().getAssignmentManager(); @@ -755,7 +755,7 @@ public class TestSplitTransactionOnCluster { region.flush(true); HStore store = region.getStore(Bytes.toBytes("f")); Collection<HStoreFile> storefiles = store.getStorefiles(); - assertEquals(storefiles.size(), 1); + assertEquals(1, storefiles.size()); assertFalse(region.hasReferences()); Path referencePath = region.getRegionFileSystem().splitStoreFile(region.getRegionInfo(), "f", http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java index 1f5db50..2c679d8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java @@ -164,6 +164,7 @@ public class TestStoreScanner { new KeyValueScanner[] { new KeyValueScanFixture(CellComparator.getInstance(), CELL_GRID) })); } + @Override protected void resetKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator) throws IOException { if (count == null) { @@ -172,6 +173,7 @@ public class TestStoreScanner { heap = new KeyValueHeapWithCount(scanners, comparator, count); } + @Override protected boolean trySkipToNextRow(Cell cell) throws IOException { boolean optimized = super.trySkipToNextRow(cell); LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false) @@ -182,6 +184,7 @@ public class TestStoreScanner { return optimized; } + @Override protected boolean trySkipToNextColumn(Cell cell) throws IOException { boolean optimized = super.trySkipToNextColumn(cell); LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false) @@ -227,6 +230,7 @@ public class TestStoreScanner { new KeyValueScanFixture(CellComparator.getInstance(), CELL_WITH_VERSIONS) })); } + @Override protected boolean trySkipToNextColumn(Cell cell) throws IOException { boolean optimized = super.trySkipToNextColumn(cell); LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false) @@ -255,6 +259,7 @@ public class TestStoreScanner { new KeyValueScanFixture(CellComparator.getInstance(), CELL_WITH_VERSIONS) })); } + @Override protected boolean trySkipToNextColumn(Cell cell) throws IOException { boolean optimized = super.trySkipToNextColumn(cell); LOG.info("Cell=" + cell + ", nextIndex=" + CellUtil.toString(getNextIndexedKey(), false) @@ -884,6 +889,7 @@ public class TestStoreScanner { try { final long now = System.currentTimeMillis(); EnvironmentEdgeManagerTestHelper.injectEdge(new EnvironmentEdge() { + @Override public long currentTime() { return now; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.java index 52c31d9..273535b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.java @@ -32,10 +32,12 @@ public class TestSyncTimeRangeTracker extends TestSimpleTimeRangeTracker { private static final int NUM_KEYS = 10000000; private static final int NUM_OF_THREADS = 20; + @Override protected TimeRangeTracker getTimeRangeTracker() { return TimeRangeTracker.create(TimeRangeTracker.Type.SYNC); } + @Override protected TimeRangeTracker getTimeRangeTracker(long min, long max) { return TimeRangeTracker.create(TimeRangeTracker.Type.SYNC, min, max); } @@ -77,7 +79,7 @@ public class TestSyncTimeRangeTracker extends TestSimpleTimeRangeTracker { assertTrue(trr.getMin() == 0); } - class RandomTestData { + static class RandomTestData { private long[] keys = new long[NUM_KEYS]; private long min = Long.MAX_VALUE; private long max = 0; @@ -107,7 +109,7 @@ public class TestSyncTimeRangeTracker extends TestSimpleTimeRangeTracker { } } - class TrtUpdateRunnable implements Runnable { + static class TrtUpdateRunnable implements Runnable { private TimeRangeTracker trt; private RandomTestData data; @@ -116,6 +118,7 @@ public class TestSyncTimeRangeTracker extends TestSimpleTimeRangeTracker { this.data = data; } + @Override public void run() { for (long key : data.keys) { trt.includeTimestamp(key); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java index 62d22d2..70bdc49 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java @@ -258,6 +258,7 @@ public class TestWALLockup { // in HBASE-14317. Flush hangs trying to get sequenceid because the ringbuffer is held up // by the zigzaglatch waiting on syncs to come home. Thread t = new Thread ("Flusher") { + @Override public void run() { try { if (region.getMemStoreSize() <= 0) { @@ -444,6 +445,7 @@ public class TestWALLockup { dodgyWAL2.append(region.getRegionInfo(), key, edit, true); Thread t = new Thread("Sync") { + @Override public void run() { try { dodgyWAL2.sync(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java index f3bd7ee..290f71a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java @@ -581,7 +581,7 @@ public class TestWalAndCompactingMemStoreFlush { // The total memstores size should be empty assertEquals(0, totalMemstoreSizePhaseV); // Because there is nothing in any memstore the WAL's LSN should be -1 - assertEquals(smallestSeqInRegionCurrentMemstorePhaseV, HConstants.NO_SEQNUM); + assertEquals(HConstants.NO_SEQNUM, smallestSeqInRegionCurrentMemstorePhaseV); // What happens when we hit the memstore limit, but we are not able to find // any Column Family above the threshold? http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java index 7cdd24d..13c7a6b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -110,7 +111,8 @@ public class PerfTestCompactionPolicies extends MockStoreFileGenerator { final Class<? extends StoreFileListGenerator> fileGenClass, final int inMmax, final int inMin, - final float inRatio) throws IllegalAccessException, InstantiationException { + final float inRatio) throws IllegalAccessException, InstantiationException, + NoSuchMethodException, InvocationTargetException { super(PerfTestCompactionPolicies.class); this.fileGenClass = fileGenClass; this.max = inMmax; @@ -138,7 +140,7 @@ public class PerfTestCompactionPolicies extends MockStoreFileGenerator { new Class[] {Configuration.class, StoreConfigInformation.class }, new Object[] {configuration, store }); - this.generator = fileGenClass.newInstance(); + this.generator = fileGenClass.getDeclaredConstructor().newInstance(); // Used for making paths } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java index 932664b..f8df870 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java @@ -92,11 +92,13 @@ public class TestCompactor { writers.add(realWriter); StoreFileWriter writer = mock(StoreFileWriter.class); doAnswer(new Answer<Object>() { + @Override public Object answer(InvocationOnMock invocation) { return realWriter.kvs.add((KeyValue) invocation.getArgument(0)); } }).when(writer).append(any()); doAnswer(new Answer<Object>() { + @Override public Object answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); return realWriter.data.put((byte[]) args[0], (byte[]) args[1]); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/querymatcher/TestUserScanQueryMatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/querymatcher/TestUserScanQueryMatcher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/querymatcher/TestUserScanQueryMatcher.java index 3ae49c0..b43a89d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/querymatcher/TestUserScanQueryMatcher.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/querymatcher/TestUserScanQueryMatcher.java @@ -242,7 +242,7 @@ public class TestUserScanQueryMatcher extends AbstractTestScanQueryMatcher { } } - private class AlwaysIncludeAndSeekNextRowFilter extends FilterBase { + private static class AlwaysIncludeAndSeekNextRowFilter extends FilterBase { @Override public ReturnCode filterKeyValue(final Cell c) throws IOException { @@ -287,7 +287,7 @@ public class TestUserScanQueryMatcher extends AbstractTestScanQueryMatcher { } } - private class AlwaysIncludeFilter extends FilterBase { + private static class AlwaysIncludeFilter extends FilterBase { @Override public ReturnCode filterKeyValue(final Cell c) throws IOException { return ReturnCode.INCLUDE; http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java index 093a512..009cca0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.java @@ -289,7 +289,7 @@ public abstract class AbstractTestFSWAL { addEdits(wal, hri2, t2, 2, mvcc, scopes2); // get the regions to flush, it should still read region1. regionsToFlush = wal.findRegionsToForceFlush(); - assertEquals(regionsToFlush.length, 1); + assertEquals(1, regionsToFlush.length); assertEquals(hri1.getEncodedNameAsBytes(), regionsToFlush[0]); // flush region 1, and roll the wal file. Only last wal which has entries for region1 should // remain. http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/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 ededcf3..6b55adc 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 @@ -705,9 +705,8 @@ public abstract class AbstractTestWALReplay { try { region.flush(true); fail("Injected exception hasn't been thrown"); - } catch (Throwable t) { - LOG.info("Expected simulated exception when flushing region," - + t.getMessage()); + } catch (IOException e) { + LOG.info("Expected simulated exception when flushing region, {}", e.getMessage()); // simulated to abort server Mockito.doReturn(true).when(rsServices).isAborted(); region.setClosing(false); // region normally does not accept writes after @@ -928,8 +927,7 @@ public abstract class AbstractTestWALReplay { * testcase for https://issues.apache.org/jira/browse/HBASE-15252 */ @Test - public void testDatalossWhenInputError() throws IOException, InstantiationException, - IllegalAccessException { + public void testDatalossWhenInputError() throws Exception { final TableName tableName = TableName.valueOf("testDatalossWhenInputError"); final HRegionInfo hri = createBasic3FamilyHRegionInfo(tableName); final Path basedir = FSUtils.getTableDir(this.hbaseRootDir, tableName); @@ -964,7 +962,7 @@ public abstract class AbstractTestWALReplay { Class<? extends AbstractFSWALProvider.Reader> logReaderClass = conf.getClass("hbase.regionserver.hlog.reader.impl", ProtobufLogReader.class, AbstractFSWALProvider.Reader.class); - AbstractFSWALProvider.Reader reader = logReaderClass.newInstance(); + AbstractFSWALProvider.Reader reader = logReaderClass.getDeclaredConstructor().newInstance(); reader.init(this.fs, editFile, conf, stream); final long headerLength = stream.getPos(); reader.close(); @@ -1108,7 +1106,7 @@ public abstract class AbstractTestWALReplay { // Flusher used in this test. Keep count of how often we are called and // actually run the flush inside here. - class TestFlusher implements FlushRequester { + static class TestFlusher implements FlushRequester { private HRegion r; @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/InstrumentedLogWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/InstrumentedLogWriter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/InstrumentedLogWriter.java index 2aebf2b..5a61370 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/InstrumentedLogWriter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/InstrumentedLogWriter.java @@ -39,7 +39,7 @@ public class InstrumentedLogWriter extends ProtobufLogWriter { public void append(Entry entry) throws IOException { super.append(entry); if (activateFailure && - Bytes.equals(entry.getKey().getEncodedRegionName(), "break".getBytes())) { + Bytes.equals(entry.getKey().getEncodedRegionName(), Bytes.toBytes("break"))) { System.out.println(getClass().getName() + ": I will throw an exception now..."); throw(new IOException("This exception is instrumented and should only be thrown for testing" )); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java index ed71123..0f5fda0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestNamespaceReplication.java @@ -220,8 +220,8 @@ public class TestNamespaceReplication extends TestReplicationBase { if (res.isEmpty()) { LOG.info("Row not available"); } else { - assertEquals(res.size(), 1); - assertArrayEquals(res.value(), val); + assertEquals(1, res.size()); + assertArrayEquals(val, res.value()); break; } Thread.sleep(SLEEP_TIME); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java index bacda63..98b3fda 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java @@ -582,8 +582,8 @@ public class TestPerTableCFReplication { replicatedToAll = false; break; } else { - assertEquals(res.size(), 1); - assertArrayEquals(res.value(), val); + assertEquals(1, res.size()); + assertArrayEquals(val, res.value()); } } if (replicatedToAll) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java index afb975d..3a7a575 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java @@ -270,7 +270,7 @@ public class TestReplicationBase { LOG.info("Row not available"); Thread.sleep(SLEEP_TIME); } else { - assertArrayEquals(res.value(), row); + assertArrayEquals(row, res.value()); break; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java index 1675496..7b9dea4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java @@ -84,7 +84,7 @@ public class TestReplicationDisableInactivePeer extends TestReplicationBase { LOG.info("Row not available"); Thread.sleep(SLEEP_TIME * NB_RETRIES); } else { - assertArrayEquals(res.value(), row); + assertArrayEquals(row, res.value()); return; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java index 30cd860..2837045 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java @@ -111,6 +111,7 @@ public class TestReplicationKillRS extends TestReplicationBase { private static Thread killARegionServer(final HBaseTestingUtility utility, final long timeout, final int rs) { Thread killer = new Thread() { + @Override public void run() { try { Thread.sleep(timeout); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java index cb47827..f46a7b1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java @@ -209,7 +209,7 @@ public class TestReplicationSmallTests extends TestReplicationBase { LOG.info("Row not available"); Thread.sleep(SLEEP_TIME); } else { - assertArrayEquals(res.value(), row); + assertArrayEquals(row, res.value()); return; } } @@ -262,7 +262,7 @@ public class TestReplicationSmallTests extends TestReplicationBase { LOG.info("Row not available"); Thread.sleep(SLEEP_TIME * i); } else { - assertArrayEquals(res.value(), row); + assertArrayEquals(row, res.value()); break; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java index 0a602ad..b473277 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java @@ -277,14 +277,14 @@ public class TestReplicationSyncUpTool extends TestReplicationBase { // delete half of the rows for (int i = 0; i < NB_ROWS_IN_BATCH / 2; i++) { String rowKey = "row" + i; - Delete del = new Delete(rowKey.getBytes()); + Delete del = new Delete(Bytes.toBytes(rowKey)); list.add(del); } ht1Source.delete(list); for (int i = 0; i < NB_ROWS_IN_BATCH; i++) { String rowKey = "row" + i; - Delete del = new Delete(rowKey.getBytes()); + Delete del = new Delete(Bytes.toBytes(rowKey)); list.add(del); } ht2Source.delete(list); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java index 98f11f7..b2ecb67 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java @@ -187,7 +187,7 @@ public class TestReplicationWithTags { LOG.info("Row not available"); Thread.sleep(SLEEP_TIME); } else { - assertArrayEquals(res.value(), ROW); + assertArrayEquals(ROW, res.value()); assertEquals(1, TestCoprocessorForTagsAtSink.tags.size()); Tag tag = TestCoprocessorForTagsAtSink.tags.get(0); assertEquals(TAG_TYPE, tag.getType()); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java index df84515..e69d84c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java @@ -143,8 +143,8 @@ public class TestRegionReplicaReplicationEndpoint { assertNotNull(peerConfig); assertEquals(peerConfig.getClusterKey(), ZKConfig.getZooKeeperClusterKey( HTU.getConfiguration())); - assertEquals(peerConfig.getReplicationEndpointImpl(), - RegionReplicaReplicationEndpoint.class.getName()); + assertEquals(RegionReplicaReplicationEndpoint.class.getName(), + peerConfig.getReplicationEndpointImpl()); admin.close(); } @@ -190,8 +190,8 @@ public class TestRegionReplicaReplicationEndpoint { assertNotNull(peerConfig); assertEquals(peerConfig.getClusterKey(), ZKConfig.getZooKeeperClusterKey( HTU.getConfiguration())); - assertEquals(peerConfig.getReplicationEndpointImpl(), - RegionReplicaReplicationEndpoint.class.getName()); + assertEquals(RegionReplicaReplicationEndpoint.class.getName(), + peerConfig.getReplicationEndpointImpl()); admin.close(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicator.java index d7044dc..375e64e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicator.java @@ -31,27 +31,61 @@ import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.ipc.RpcServer; -import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos; -import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface; -import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsRequest; -import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsResponse; -import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.*; -import org.apache.hbase.thirdparty.com.google.protobuf.RpcController; -import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; import org.apache.hadoop.hbase.replication.TestReplicationBase; -import org.apache.hadoop.hbase.replication.regionserver.HBaseInterClusterReplicationEndpoint; import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.wal.WAL.Entry; - import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Test; import org.junit.Ignore; +import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.protobuf.RpcController; +import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ClearCompactionQueuesRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ClearCompactionQueuesResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ClearRegionBlockCacheRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ClearRegionBlockCacheResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactRegionRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ExecuteProceduresRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ExecuteProceduresResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionLoadRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionLoadResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetServerInfoRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetServerInfoResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetStoreFileRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetStoreFileResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ReplicateWALEntryRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ReplicateWALEntryResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RollWALWriterRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.RollWALWriterResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.StopServerRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.StopServerResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.UpdateConfigurationRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.UpdateConfigurationResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WarmupRegionRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WarmupRegionResponse; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsRequest; +import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.GetSpaceQuotaSnapshotsResponse; + @Category(MediumTests.class) @Ignore("Flaky, needs to be rewritten, see HBASE-19125") @@ -88,7 +122,7 @@ public class TestReplicator extends TestReplicationBase { // have to be replicated separately. final byte[] valueBytes = new byte[8 *1024]; for (int i = 0; i < NUM_ROWS; i++) { - htable1.put(new Put(("row"+Integer.toString(i)).getBytes()) + htable1.put(new Put(Bytes.toBytes("row"+Integer.toString(i))) .addColumn(famName, null, valueBytes) ); } @@ -140,7 +174,7 @@ public class TestReplicator extends TestReplicationBase { // have to be replicated separately. final byte[] valueBytes = new byte[8 *1024]; for (int i = 0; i < NUM_ROWS; i++) { - htable1.put(new Put(("row"+Integer.toString(i)).getBytes()) + htable1.put(new Put(Bytes.toBytes("row"+Integer.toString(i))) .addColumn(famName, null, valueBytes) ); } @@ -409,7 +443,7 @@ public class TestReplicator extends TestReplicationBase { @Override public ClearRegionBlockCacheResponse clearRegionBlockCache(RpcController controller, - ClearRegionBlockCacheRequest request) throws ServiceException { + ClearRegionBlockCacheRequest request) throws ServiceException { return delegate.clearRegionBlockCache(controller, request); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java index 43140bc..44c76f8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java @@ -363,7 +363,7 @@ public class TestWALEntryStream { appendToLog("foo"); entryBatch = batcher.take(); assertEquals(1, entryBatch.getNbEntries()); - assertEquals(getRow(entryBatch.getWalEntries().get(0)), "foo"); + assertEquals("foo", getRow(entryBatch.getWalEntries().get(0))); } private String getRow(WAL.Entry entry) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureIPC.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureIPC.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureIPC.java index 2414e5a..1399b21 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureIPC.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureIPC.java @@ -153,7 +153,7 @@ public class TestSecureIPC { UserGroupInformation ugi2 = UserGroupInformation.getCurrentUser(); // check that the login user is okay: - assertSame(ugi, ugi2); + assertSame(ugi2, ugi); assertEquals(AuthenticationMethod.KERBEROS, ugi.getAuthenticationMethod()); assertEquals(krbPrincipal, ugi.getUserName()); @@ -280,6 +280,7 @@ public class TestSecureIPC { final Throwable exception[] = new Throwable[1]; Collections.synchronizedList(new ArrayList<Throwable>()); Thread.UncaughtExceptionHandler exceptionHandler = new Thread.UncaughtExceptionHandler() { + @Override public void uncaughtException(Thread th, Throwable ex) { exception[0] = ex; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java index bfc82db..d5eed3c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java @@ -120,6 +120,7 @@ public class TestUser { Configuration conf = HBaseConfiguration.create(); final User user = User.createUserForTesting(conf, "testuser", new String[]{"foo"}); final PrivilegedExceptionAction<String> action = new PrivilegedExceptionAction<String>(){ + @Override public String run() throws IOException { User u = User.getCurrent(); return u.getName(); @@ -138,6 +139,7 @@ public class TestUser { // check the exception version username = user.runAs(new PrivilegedExceptionAction<String>(){ + @Override public String run() throws Exception { return User.getCurrent().getName(); } @@ -146,6 +148,7 @@ public class TestUser { // verify that nested contexts work user2.runAs(new PrivilegedExceptionAction<Object>(){ + @Override public Object run() throws IOException, InterruptedException{ String nestedName = user.runAs(action); assertEquals("Nest name should match nested user", "testuser", nestedName); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java index 06389ab..8a1af20 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java @@ -123,6 +123,7 @@ public class TestAccessControlFilter extends SecureTestUtil { // test read READER.runAs(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // force a new RS connection @@ -151,6 +152,7 @@ public class TestAccessControlFilter extends SecureTestUtil { // test read with qualifier filter LIMITED.runAs(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // force a new RS connection @@ -178,6 +180,7 @@ public class TestAccessControlFilter extends SecureTestUtil { // test as user with no permission DENIED.runAs(new PrivilegedExceptionAction<Object>(){ + @Override public Object run() throws Exception { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // force a new RS connection http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/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 be1b0e4..14e94be 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 @@ -306,12 +306,15 @@ public class TestAccessController extends SecureTestUtil { grantGlobal(TEST_UTIL, toGroupEntry(GROUP_WRITE), Permission.Action.WRITE); assertEquals(5, AccessControlLists.getTablePermissions(conf, TEST_TABLE).size()); + int size = 0; try { - assertEquals(5, AccessControlClient.getUserPermissions(systemUserConnection, - TEST_TABLE.toString()).size()); + size = AccessControlClient.getUserPermissions(systemUserConnection, TEST_TABLE.toString()) + .size(); } catch (Throwable e) { LOG.error("error during call of AccessControlClient.getUserPermissions. ", e); + fail("error during call of AccessControlClient.getUserPermissions."); } + assertEquals(5, size); } private static void cleanUp() throws Exception { @@ -992,7 +995,7 @@ public class TestAccessController extends SecureTestUtil { } } - public class BulkLoadHelper { + public static class BulkLoadHelper { private final FileSystem fs; private final Path loadPath; private final Configuration conf; http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java index 1e5ea53..252de3a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java @@ -56,11 +56,13 @@ public class TestZKSecretWatcher { private static class MockAbortable implements Abortable { private boolean abort; + @Override public void abort(String reason, Throwable e) { LOG.info("Aborting: "+reason, e); abort = true; } + @Override public boolean isAborted() { return abort; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcherRefreshKeys.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcherRefreshKeys.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcherRefreshKeys.java index 391a844..9a249c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcherRefreshKeys.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcherRefreshKeys.java @@ -46,11 +46,13 @@ public class TestZKSecretWatcherRefreshKeys { private static class MockAbortable implements Abortable { private boolean abort; + @Override public void abort(String reason, Throwable e) { LOG.info("Aborting: "+reason, e); abort = true; } + @Override public boolean isAborted() { return abort; } http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java index 9da2531..6dacf02 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java @@ -85,6 +85,7 @@ public class TestDefaultScanLabelGeneratorStack { // Set up for the test SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { VisibilityClient.addLabels(conn, new String[] { SECRET, CONFIDENTIAL }); @@ -102,6 +103,7 @@ public class TestDefaultScanLabelGeneratorStack { final TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf); Table table = TEST_UTIL.createTable(tableName, CF)) { @@ -123,15 +125,13 @@ public class TestDefaultScanLabelGeneratorStack { // Test that super user can see all the cells. SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf); Table table = connection.getTable(tableName)) { - Scan s = new Scan(); - ResultScanner scanner = table.getScanner(s); - Result[] next = scanner.next(1); + Result[] next = getResult(table, new Scan()); // Test that super user can see all the cells. - assertTrue(next.length == 1); CellScanner cellScanner = next[0].cellScanner(); cellScanner.advance(); Cell current = cellScanner.current(); @@ -164,15 +164,12 @@ public class TestDefaultScanLabelGeneratorStack { }); TESTUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf); Table table = connection.getTable(tableName)) { // Test scan with no auth attribute - Scan s = new Scan(); - ResultScanner scanner = table.getScanner(s); - Result[] next = scanner.next(1); - - assertTrue(next.length == 1); + Result[] next = getResult(table, new Scan()); CellScanner cellScanner = next[0].cellScanner(); cellScanner.advance(); Cell current = cellScanner.current(); @@ -248,6 +245,13 @@ public class TestDefaultScanLabelGeneratorStack { }); } + + private static Result [] getResult(Table table, Scan scan) throws IOException { + ResultScanner scanner = table.getScanner(scan); + Result[] next = scanner.next(1); + assertTrue(next.length == 1); + return next; + } @AfterClass public static void tearDownAfterClass() throws Exception { http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java index a0703fc..c7075e3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java @@ -82,6 +82,7 @@ public class TestEnforcingScanLabelGenerator { // Set up for the test SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { VisibilityClient.addLabels(conn, new String[] { SECRET, CONFIDENTIAL }); @@ -99,6 +100,7 @@ public class TestEnforcingScanLabelGenerator { final TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf); Table table = TEST_UTIL.createTable(tableName, CF)) { @@ -120,6 +122,7 @@ public class TestEnforcingScanLabelGenerator { // Test that super user can see all the cells. SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf); Table table = connection.getTable(tableName)) { @@ -135,6 +138,7 @@ public class TestEnforcingScanLabelGenerator { }); TESTUSER.runAs(new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf); Table table = connection.getTable(tableName)) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java index 521cafe..76bba48 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java @@ -160,6 +160,7 @@ public class TestVisibilityLabelReplicationWithExpAsString extends TestVisibilit InterruptedException { PrivilegedExceptionAction<Void> scanAction = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf1); Table table2 = connection.getTable(TABLE_NAME)) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java index ba93d19..932f63e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java @@ -302,6 +302,7 @@ public abstract class TestVisibilityLabels { TEST_UTIL.getHBaseCluster().startRegionServer(); } Thread t1 = new Thread() { + @Override public void run() { List<RegionServerThread> regionServerThreads = TEST_UTIL.getHBaseCluster() .getRegionServerThreads(); @@ -320,6 +321,7 @@ public abstract class TestVisibilityLabels { t1.start(); final TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); Thread t = new Thread() { + @Override public void run() { try { while (!killedRS) { @@ -415,6 +417,7 @@ public abstract class TestVisibilityLabels { public void testSetAndGetUserAuths() throws Throwable { final String user = "user1"; PrivilegedExceptionAction<Void> action = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { String[] auths = { SECRET, CONFIDENTIAL }; try (Connection conn = ConnectionFactory.createConnection(conf)) { @@ -441,6 +444,7 @@ public abstract class TestVisibilityLabels { } action = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { GetAuthsResponse authsResponse = null; try (Connection conn = ConnectionFactory.createConnection(conf)) { @@ -462,6 +466,7 @@ public abstract class TestVisibilityLabels { // Try doing setAuths once again and there should not be any duplicates action = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { String[] auths1 = { SECRET, CONFIDENTIAL }; GetAuthsResponse authsResponse = null; @@ -491,7 +496,7 @@ public abstract class TestVisibilityLabels { List<String> auths = new ArrayList<>(); for (Result result : results) { Cell labelCell = result.getColumnLatestCell(LABELS_TABLE_FAMILY, LABEL_QUALIFIER); - Cell userAuthCell = result.getColumnLatestCell(LABELS_TABLE_FAMILY, user.getBytes()); + Cell userAuthCell = result.getColumnLatestCell(LABELS_TABLE_FAMILY, Bytes.toBytes(user)); if (userAuthCell != null) { auths.add(Bytes.toString(labelCell.getValueArray(), labelCell.getValueOffset(), labelCell.getValueLength())); @@ -503,6 +508,7 @@ public abstract class TestVisibilityLabels { @Test public void testClearUserAuths() throws Throwable { PrivilegedExceptionAction<Void> action = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { String[] auths = { SECRET, CONFIDENTIAL, PRIVATE }; String user = "testUser"; @@ -700,32 +706,32 @@ public abstract class TestVisibilityLabels { TEST_UTIL.getAdmin().createTable(desc); try (Table table = TEST_UTIL.getConnection().getTable(tableName)) { Put put = new Put(r1); - put.addColumn(fam, qual, 3l, v1); - put.addColumn(fam, qual2, 3l, v1); - put.addColumn(fam2, qual, 3l, v1); - put.addColumn(fam2, qual2, 3l, v1); + put.addColumn(fam, qual, 3L, v1); + put.addColumn(fam, qual2, 3L, v1); + put.addColumn(fam2, qual, 3L, v1); + put.addColumn(fam2, qual2, 3L, v1); put.setCellVisibility(new CellVisibility(SECRET)); table.put(put); put = new Put(r1); - put.addColumn(fam, qual, 4l, v2); - put.addColumn(fam, qual2, 4l, v2); - put.addColumn(fam2, qual, 4l, v2); - put.addColumn(fam2, qual2, 4l, v2); + put.addColumn(fam, qual, 4L, v2); + put.addColumn(fam, qual2, 4L, v2); + put.addColumn(fam2, qual, 4L, v2); + put.addColumn(fam2, qual2, 4L, v2); put.setCellVisibility(new CellVisibility(PRIVATE)); table.put(put); put = new Put(r2); - put.addColumn(fam, qual, 3l, v1); - put.addColumn(fam, qual2, 3l, v1); - put.addColumn(fam2, qual, 3l, v1); - put.addColumn(fam2, qual2, 3l, v1); + put.addColumn(fam, qual, 3L, v1); + put.addColumn(fam, qual2, 3L, v1); + put.addColumn(fam2, qual, 3L, v1); + put.addColumn(fam2, qual2, 3L, v1); put.setCellVisibility(new CellVisibility(SECRET)); table.put(put); put = new Put(r2); - put.addColumn(fam, qual, 4l, v2); - put.addColumn(fam, qual2, 4l, v2); - put.addColumn(fam2, qual, 4l, v2); - put.addColumn(fam2, qual2, 4l, v2); + put.addColumn(fam, qual, 4L, v2); + put.addColumn(fam, qual2, 4L, v2); + put.addColumn(fam2, qual, 4L, v2); + put.addColumn(fam2, qual2, 4L, v2); put.setCellVisibility(new CellVisibility(SECRET)); table.put(put); @@ -860,6 +866,7 @@ public abstract class TestVisibilityLabels { public static void addLabels() throws Exception { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { String[] labels = { SECRET, TOPSECRET, CONFIDENTIAL, PUBLIC, PRIVATE, COPYRIGHT, ACCENT, UNICODE_VIS_TAG, UC1, UC2 }; http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java index 843ca99..c14438e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOnNewVersionBehaviorTable.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.client.Table; public class TestVisibilityLabelsOnNewVersionBehaviorTable extends TestVisibilityLabelsWithDeletes { + @Override protected Table createTable(HColumnDescriptor fam) throws IOException { fam.setNewVersionBehavior(true); TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java index a3c926e..8d75156 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java @@ -85,6 +85,7 @@ public class TestVisibilityLabelsOpWithDifferentUsersNoACL { public void testLabelsTableOpsWithDifferentUsers() throws Throwable { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.setAuths(conn, new String[] { CONFIDENTIAL, PRIVATE }, "user1"); @@ -99,6 +100,7 @@ public class TestVisibilityLabelsOpWithDifferentUsersNoACL { // Ideally this should not be allowed. this operation should fail or do nothing. action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.setAuths(conn, new String[] { CONFIDENTIAL, PRIVATE }, "user3"); @@ -115,6 +117,7 @@ public class TestVisibilityLabelsOpWithDifferentUsersNoACL { PrivilegedExceptionAction<GetAuthsResponse> action1 = new PrivilegedExceptionAction<GetAuthsResponse>() { + @Override public GetAuthsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.getAuths(conn, "user1"); @@ -138,6 +141,7 @@ public class TestVisibilityLabelsOpWithDifferentUsersNoACL { PrivilegedExceptionAction<VisibilityLabelsResponse> action2 = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.clearAuths(conn, new String[] { @@ -162,6 +166,7 @@ public class TestVisibilityLabelsOpWithDifferentUsersNoACL { private static void addLabels() throws Exception { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { String[] labels = { SECRET, CONFIDENTIAL, PRIVATE }; try (Connection conn = ConnectionFactory.createConnection(conf)) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java index 072a385..dce8591 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java @@ -301,6 +301,7 @@ public class TestVisibilityLabelsReplication { final boolean nullExpected, final String... auths) throws IOException, InterruptedException { PrivilegedExceptionAction<Void> scanAction = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { try (Connection connection = ConnectionFactory.createConnection(conf1); Table table2 = connection.getTable(TABLE_NAME)) { @@ -346,6 +347,7 @@ public class TestVisibilityLabelsReplication { public static void addLabels() throws Exception { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { String[] labels = { SECRET, TOPSECRET, CONFIDENTIAL, PUBLIC, PRIVATE, UNICODE_VIS_TAG }; try (Connection conn = ConnectionFactory.createConnection(conf)) { @@ -362,6 +364,7 @@ public class TestVisibilityLabelsReplication { public static void setAuths(final Configuration conf) throws Exception { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.setAuths(conn, new String[] { SECRET, http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java index f6ff640..ef1ae98 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java @@ -122,6 +122,7 @@ public class TestVisibilityLabelsWithACL { SecureTestUtil.grantOnTable(TEST_UTIL, NORMAL_USER2.getShortName(), tableName, null, null, Permission.Action.READ); PrivilegedExceptionAction<Void> scanAction = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { Scan s = new Scan(); s.setAuthorizations(new Authorizations(SECRET, CONFIDENTIAL)); @@ -151,6 +152,7 @@ public class TestVisibilityLabelsWithACL { final Table table = createTableAndWriteDataWithLabels(tableName, SECRET + "&" + CONFIDENTIAL + "&!" + PRIVATE, SECRET + "&!" + PRIVATE); PrivilegedExceptionAction<Void> scanAction = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { Scan s = new Scan(); s.setAuthorizations(new Authorizations(SECRET, CONFIDENTIAL)); @@ -175,6 +177,7 @@ public class TestVisibilityLabelsWithACL { final Table table = createTableAndWriteDataWithLabels(tableName, SECRET + "&" + CONFIDENTIAL + "&!" + PRIVATE, SECRET + "&!" + PRIVATE); PrivilegedExceptionAction<Void> scanAction = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { Get g = new Get(row1); g.setAuthorizations(new Authorizations(SECRET, CONFIDENTIAL)); @@ -204,6 +207,7 @@ public class TestVisibilityLabelsWithACL { SecureTestUtil.grantOnTable(TEST_UTIL, NORMAL_USER2.getShortName(), tableName, null, null, Permission.Action.READ); PrivilegedExceptionAction<Void> getAction = new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws Exception { Get g = new Get(row1); g.setAuthorizations(new Authorizations(SECRET, CONFIDENTIAL)); @@ -222,6 +226,7 @@ public class TestVisibilityLabelsWithACL { public void testLabelsTableOpsWithDifferentUsers() throws Throwable { PrivilegedExceptionAction<VisibilityLabelsResponse> action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.addLabels(conn, new String[] { "l1", "l2" }); @@ -237,6 +242,7 @@ public class TestVisibilityLabelsWithACL { .getResult(1).getException().getName()); action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.setAuths(conn, new String[] { CONFIDENTIAL, PRIVATE }, "user1"); @@ -252,6 +258,7 @@ public class TestVisibilityLabelsWithACL { .getResult(1).getException().getName()); action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.setAuths(conn, new String[] { CONFIDENTIAL, PRIVATE }, "user1"); @@ -265,6 +272,7 @@ public class TestVisibilityLabelsWithACL { assertTrue(response.getResult(1).getException().getValue().isEmpty()); action = new PrivilegedExceptionAction<VisibilityLabelsResponse>() { + @Override public VisibilityLabelsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.clearAuths(conn, new String[] { @@ -289,6 +297,7 @@ public class TestVisibilityLabelsWithACL { "user3"); PrivilegedExceptionAction<GetAuthsResponse> action1 = new PrivilegedExceptionAction<GetAuthsResponse>() { + @Override public GetAuthsResponse run() throws Exception { try (Connection conn = ConnectionFactory.createConnection(conf)) { return VisibilityClient.getAuths(conn, "user3"); http://git-wip-us.apache.org/repos/asf/hbase/blob/b1269ec5/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java index 2d3f607..ea1ed10 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java @@ -56,6 +56,7 @@ public class TestVisibilityLabelsWithCustomVisLabService extends TestVisibilityL } // Extending this test from super as we don't verify predefined labels in ExpAsStringVisibilityLabelServiceImpl + @Override @Test public void testVisibilityLabelsInPutsThatDoesNotMatchAnyDefinedLabels() throws Exception { TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); @@ -63,6 +64,7 @@ public class TestVisibilityLabelsWithCustomVisLabService extends TestVisibilityL createTableAndWriteDataWithLabels(tableName, "SAMPLE_LABEL", "TEST"); } + @Override protected List<String> extractAuths(String user, List<Result> results) { List<String> auths = new ArrayList<>(); for (Result result : results) {