fix "Creating folders with multiple threads will result in multiple i…

…dentical folders" apache#3487
muzhongjiang · Aug 17, 2020 · 3180e08 · 3180e08
1 parent c4bbb68
commit 3180e08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...scheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java b/...scheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
@@ -87,7 +87,7 @@ public class ResourcesService extends BaseService {
      * @return create directory result
      */
     @Transactional(rollbackFor = RuntimeException.class)
-    public synchronized Result createDirectory(User loginUser,
+    public  Result createDirectory(User loginUser,
                                  String name,
                                  String description,
                                  ResourceType type,
@@ -161,7 +161,7 @@ public synchronized Result createDirectory(User loginUser,
      * @return create result code
      */
     @Transactional(rollbackFor = RuntimeException.class)
-    public synchronized Result createResource(User loginUser,
+    public  Result createResource(User loginUser,
                                  String name,
                                  String desc,
                                  ResourceType type,

diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
@@ -499,7 +499,8 @@ CREATE TABLE t_ds_resources (
   pid int,
   full_name varchar(64),
   is_directory int,
-  PRIMARY KEY (id)
+  PRIMARY KEY (id),
+  CONSTRAINT t_ds_resources_un UNIQUE (full_name, type)
 ) ;
 
 

diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
@@ -630,7 +630,8 @@ CREATE TABLE `t_ds_resources` (
   `pid` int(11) DEFAULT NULL,
   `full_name` varchar(64) DEFAULT NULL,
   `is_directory` tinyint(4) DEFAULT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `t_ds_resources_UN` (`full_name`,`type`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------