From bae3a63e03c6d21e74bec4a776d061449a055448 Mon Sep 17 00:00:00 2001 From: Xu Cang Date: Tue, 19 Feb 2019 14:49:03 -0800 Subject: [PATCH] HBASE-21929 Fix TestRpcClientLeaks#testSocketClosed --- .../org/apache/hadoop/hbase/ipc/TestRpcClientLeaks.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcClientLeaks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcClientLeaks.java index 4922fd74fe..9b671adb4c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcClientLeaks.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcClientLeaks.java @@ -103,7 +103,7 @@ public class TestRpcClientLeaks { public static final Logger LOG = LoggerFactory.getLogger(TestRpcClientLeaks.class); - @Test(expected=RetriesExhaustedException.class) + @Test public void testSocketClosed() throws IOException, InterruptedException { TableName tableName = TableName.valueOf(name.getMethodName()); UTIL.createTable(tableName, fam1).close(); @@ -114,8 +114,11 @@ public class TestRpcClientLeaks { conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2); Connection connection = ConnectionFactory.createConnection(conf); Table table = connection.getTable(TableName.valueOf(name.getMethodName())); - table.get(new Get(Bytes.toBytes("asd"))); - connection.close(); + try { + table.get(new Get(Bytes.toBytes("asd"))); + } catch (RetriesExhaustedException e) { + } + assertTrue(MyRpcClientImpl.savedSockets.size() > 0); for (Socket socket : MyRpcClientImpl.savedSockets) { assertTrue("Socket + " + socket + " is not closed", socket.isClosed()); } -- 2.17.2 (Apple Git-113)