Skip to content

HBASE-24788: Fix the connection leaks on getting hbase admin from unc… #2170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bharathv merged 1 commit into from
Jul 30, 2020
Merged

HBASE-24788: Fix the connection leaks on getting hbase admin from unc… #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ public RecordWriter<KEY, Mutation> 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:" +
Expand Down
8 changes: 3 additions & 5 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 2 additions & 4 deletions ...e-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 2 additions & 7 deletions ...e-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
};
Expand Down