From 661bfca92cf528aebcf7bbe65632bbc514712678 Mon Sep 17 00:00:00 2001 From: Sandeep Pal <50725353+sandeepvinayak@users.noreply.github.com> Date: Wed, 29 Jul 2020 09:47:54 -0700 Subject: [PATCH] HBASE-24788: Fix the connection leaks on getting hbase admin from unclosed connection Rewrote the patch for branch-1 since master has significanly diverged. (cherry picked from commit dc5ef7af1f8b9e386495a73924c9442203f65a77) Co-authored-by: Bharath Vissapragada --- .../apache/hadoop/hbase/mapreduce/TableOutputFormat.java | 4 ++-- .../hadoop/hbase/replication/TestReplicationBase.java | 8 +++----- .../hbase/replication/TestReplicationSmallTests.java | 6 ++---- .../hbase/security/access/TestNamespaceCommands.java | 9 ++------- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java index 443d4b2d97c2..2109e05100d1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java @@ -173,8 +173,8 @@ public RecordWriter getRecordWriter(TaskAttemptContext context) @Override public void checkOutputSpecs(JobContext context) throws IOException, InterruptedException { - - try (Admin admin = ConnectionFactory.createConnection(getConf()).getAdmin()) { + try (Connection conn = ConnectionFactory.createConnection(getConf()); + Admin admin = conn.getAdmin()) { TableName tableName = TableName.valueOf(this.conf.get(OUTPUT_TABLE)); if (!admin.tableExists(tableName)) { throw new TableNotFoundException("Can't write, table does not exist:" + diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java index ddd319586b49..b0f3f340be08 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java @@ -145,12 +145,10 @@ public static void setUpBeforeClass() throws Exception { table.addFamily(fam); fam = new HColumnDescriptor(noRepfamName); table.addFamily(fam); - Connection connection1 = ConnectionFactory.createConnection(conf1); - Connection connection2 = ConnectionFactory.createConnection(conf2); - try (Admin admin1 = connection1.getAdmin()) { + Connection connection1 = utility1.getConnection(); + Connection connection2 = utility2.getConnection(); + try (Admin admin1 = connection1.getAdmin(); Admin admin2 = connection2.getAdmin()) { admin1.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); - } - try (Admin admin2 = connection2.getAdmin()) { admin2.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); } utility1.waitUntilAllRegionsAssigned(tableName); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java index f94ad5a1b468..0bd339a179d0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java @@ -518,12 +518,10 @@ public void testVerifyRepJobWithRawOptions() throws Exception { fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL); table.addFamily(fam); - Connection connection1 = ConnectionFactory.createConnection(conf1); - Connection connection2 = ConnectionFactory.createConnection(conf2); - try (Admin admin1 = connection1.getAdmin()) { + try (Admin admin1 = utility1.getConnection().getAdmin()) { admin1.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); } - try (Admin admin2 = connection2.getAdmin()) { + try (Admin admin2 = utility2.getConnection().getAdmin()) { admin2.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); } utility1.waitUntilAllRegionsAssigned(tablename); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java index a20ceeb576a2..72cc7e679f06 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java @@ -303,14 +303,9 @@ public void testListNamespaces() throws Exception { AccessTestAction listAction = new AccessTestAction() { @Override public Object run() throws Exception { - Connection unmanagedConnection = - ConnectionFactory.createConnection(UTIL.getConfiguration()); - Admin admin = unmanagedConnection.getAdmin(); - try { + try (Connection conn = ConnectionFactory.createConnection(UTIL.getConfiguration()); + Admin admin = conn.getAdmin()) { return Arrays.asList(admin.listNamespaceDescriptors()); - } finally { - admin.close(); - unmanagedConnection.close(); } } };