From b459c196bc49f9751aded480d2b4ab19755c9209 Mon Sep 17 00:00:00 2001 From: Caroline Zhou Date: Wed, 7 Aug 2019 13:30:42 -0700 Subject: [PATCH] patch for branch-1 --- .../org/apache/hadoop/hbase/tool/Canary.java | 127 +++++++++++++++++- .../hadoop/hbase/tool/TestCanaryTool.java | 54 +++++++- 2 files changed, 178 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java index 073df68583..5d5ed1a482 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java @@ -48,6 +48,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.google.common.collect.Maps; import org.apache.commons.lang.time.StopWatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -120,13 +121,19 @@ public final class Canary implements Tool { public long incWriteFailureCount(); public Map getWriteFailures(); public void updateWriteFailures(String regionName, String serverName); + public long getReadSuccessCount(); + public long incReadSuccessCount(); + public long getWriteSuccessCount(); + public long incWriteSuccessCount(); } // Simple implementation of canary sink that allows to plot on // file or standard output timings or failures. public static class StdOutSink implements Sink { private AtomicLong readFailureCount = new AtomicLong(0), - writeFailureCount = new AtomicLong(0); + writeFailureCount = new AtomicLong(0), + readSuccessCount = new AtomicLong(0), + writeSuccessCount = new AtomicLong(0); private Map readFailures = new ConcurrentHashMap(); private Map writeFailures = new ConcurrentHashMap(); @@ -170,6 +177,26 @@ public final class Canary implements Tool { public void updateWriteFailures(String regionName, String serverName) { writeFailures.put(regionName, serverName); } + + @Override + public long getReadSuccessCount() { + return readSuccessCount.get(); + } + + @Override + public long incReadSuccessCount() { + return readSuccessCount.incrementAndGet(); + } + + @Override + public long getWriteSuccessCount() { + return writeSuccessCount.get(); + } + + @Override + public long incWriteSuccessCount() { + return writeSuccessCount.incrementAndGet(); + } } public static class RegionServerStdOutSink extends StdOutSink { @@ -202,6 +229,7 @@ public final class Canary implements Tool { private Map perTableReadLatency = new HashMap<>(); private AtomicLong writeLatency = new AtomicLong(); + private Map regionMap = Maps.newConcurrentMap(); public void publishReadFailure(ServerName serverName, HRegionInfo region, Exception e) { incReadFailureCount(); @@ -215,6 +243,10 @@ public final class Canary implements Tool { } public void publishReadTiming(ServerName serverName, HRegionInfo region, HColumnDescriptor column, long msTime) { + incReadSuccessCount(); + RegionTaskResult res = this.regionMap.get(region.getRegionNameAsString()); + res.setReadSuccess(); + res.setReadLatency(msTime); LOG.info(String.format("read from region %s on regionserver %s column family %s in %dms", region.getRegionNameAsString(), serverName, column.getNameAsString(), msTime)); } @@ -231,6 +263,10 @@ public final class Canary implements Tool { } public void publishWriteTiming(ServerName serverName, HRegionInfo region, HColumnDescriptor column, long msTime) { + incWriteSuccessCount(); + RegionTaskResult res = this.regionMap.get(region.getRegionNameAsString()); + res.setWriteSuccess(); + res.setWriteLatency(msTime); LOG.info(String.format("write to region %s on regionserver %s column family %s in %dms", region.getRegionNameAsString(), serverName, column.getNameAsString(), msTime)); } @@ -252,6 +288,14 @@ public final class Canary implements Tool { public AtomicLong getWriteLatency() { return this.writeLatency; } + + public Map getRegionMap() { + return this.regionMap; + } + + public int getTotalExpectedRegions() { + return this.regionMap.size(); + } } static class ZookeeperTask implements Callable { @@ -883,6 +927,85 @@ public final class Canary implements Tool { System.exit(USAGE_EXIT_CODE); } + /** + * Canary region mode-specific data structure which stores information about each region to be scanned + */ + public static class RegionTaskResult { + private HRegionInfo region; + private TableName tableName; + private ServerName serverName; + private AtomicLong readLatency = null; + private AtomicLong writeLatency = null; + private boolean readSuccess = false; + private boolean writeSuccess = false; + + public RegionTaskResult(HRegionInfo region, TableName tableName, ServerName serverName) { + this.region = region; + this.tableName = tableName; + this.serverName = serverName; + } + + public HRegionInfo getRegionInfo() { + return this.region; + } + + public String getRegionNameAsString() { + return this.region.getRegionNameAsString(); + } + + public TableName getTableName() { + return this.tableName; + } + + public String getTableNameAsString() { + return this.tableName.getNameAsString(); + } + + public ServerName getServerName() { + return this.serverName; + } + + public String getServerNameAsString() { + return this.serverName.getServerName(); + } + + public long getReadLatency() { + if (this.readLatency == null) return -1; + return this.readLatency.get(); + } + + public void setReadLatency(long readLatency) { + if (this.readLatency != null) this.readLatency.set(readLatency); + else this.readLatency = new AtomicLong(readLatency); + } + + public long getWriteLatency() { + if (this.writeLatency == null) return -1; + return this.writeLatency.get(); + } + + public void setWriteLatency(long writeLatency) { + if (this.writeLatency != null) this.writeLatency.set(writeLatency); + else this.writeLatency = new AtomicLong(writeLatency); + } + + public boolean isReadSuccess() { + return this.readSuccess; + } + + public void setReadSuccess() { + this.readSuccess = true; + } + + public boolean isWriteSuccess() { + return this.writeSuccess; + } + + public void setWriteSuccess() { + this.writeSuccess = true; + } + } + /** * A Factory method for {@link Monitor}. * Can be overridden by user. @@ -1295,6 +1418,8 @@ public final class Canary implements Tool { HRegionInfo region = location.getRegionInfo(); tasks.add(new RegionTask(admin.getConnection(), region, rs, (RegionStdOutSink) sink, taskType, rawScanEnabled, rwLatency)); + Map regionMap = ((RegionStdOutSink) sink).getRegionMap(); + regionMap.put(region.getRegionNameAsString(), new RegionTaskResult(region, region.getTable(), rs)); } } finally { if (regionLocator != null) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java index 976f02a041..bde2d0230a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java @@ -45,15 +45,15 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; -import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.*; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Matchers.argThat; -import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; @RunWith(MockitoJUnitRunner.class) @@ -113,6 +113,56 @@ public class TestCanaryTool { verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); } + @Test + public void testCanaryRegionTaskResult() throws Exception { + TableName tableName = TableName.valueOf("testTable"); + HTable table = testingUtility.createTable(tableName, new byte[][] { FAMILY }); + // insert some test rows + for (int i=0; i<1000; i++) { + byte[] iBytes = Bytes.toBytes(i); + Put p = new Put(iBytes); + p.addColumn(FAMILY, COLUMN, iBytes); + table.put(p); + } + ExecutorService executor = new ScheduledThreadPoolExecutor(1); + Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink()); + Canary canary = new Canary(executor, sink); + String[] args = { "-writeSniffing", "-t", "10000", "testTable" }; + assertEquals(0, ToolRunner.run(testingUtility.getConfiguration(), canary, args)); + + assertTrue("verify read success count > 0", sink.getReadSuccessCount() > 0); + assertTrue("verify write success count > 0", sink.getWriteSuccessCount() > 0); + verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); + verify(sink, atLeastOnce()).publishWriteTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); + + assertTrue("canary should expect to scan at least 1 region", sink.getTotalExpectedRegions() > 0); + Map regionMap = sink.getRegionMap(); + assertNotNull("verify region map exists", regionMap); + assertFalse("verify region map has size > 0", regionMap.isEmpty()); + + for (Map.Entry entry : regionMap.entrySet()) { + + Canary.RegionTaskResult res = entry.getValue(); + assertNotNull("verify each expected region has a corresponding RegionTaskResult object in the map", res); + String regionName = res.getRegionNameAsString(); + + assertNotNull("verify getRegionNameAsString()", regionName); + assertNotNull("verify getRegionInfo()", res.getRegionInfo()); + assertNotNull("verify getTableName()", res.getTableName()); + assertNotNull("verify getTableNameAsString()", res.getTableNameAsString()); + assertNotNull("verify getServerName()", res.getServerName()); + assertNotNull("verify getServerNameAsString()", res.getServerNameAsString()); + + if (entry.getKey().contains(Canary.DEFAULT_WRITE_TABLE_NAME.getNameAsString())) { + assertTrue("write to region " + regionName + " succeeded", res.isWriteSuccess()); + assertTrue("write took some time", res.getWriteLatency() > -1); + } else { + assertTrue("read from region " + regionName + " succeeded", res.isReadSuccess()); + assertTrue("read took some time", res.getReadLatency() > -1); + } + } + } + @Test @Ignore("Intermittent argument matching failures, see HBASE-18813") public void testReadTableTimeouts() throws Exception { -- 2.20.1