From e4c9e5dbe2988522f0f4c424fa3641516f2593d8 Mon Sep 17 00:00:00 2001 From: Wellington Chevreuil Date: Mon, 18 Oct 2021 11:22:36 +0100 Subject: [PATCH 1/2] HBASE-26364 TestThriftServer is failing 100% in our flaky test job --- .../hadoop/hbase/thrift/TestThriftServer.java | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java index b596e1ee4a6e..36a5cc5a2c2d 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java @@ -254,8 +254,10 @@ private static ThriftMetrics getMetrics(Configuration conf) throws Exception { public static void createTestTables(Hbase.Iface handler) throws Exception { // Create/enable/disable/delete tables, ensure methods act correctly List bbs = handler.getTableNames(); - assertEquals(bbs.stream().map(b -> Bytes.toString(b.array())). - collect(Collectors.joining(",")), 0, bbs.size()); + assertEquals(bbs.stream().map(b -> { + return Bytes.toString(b.array()); + } + ).collect(Collectors.joining(",")), 0, bbs.size()); handler.createTable(tableAname, getColumnDescriptors()); assertEquals(1, handler.getTableNames().size()); assertEquals(2, handler.getColumnDescriptors(tableAname).size()); @@ -762,50 +764,49 @@ public void testMetricsWithException() throws Exception { String col = "c"; // create a table which will throw exceptions for requests final TableName tableName = TableName.valueOf(name.getMethodName()); - - ColumnFamilyDescriptor columnFamilyDescriptor = ColumnFamilyDescriptorBuilder - .newBuilder(Bytes.toBytes(family)) - .build(); - TableDescriptor tableDescriptor = - TableDescriptorBuilder.newBuilder(tableName) + try { + ColumnFamilyDescriptor columnFamilyDescriptor = + ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(family)).build(); + TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName) .setCoprocessor(ErrorThrowingGetObserver.class.getName()) - .setColumnFamily(columnFamilyDescriptor) - .build(); + .setColumnFamily(columnFamilyDescriptor).build(); - Table table = UTIL.createTable(tableDescriptor, null); - long now = EnvironmentEdgeManager.currentTime(); - table.put(new Put(Bytes.toBytes(rowkey)) + Table table = UTIL.createTable(tableDescriptor, null); + long now = EnvironmentEdgeManager.currentTime(); + table.put(new Put(Bytes.toBytes(rowkey)) .addColumn(Bytes.toBytes(family), Bytes.toBytes(col), now, Bytes.toBytes("val1"))); - Configuration conf = UTIL.getConfiguration(); - ThriftMetrics metrics = getMetrics(conf); - ThriftHBaseServiceHandler hbaseHandler = - new ThriftHBaseServiceHandler(UTIL.getConfiguration(), - UserProvider.instantiate(UTIL.getConfiguration())); - Hbase.Iface handler = HbaseHandlerMetricsProxy.newInstance(hbaseHandler, metrics, conf); + Configuration conf = UTIL.getConfiguration(); + ThriftMetrics metrics = getMetrics(conf); + ThriftHBaseServiceHandler hbaseHandler = + new ThriftHBaseServiceHandler(UTIL.getConfiguration(), UserProvider.instantiate(UTIL.getConfiguration())); + Hbase.Iface handler = HbaseHandlerMetricsProxy.newInstance(hbaseHandler, metrics, conf); - ByteBuffer tTableName = asByteBuffer(tableName.getNameAsString()); + ByteBuffer tTableName = asByteBuffer(tableName.getNameAsString()); - // check metrics increment with a successful get - long preGetCounter = metricsHelper.checkCounterExists("getRow_num_ops", metrics.getSource()) ? + // check metrics increment with a successful get + long preGetCounter = metricsHelper.checkCounterExists("getRow_num_ops", metrics.getSource()) ? metricsHelper.getCounter("getRow_num_ops", metrics.getSource()) : 0; - List tRowResult = handler.getRow(tTableName, asByteBuffer(rowkey), null); - assertEquals(1, tRowResult.size()); - TRowResult tResult = tRowResult.get(0); + List tRowResult = handler.getRow(tTableName, asByteBuffer(rowkey), null); + assertEquals(1, tRowResult.size()); + TRowResult tResult = tRowResult.get(0); - TCell expectedColumnValue = new TCell(asByteBuffer("val1"), now); + TCell expectedColumnValue = new TCell(asByteBuffer("val1"), now); - assertArrayEquals(Bytes.toBytes(rowkey), tResult.getRow()); - Collection returnedColumnValues = tResult.getColumns().values(); - assertEquals(1, returnedColumnValues.size()); - assertEquals(expectedColumnValue, returnedColumnValues.iterator().next()); + assertArrayEquals(Bytes.toBytes(rowkey), tResult.getRow()); + Collection returnedColumnValues = tResult.getColumns().values(); + assertEquals(1, returnedColumnValues.size()); + assertEquals(expectedColumnValue, returnedColumnValues.iterator().next()); - metricsHelper.assertCounter("getRow_num_ops", preGetCounter + 1, metrics.getSource()); + metricsHelper.assertCounter("getRow_num_ops", preGetCounter + 1, metrics.getSource()); - // check metrics increment when the get throws each exception type - for (ErrorThrowingGetObserver.ErrorType type : ErrorThrowingGetObserver.ErrorType.values()) { - testExceptionType(handler, metrics, tTableName, rowkey, type); + // check metrics increment when the get throws each exception type + for (ErrorThrowingGetObserver.ErrorType type : ErrorThrowingGetObserver.ErrorType.values()) { + testExceptionType(handler, metrics, tTableName, rowkey, type); + } + } finally { + UTIL.deleteTable(tableName); } } From 88aa37914adc800e162fda1cbf74fa785b923d24 Mon Sep 17 00:00:00 2001 From: Wellington Chevreuil Date: Mon, 18 Oct 2021 11:26:26 +0100 Subject: [PATCH 2/2] reverting reformat --- .../org/apache/hadoop/hbase/thrift/TestThriftServer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java index 36a5cc5a2c2d..3063b068a34e 100644 --- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java +++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java @@ -254,10 +254,8 @@ private static ThriftMetrics getMetrics(Configuration conf) throws Exception { public static void createTestTables(Hbase.Iface handler) throws Exception { // Create/enable/disable/delete tables, ensure methods act correctly List bbs = handler.getTableNames(); - assertEquals(bbs.stream().map(b -> { - return Bytes.toString(b.array()); - } - ).collect(Collectors.joining(",")), 0, bbs.size()); + assertEquals(bbs.stream().map(b -> Bytes.toString(b.array())). + collect(Collectors.joining(",")), 0, bbs.size()); handler.createTable(tableAname, getColumnDescriptors()); assertEquals(1, handler.getTableNames().size()); assertEquals(2, handler.getColumnDescriptors(tableAname).size());