Optimized code base on code reviews.

Author: qiong-zhou

dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistry.java

@@ -315,7 +315,7 @@ public boolean acquireLock(String lockKey) {
             lockClient.lock(byteSequence(lockKey), leaseId).get();
 
             // save the leaseId for release Lock
-            lockMap.put(lockKey, new LockEntry(leaseId));
+            threadHeldLocks.put(lockKey, new LockEntry(leaseId));
             return true;
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -325,23 +325,16 @@ public boolean acquireLock(String lockKey) {
         }
     }
 
-    private static boolean currentThreadIsReentrant(String lockKey, Map<String, LockEntry> lockEntryMap) {
-        LockEntry lockEntry = lockEntryMap.get(lockKey);
-        if (lockEntry != null) {
-            lockEntry.lockCount.incrementAndGet();
-            return true;
-        }
-        return false;
     private static boolean acquireBasedOnThreadHeldLocks(String lockKey, Map<String, LockEntry> threadHeldLocks) {
         LockEntry lockEntry = threadHeldLocks.get(lockKey);
         if (lockEntry != null) {
             lockEntry.lockCount.incrementAndGet();
             return true;
-}
+        }
         return false;
     }
 
-    private static Map<String, LockEntry> getThreadLocks() {
+    private static Map<String, LockEntry> getThreadHeldLocks() {
         Map<String, LockEntry> lockEntryMap = threadLocalLockMap.get();
         if (null == lockEntryMap) {
             lockEntryMap = new HashMap<>();
@@ -352,8 +345,8 @@ private static Map<String, LockEntry> getThreadLocks() {
 
     @Override
     public boolean acquireLock(String key, long timeout) {
-        Map<String, LockEntry> lockEntryMap = getLockMapFromThreadLocal();
-        if (currentThreadIsReentrant(key, lockEntryMap)) {
+        Map<String, LockEntry> threadHeldLocks = getThreadHeldLocks();
+        if (acquireBasedOnThreadHeldLocks(key, threadHeldLocks)) {
             return true;
         }
 
@@ -368,7 +361,7 @@ public boolean acquireLock(String key, long timeout) {
             }));
 
             // save the leaseId for release Lock
-            lockEntryMap.put(key, new LockEntry(leaseId));
+            threadHeldLocks.put(key, new LockEntry(leaseId));
             return true;
         } catch (TimeoutException timeoutException) {
             log.debug("Acquire lock: {} in {}/ms timeout", key, timeout);

dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/src/main/java/org/apache/dolphinscheduler/plugin/registry/jdbc/server/JdbcRegistryLockManager.java

@@ -55,7 +55,7 @@ public JdbcRegistryLockManager(JdbcRegistryProperties jdbcRegistryProperties,
     public void acquireJdbcRegistryLock(Long clientId, String lockKey) {
         String lockOwner = LockUtils.getLockOwner();
         while (true) {
-            if (currentThreadIsReentrant(lockKey, lockOwner)) {
+            if (tryReenterLock(lockKey, lockOwner)) {
                 return;
             }
             JdbcRegistryLockDTO jdbcRegistryLock = JdbcRegistryLockDTO.builder()
@@ -87,7 +87,7 @@ public void acquireJdbcRegistryLock(Long clientId, String lockKey) {
 
     private boolean tryReenterLock(String lockKey, String lockAcquirer) {
         LockEntry lockEntry = jdbcRegistryLockHolderMap.get(lockKey);
-        if (lockEntry != null && lockOwner.equals(lockEntry.getLockOwner())) {
+        if (lockEntry != null && lockAcquirer.equals(lockEntry.getLockOwner())) {
             lockEntry.lockCount.incrementAndGet();
             return true;
         }
@@ -99,7 +99,7 @@ public boolean acquireJdbcRegistryLock(Long clientId, String lockKey, long timeo
         String lockOwner = LockUtils.getLockOwner();
         long start = System.currentTimeMillis();
         while (System.currentTimeMillis() - start <= timeout) {
-            if (currentThreadIsReentrant(lockKey, lockOwner)) {
+            if (tryReenterLock(lockKey, lockOwner)) {
                 return true;
             }
             JdbcRegistryLockDTO jdbcRegistryLock = JdbcRegistryLockDTO.builder()