HBASE-26364 TestThriftServer is failing 100% in our flaky test job (#3759)

Signed-off-by: Xiaolin Ha <haxiaolin@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
Wellington Ramos Chevreuil 2021-10-18 13:59:42 +01:00 committed by GitHub
parent 1020fe1c38
commit 4454c2f909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 32 deletions

View File

@ -762,15 +762,12 @@ public class TestThriftServer {
String col = "c"; String col = "c";
// create a table which will throw exceptions for requests // create a table which will throw exceptions for requests
final TableName tableName = TableName.valueOf(name.getMethodName()); final TableName tableName = TableName.valueOf(name.getMethodName());
try {
ColumnFamilyDescriptor columnFamilyDescriptor = ColumnFamilyDescriptorBuilder ColumnFamilyDescriptor columnFamilyDescriptor =
.newBuilder(Bytes.toBytes(family)) ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(family)).build();
.build(); TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName)
TableDescriptor tableDescriptor =
TableDescriptorBuilder.newBuilder(tableName)
.setCoprocessor(ErrorThrowingGetObserver.class.getName()) .setCoprocessor(ErrorThrowingGetObserver.class.getName())
.setColumnFamily(columnFamilyDescriptor) .setColumnFamily(columnFamilyDescriptor).build();
.build();
Table table = UTIL.createTable(tableDescriptor, null); Table table = UTIL.createTable(tableDescriptor, null);
long now = EnvironmentEdgeManager.currentTime(); long now = EnvironmentEdgeManager.currentTime();
@ -780,8 +777,7 @@ public class TestThriftServer {
Configuration conf = UTIL.getConfiguration(); Configuration conf = UTIL.getConfiguration();
ThriftMetrics metrics = getMetrics(conf); ThriftMetrics metrics = getMetrics(conf);
ThriftHBaseServiceHandler hbaseHandler = ThriftHBaseServiceHandler hbaseHandler =
new ThriftHBaseServiceHandler(UTIL.getConfiguration(), new ThriftHBaseServiceHandler(UTIL.getConfiguration(), UserProvider.instantiate(UTIL.getConfiguration()));
UserProvider.instantiate(UTIL.getConfiguration()));
Hbase.Iface handler = HbaseHandlerMetricsProxy.newInstance(hbaseHandler, metrics, conf); Hbase.Iface handler = HbaseHandlerMetricsProxy.newInstance(hbaseHandler, metrics, conf);
ByteBuffer tTableName = asByteBuffer(tableName.getNameAsString()); ByteBuffer tTableName = asByteBuffer(tableName.getNameAsString());
@ -807,6 +803,9 @@ public class TestThriftServer {
for (ErrorThrowingGetObserver.ErrorType type : ErrorThrowingGetObserver.ErrorType.values()) { for (ErrorThrowingGetObserver.ErrorType type : ErrorThrowingGetObserver.ErrorType.values()) {
testExceptionType(handler, metrics, tTableName, rowkey, type); testExceptionType(handler, metrics, tTableName, rowkey, type);
} }
} finally {
UTIL.deleteTable(tableName);
}
} }
private void testExceptionType(Hbase.Iface handler, ThriftMetrics metrics, private void testExceptionType(Hbase.Iface handler, ThriftMetrics metrics,