diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index f554f06..dcb419c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -2377,9 +2377,10 @@ public class HBaseAdmin implements Abortable, Closeable { } @Override - public void close() throws IOException { + public synchronized void close() throws IOException { if (cleanupConnectionOnClose && this.connection != null) { this.connection.close(); + this.connection = null; } } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index e23a29b..3bcd689 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -3017,7 +3017,6 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { totalNumberOfRegions); admin.createTable(desc, splits); - admin.close(); } catch (MasterNotRunningException e) { LOG.error("Master not running", e); throw new IOException(e);