From e2cd5b671e9c4e3a95f5bbdd42607418bae38707 Mon Sep 17 00:00:00 2001
From: Sagar Sumit <sagarsumit09@gmail.com>
Date: Mon, 1 Aug 2022 21:24:58 +0530
Subject: [PATCH] [HUDI-4518] Free lock if allocated but not acquired

---
 .../hive/transaction/lock/HiveMetastoreBasedLockProvider.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/transaction/lock/HiveMetastoreBasedLockProvider.java b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/transaction/lock/HiveMetastoreBasedLockProvider.java
index aeeccf906fe96..328c8666a3072 100644
--- a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/transaction/lock/HiveMetastoreBasedLockProvider.java
+++ b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/transaction/lock/HiveMetastoreBasedLockProvider.java
@@ -149,6 +149,7 @@ public void close() {
     try {
       if (lock != null) {
         hiveClient.unlock(lock.getLockid());
+        lock = null;
       }
       Hive.closeCurrent();
     } catch (Exception e) {
@@ -197,6 +198,7 @@ private void acquireLockInternal(long time, TimeUnit unit, LockComponent lockCom
       // it is better to release WAITING lock, otherwise hive lock will hang forever
       if (this.lock != null && this.lock.getState() != LockState.ACQUIRED) {
         hiveClient.unlock(this.lock.getLockid());
+        lock = null;
       }
     }
   }