Merge branch 'dev' into dev_wenjun_unifyLogicTaskParams

apache · Jun 25, 2024 · c3c0103 · c3c0103
2 parents 1b0173e + f69e064
commit c3c0103
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/...try-jdbc/src/main/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcOperator.java b/...try-jdbc/src/main/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcOperator.java
@@ -27,7 +27,6 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.sql.SQLException;
-import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -142,7 +141,6 @@ public boolean existKey(String key) {
     /**
      * Try to acquire the target Lock, if cannot acquire, return null.
      */
-    @SuppressWarnings("checkstyle:IllegalCatch")
     public JdbcRegistryLock tryToAcquireLock(String key) {
         JdbcRegistryLock jdbcRegistryLock = JdbcRegistryLock.builder()
                 .lockKey(key)
@@ -154,7 +152,7 @@ public JdbcRegistryLock tryToAcquireLock(String key) {
             jdbcRegistryLockMapper.insert(jdbcRegistryLock);
             return jdbcRegistryLock;
         } catch (Exception e) {
-            if (e instanceof SQLIntegrityConstraintViolationException || e instanceof DuplicateKeyException) {
+            if (e instanceof DuplicateKeyException) {
                 return null;
             }
             throw e;

diff --git a/.../src/test/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcRegistryTestCase.java b/.../src/test/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcRegistryTestCase.java
@@ -17,8 +17,14 @@
 
 package org.apache.dolphinscheduler.plugin.registry.jdbc;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import org.apache.dolphinscheduler.plugin.registry.RegistryTestCase;
+import org.apache.dolphinscheduler.plugin.registry.jdbc.model.JdbcRegistryLock;
+
+import lombok.SneakyThrows;
 
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -33,6 +39,18 @@ public abstract class JdbcRegistryTestCase extends RegistryTestCase<JdbcRegistry
     @Autowired
     private JdbcOperator jdbcOperator;
 
+    @Test
+    @SneakyThrows
+    public void testTryToAcquireLock_lockIsAlreadyBeenAcquired() {
+        final String lockKey = "testTryToAcquireLock_lockIsAlreadyBeenAcquired";
+        // acquire success
+        JdbcRegistryLock jdbcRegistryLock = jdbcOperator.tryToAcquireLock(lockKey);
+        // acquire failed
+        assertThat(jdbcOperator.tryToAcquireLock(lockKey)).isNull();
+        // release
+        jdbcOperator.releaseLock(jdbcRegistryLock.getId());
+    }
+
     @Override
     public JdbcRegistry createRegistry() {
         return new JdbcRegistry(jdbcRegistryProperties, jdbcOperator);