Merge remote-tracking branch 'origin/dev-1.10.0' into dev-1.10.0

WeDataSphere · Dec 12, 2024 · 27f51b7 · 27f51b7
2 parents b1379be + ee23a94
commit 27f51b7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/...ebank/wedatasphere/dss/appconn/schedulis/conversion/AzkabanWorkflowToRelSynchronizer.java b/...ebank/wedatasphere/dss/appconn/schedulis/conversion/AzkabanWorkflowToRelSynchronizer.java
@@ -56,7 +56,7 @@ public class AzkabanWorkflowToRelSynchronizer implements WorkflowToRelSynchroniz
     private DSSToRelConversionOperation dssToRelConversionOperation;
     //匹配wtss返回的错误信息
     private static final Pattern ERROR_PATTERN = Pattern.compile("(?<=Error uploading project properties)[\\s\\S]+.job");
-    private static final int SCHEDULIS_MAX_SIZE = 250;
+    private static final int SCHEDULIS_MAX_SIZE = 1024;
 
     public void init() {
         String baseUrl = dssToRelConversionOperation.getConversionService().getAppInstance().getBaseUrl();
@@ -139,7 +139,7 @@ private String dealSchedulisErrorMsg(String errorMsg) {
         Matcher matcher = ERROR_PATTERN.matcher(errorMsg);
         if (matcher.find() && matcher.group().length() >= SCHEDULIS_MAX_SIZE) {
             errorMsg = "wokflow name " + matcher.group().split("/")[1] + " is to long, please abide the rules of schedulis: projectName + workflowName*3 + 12 <= 250 " +
-                    "(工作流名称太长，需要满足规则 项目名长度 + 工作流长度*3 + 12 <= 250)";        }
+                    "(工作流名称太长，需要满足规则 项目名长度 + 工作流长度*3 + 12 <= 1024)";        }
         return errorMsg;
     }
 }
diff --git a/...rver/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java b/...rver/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java
@@ -33,6 +33,9 @@ public class DSSWorkspace {
     private String lastUpdateUser;
     private String workspaceType;
     private int adminPermission;
+    private Boolean enabledFlowKeywordsCheck;
+
+    private Boolean isDefaultReference;
 
     public int getAdminPermission() {
         return adminPermission;
@@ -137,4 +140,20 @@ public String getLastUpdateUser() {
     public void setLastUpdateUser(String lastUpdateUser) {
         this.lastUpdateUser = lastUpdateUser;
     }
+
+    public Boolean getEnabledFlowKeywordsCheck() {
+        return enabledFlowKeywordsCheck;
+    }
+
+    public void setEnabledFlowKeywordsCheck(Boolean enabledFlowKeywordsCheck) {
+        this.enabledFlowKeywordsCheck = enabledFlowKeywordsCheck;
+    }
+
+    public Boolean getDefaultReference() {
+        return isDefaultReference;
+    }
+
+    public void setDefaultReference(Boolean defaultReference) {
+        isDefaultReference = defaultReference;
+    }
 }
diff --git a/...src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceMapper.java b/...src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceMapper.java
@@ -36,6 +36,7 @@ public interface DSSWorkspaceMapper {
             @Result(property = "createTime", column = "create_time"),
             @Result(property = "lastUpdateTime", column = "last_update_time"),
             @Result(property = "lastUpdateUser", column = "last_update_user"),
+            @Result(property = "enabledFlowKeywordsCheck",column = "enabled_flow_keywords_check"),
     })
     DSSWorkspace getWorkspace(@Param("workspaceId") int workspaceId);
 

diff --git a/...rc/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/WorkspaceMapper.xml b/...rc/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/WorkspaceMapper.xml
@@ -61,7 +61,9 @@
         last_update_time,
         last_update_user,
         workspace_type,
-        admin_permission
+        admin_permission,
+        enabled_flow_keywords_check as enabledFlowKeywordsCheck,
+        is_default_reference as isDefaultReference
         FROM
         dss_workspace WHERE id = #{workspaceId}
     </select>

diff --git a/...n/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/...n/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -432,12 +432,12 @@ public void run() {
         }
 
         try {
-            // 等待线程完成,等待线程超过60s后超时
+            // 等待线程完成
             for (Future future : futureList) {
-                future.get(60, TimeUnit.SECONDS);
+                future.get();
             }
         } catch (Exception e) {
-            logger.error("export-flow-node thread fail msg is ｛｝ ", e);
+            logger.error("{} flow export fail msg is ｛｝ ", flowName, e);
             throw new RuntimeException(e);
         }