This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 1528aac Revert "HBASE-25127 Enhance PerformanceEvaluation to profile
meta replica performance. (#2644)"
1528aac is described below
commit 1528aacacd498ca49f653471b0a2a6f836476609
Author: stack <st...@apache.org>
AuthorDate: Thu Nov 19 19:41:29 2020 -0800
Revert "HBASE-25127 Enhance PerformanceEvaluation to profile meta replica
performance. (#2644)"
This reverts commit 4ee22704528844ac6f9a914fa8fa56d89ddd279a.
because on commit, I added 'Signed-off-by: Duo Zhang' when he nad
NOT signed off. My mistake.
---
.../apache/hadoop/hbase/PerformanceEvaluation.java | 148 ++-------------------
1 file changed, 10 insertions(+), 138 deletions(-)
diff --git
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
index 271c297..7ea8589 100644
---
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedList;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -63,9 +62,6 @@ import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Increment;
import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.client.RegionInfoBuilder;
-import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.RowMutations;
@@ -164,18 +160,17 @@ public class PerformanceEvaluation extends Configured
implements Tool {
static {
addCommandDescriptor(AsyncRandomReadTest.class, "asyncRandomRead",
- "Run async random read test");
+ "Run async random read test");
addCommandDescriptor(AsyncRandomWriteTest.class, "asyncRandomWrite",
- "Run async random write test");
+ "Run async random write test");
addCommandDescriptor(AsyncSequentialReadTest.class, "asyncSequentialRead",
- "Run async sequential read test");
+ "Run async sequential read test");
addCommandDescriptor(AsyncSequentialWriteTest.class,
"asyncSequentialWrite",
- "Run async sequential write test");
+ "Run async sequential write test");
addCommandDescriptor(AsyncScanTest.class, "asyncScan",
- "Run async scan test (read every row)");
- addCommandDescriptor(RandomReadTest.class, RANDOM_READ, "Run random read
test");
- addCommandDescriptor(MetaRandomReadTest.class, "metaRandomRead",
- "Run getRegionLocation test");
+ "Run async scan test (read every row)");
+ addCommandDescriptor(RandomReadTest.class, RANDOM_READ,
+ "Run random read test");
addCommandDescriptor(RandomSeekScanTest.class, RANDOM_SEEK_SCAN,
"Run random seek and scan 100 test");
addCommandDescriptor(RandomScanWithRange10Test.class, "scanRange10",
@@ -192,12 +187,11 @@ public class PerformanceEvaluation extends Configured
implements Tool {
"Run sequential read test");
addCommandDescriptor(SequentialWriteTest.class, "sequentialWrite",
"Run sequential write test");
- addCommandDescriptor(MetaWriteTest.class, "metaWrite",
- "Populate meta table;used with 1 thread; to be cleaned up by cleanMeta");
- addCommandDescriptor(ScanTest.class, "scan", "Run scan test (read every
row)");
+ addCommandDescriptor(ScanTest.class, "scan",
+ "Run scan test (read every row)");
addCommandDescriptor(FilteredScanTest.class, "filterScan",
"Run scan test using a filter to find a specific row based on it's value
" +
- "(make sure to use --rows=20)");
+ "(make sure to use --rows=20)");
addCommandDescriptor(IncrementTest.class, "increment",
"Increment on each row; clients overlap on keyspace so some concurrent
operations");
addCommandDescriptor(AppendTest.class, "append",
@@ -208,8 +202,6 @@ public class PerformanceEvaluation extends Configured
implements Tool {
"CheckAndPut on each row; clients overlap on keyspace so some concurrent
operations");
addCommandDescriptor(CheckAndDeleteTest.class, "checkAndDelete",
"CheckAndDelete on each row; clients overlap on keyspace so some
concurrent operations");
- addCommandDescriptor(CleanMetaTest.class, "cleanMeta",
- "Remove fake region entries on meta table inserted by metaWrite; used
with 1 thread");
}
/**
@@ -1489,31 +1481,6 @@ public class PerformanceEvaluation extends Configured
implements Tool {
}
}
- /*
- Parent class for all meta tests: MetaWriteTest, MetaRandomReadTest and
CleanMetaTest
- */
- static abstract class MetaTest extends TableTest {
- protected int keyLength;
-
- MetaTest(Connection con, TestOptions options, Status status) {
- super(con, options, status);
- keyLength = Integer.toString(opts.perClientRunRows).length();
- }
-
- @Override
- void onTakedown() throws IOException {
- // No clean up
- }
-
- /*
- Generates Lexicographically ascending strings
- */
- protected byte[] getSplitKey(final int i) {
- return Bytes.toBytes(String.format("%0" + keyLength + "d", i));
- }
-
- }
-
static abstract class AsyncTableTest extends AsyncTest {
protected AsyncTable<?> table;
@@ -2032,47 +1999,6 @@ public class PerformanceEvaluation extends Configured
implements Tool {
}
}
- /*
- Send random reads against fake regions inserted by MetaWriteTest
- */
- static class MetaRandomReadTest extends MetaTest {
- private Random rd = new Random();
- private RegionLocator regionLocator;
-
- MetaRandomReadTest(Connection con, TestOptions options, Status status) {
- super(con, options, status);
- LOG.info("call getRegionLocation");
- }
-
- @Override
- void onStartup() throws IOException {
- super.onStartup();
- this.regionLocator = connection.getRegionLocator(table.getName());
- }
-
- @Override
- boolean testRow(final int i, final long startTime) throws IOException,
InterruptedException {
- if (opts.randomSleep > 0) {
- Thread.sleep(rd.nextInt(opts.randomSleep));
- }
- HRegionLocation hRegionLocation = regionLocator.getRegionLocation(
- getSplitKey(rd.nextInt(opts.perClientRunRows)), true);
- LOG.debug("get location for region: " + hRegionLocation);
- return true;
- }
-
- @Override
- protected int getReportingPeriod() {
- int period = opts.perClientRunRows / 10;
- return period == 0 ? opts.perClientRunRows : period;
- }
-
- @Override
- protected void testTakedown() throws IOException {
- super.testTakedown();
- }
- }
-
static class RandomWriteTest extends SequentialWriteTest {
RandomWriteTest(Connection con, TestOptions options, Status status) {
super(con, options, status);
@@ -2262,34 +2188,6 @@ public class PerformanceEvaluation extends Configured
implements Tool {
}
}
- /*
- Delete all fake regions inserted to meta table by MetaWriteTest.
- */
- static class CleanMetaTest extends MetaTest {
- CleanMetaTest(Connection con, TestOptions options, Status status) {
- super(con, options, status);
- }
-
- @Override
- boolean testRow(final int i, final long startTime) throws IOException {
- try {
- RegionInfo regionInfo = connection.getRegionLocator(table.getName())
- .getRegionLocation(getSplitKey(i), false).getRegion();
- LOG.debug("deleting region from meta: " + regionInfo);
-
- Delete delete = MetaTableAccessor
- .makeDeleteFromRegionInfo(regionInfo, HConstants.LATEST_TIMESTAMP);
- try (Table t = MetaTableAccessor.getMetaHTable(connection)) {
- t.delete(delete);
- }
- } catch (IOException ie) {
- // Log and continue
- LOG.error("cannot find region with start key: " + i);
- }
- return true;
- }
- }
-
static class SequentialReadTest extends TableTest {
SequentialReadTest(Connection con, TestOptions options, Status status) {
super(con, options, status);
@@ -2379,32 +2277,6 @@ public class PerformanceEvaluation extends Configured
implements Tool {
}
}
- /*
- Insert fake regions into meta table with contiguous split keys.
- */
- static class MetaWriteTest extends MetaTest {
-
- MetaWriteTest(Connection con, TestOptions options, Status status) {
- super(con, options, status);
- }
-
- @Override
- boolean testRow(final int i, final long startTime) throws IOException {
- List<RegionInfo> regionInfos = new ArrayList<RegionInfo>();
- RegionInfo regionInfo =
(RegionInfoBuilder.newBuilder(TableName.valueOf(TABLE_NAME))
- .setStartKey(getSplitKey(i))
- .setEndKey(getSplitKey(i + 1))
- .build());
- regionInfos.add(regionInfo);
- MetaTableAccessor.addRegionsToMeta(connection, regionInfos, 1);
-
- // write the serverName columns
- MetaTableAccessor.updateRegionLocation(connection,
- regionInfo, ServerName.valueOf("localhost", 60010, rand.nextLong()), i,
- System.currentTimeMillis());
- return true;
- }
- }
static class FilteredScanTest extends TableTest {
protected static final Logger LOG =
LoggerFactory.getLogger(FilteredScanTest.class.getName());
