lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-2248] Fixing the closing of hms client (#3364)

Browse Source 
* [HUDI-2248] Fixing the closing of hms client

* [HUDI-2248] Using Hive.closeCurrent() over client.close()
This commit is contained in:
jsbali
2021-09-24 02:15:24 +05:30
committed by GitHub
parent b4b23e401b
commit f52cb32f5f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveMetastoreBasedLockProvider.java
View File

@@ -149,7 +149,7 @@ public class HiveMetastoreBasedLockProvider implements LockProvider<LockResponse
if (lock != null) { if (lock != null) {
hiveClient.unlock(lock.getLockid()); hiveClient.unlock(lock.getLockid());
} }
hiveClient.close(); Hive.closeCurrent();
} catch (Exception e) { } catch (Exception e) {
LOG.error(generateLogStatement(org.apache.hudi.common.lock.LockState.FAILED_TO_RELEASE, generateLogSuffixString())); LOG.error(generateLogStatement(org.apache.hudi.common.lock.LockState.FAILED_TO_RELEASE, generateLogSuffixString()));
} }

2
hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
View File

@@ -295,7 +295,7 @@ public class HoodieHiveClient extends AbstractSyncHoodieClient {
try { try {
ddlExecutor.close(); ddlExecutor.close();
if (client != null) { if (client != null) {
client.close(); Hive.closeCurrent();
client = null; client = null;
} }
} catch (Exception e) { } catch (Exception e) {

3
hudi-sync/hudi-hive-sync/src/test/java/org/apache/hudi/hive/testutils/TestCluster.java
View File

@@ -47,6 +47,7 @@ import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.apache.hadoop.hive.metastore.RetryingMetaStoreClient; import org.apache.hadoop.hive.metastore.RetryingMetaStoreClient;
import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hive.service.server.HiveServer2; import org.apache.hive.service.server.HiveServer2;
import org.apache.parquet.avro.AvroSchemaConverter; import org.apache.parquet.avro.AvroSchemaConverter;
import org.apache.parquet.hadoop.ParquetWriter; import org.apache.parquet.hadoop.ParquetWriter;
@@ -265,7 +266,7 @@ public class TestCluster implements BeforeAllCallback, AfterAllCallback,
public void shutDown() { public void shutDown() {
stopHiveServer2(); stopHiveServer2();
client.close(); Hive.closeCurrent();
hiveTestService.getHiveMetaStore().stop(); hiveTestService.getHiveMetaStore().stop();
hdfsTestService.stop(); hdfsTestService.stop();
} }