From a2f372c794863a99e9afc9db61493cbf1477a4da Mon Sep 17 00:00:00 2001 From: liujinhui1994 <965147871@qq.com> Date: Sun, 17 Jul 2022 16:06:37 +0800 Subject: [PATCH 1/4] HUDI-4409 --- .../apache/hudi/client/transaction/lock/LockManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java index ca15c4fdc2a13..1542148834a9a 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java @@ -68,9 +68,14 @@ public void lock() { if (acquired) { break; } - LOG.info("Retrying to acquire lock..."); - Thread.sleep(maxWaitTimeInMs); } catch (HoodieLockException | InterruptedException e) { + LOG.info("Retrying to acquire lock..."); + try { + Thread.sleep(maxWaitTimeInMs); + } catch (InterruptedException ex) { + // ignore InterruptedException here + } + if (retryCount >= maxRetries) { throw new HoodieLockException("Unable to acquire lock, lock object ", e); } From c1afd2ad2d1ad6b4fc9aee39169fd90d614e7e97 Mon Sep 17 00:00:00 2001 From: liujinhui1994 <965147871@qq.com> Date: Sun, 17 Jul 2022 16:11:29 +0800 Subject: [PATCH 2/4] HUDI-4409 --- .../org/apache/hudi/client/transaction/lock/LockManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java index 1542148834a9a..ef65d4cd87b8b 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java @@ -68,6 +68,7 @@ public void lock() { if (acquired) { break; } + Thread.sleep(maxWaitTimeInMs); } catch (HoodieLockException | InterruptedException e) { LOG.info("Retrying to acquire lock..."); try { From d3c896da8d2e2d50ca806a9ca630ac5b3d0ef6d5 Mon Sep 17 00:00:00 2001 From: liujinhui1994 <965147871@qq.com> Date: Sun, 17 Jul 2022 16:11:59 +0800 Subject: [PATCH 3/4] HUDI-4409 --- .../org/apache/hudi/client/transaction/lock/LockManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java index ef65d4cd87b8b..a5d5f4271662c 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java @@ -68,9 +68,9 @@ public void lock() { if (acquired) { break; } + LOG.info("Retrying to acquire lock..."); Thread.sleep(maxWaitTimeInMs); } catch (HoodieLockException | InterruptedException e) { - LOG.info("Retrying to acquire lock..."); try { Thread.sleep(maxWaitTimeInMs); } catch (InterruptedException ex) { From cf4238bd32291c0003bf4157bfa84db90fb2f82d Mon Sep 17 00:00:00 2001 From: liujinhui1994 <965147871@qq.com> Date: Mon, 18 Jul 2022 11:00:11 +0800 Subject: [PATCH 4/4] HUDI-4409 --- .../apache/hudi/client/transaction/lock/LockManager.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java index a5d5f4271662c..6ebae44fd467c 100644 --- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java +++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/LockManager.java @@ -71,15 +71,14 @@ public void lock() { LOG.info("Retrying to acquire lock..."); Thread.sleep(maxWaitTimeInMs); } catch (HoodieLockException | InterruptedException e) { + if (retryCount >= maxRetries) { + throw new HoodieLockException("Unable to acquire lock, lock object ", e); + } try { Thread.sleep(maxWaitTimeInMs); } catch (InterruptedException ex) { // ignore InterruptedException here } - - if (retryCount >= maxRetries) { - throw new HoodieLockException("Unable to acquire lock, lock object ", e); - } } finally { retryCount++; }