Merge branch 'dev' into dev

zhongjiajie · web-flow · commit b7124e41da3f · 2023-07-21T15:20:24.000+08:00
diff --git a/.github/mergeable.yml b/.github/mergeable.yml
@@ -58,5 +58,5 @@ mergeable:
               regex: 'feature|bug|improvement|document|chore'
               message: 'Label must include one of the following: `feature`, `bug`, `improvement`, `document`, `chore`'
           - must_include:
-              regex: '\d+\.\d+\.\w+'
-              message: 'Label must include one or more version numbers.'
+              regex: 'ready-to-merge'
+              message: 'Please check if there are PRs that already have a `ready-to-merge` label and can be merged, if exists please merge them first.'
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
@@ -44,7 +44,11 @@ public class K8sClientService {
 
     public ResourceQuota upsertNamespaceAndResourceToK8s(K8sNamespace k8sNamespace,
                                                          String yamlStr) throws RemotingException {
-        upsertNamespaceToK8s(k8sNamespace.getNamespace(), k8sNamespace.getClusterCode());
+        if (!checkNamespaceToK8s(k8sNamespace.getNamespace(), k8sNamespace.getClusterCode())) {
+            throw new RemotingException(String.format(
+                    "namespace %s does not exist in k8s cluster, please create namespace in k8s cluster first",
+                    k8sNamespace.getNamespace()));
+        }
         return upsertNamespacedResourceToK8s(k8sNamespace, yamlStr);
     }
 
@@ -101,19 +105,9 @@ private Optional<Namespace> getNamespaceFromK8s(String name, Long clusterCode) t
         return list;
     }
 
-    private Namespace upsertNamespaceToK8s(String name, Long clusterCode) throws RemotingException {
+    private boolean checkNamespaceToK8s(String name, Long clusterCode) throws RemotingException {
         Optional<Namespace> result = getNamespaceFromK8s(name, clusterCode);
-        // if not exist create
-        if (!result.isPresent()) {
-            KubernetesClient client = k8sManager.getK8sClient(clusterCode);
-            Namespace body = new Namespace();
-            ObjectMeta meta = new ObjectMeta();
-            meta.setNamespace(name);
-            meta.setName(name);
-            body.setMetadata(meta);
-            return client.namespaces().create(body);
-        }
-        return result.get();
+        return result.isPresent();
     }
 
 }
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
@@ -29,7 +29,6 @@
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
 import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
-import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -322,15 +321,7 @@ public Map<String, Object> deleteNamespaceById(User loginUser, int id) {
             putMsg(result, Status.K8S_NAMESPACE_NOT_EXIST, id);
             return result;
         }
-        if (!Constants.K8S_LOCAL_TEST_CLUSTER_CODE.equals(k8sNamespaceObj.getClusterCode())) {
-            try {
-                k8sClientService.deleteNamespaceToK8s(k8sNamespaceObj.getNamespace(), k8sNamespaceObj.getClusterCode());
-            } catch (RemotingException e) {
-                log.error("Namespace delete in k8s error, namespaceId:{}.", id, e);
-                putMsg(result, Status.K8S_CLIENT_OPS_ERROR, id);
-                return result;
-            }
-        }
+
         k8sNamespaceMapper.deleteById(id);
         log.info("K8s namespace delete complete, namespace:{}.", k8sNamespaceObj.getNamespace());
         putMsg(result, Status.SUCCESS);
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
@@ -347,7 +347,8 @@ public boolean isTaskComplete() {
 
         return this.getState().isSuccess()
                 || this.getState().isKill()
-                || (this.getState().isFailure() && !taskCanRetry());
+                || (this.getState().isFailure() && !taskCanRetry())
+                || this.getState().isForceSuccess();
     }
 
     public boolean isSubProcess() {
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ProcessUtils.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ProcessUtils.java
@@ -135,7 +135,7 @@ public static String getPidsStr(int processId) throws Exception {
     }
 
     /**
-     * cacel k8s / yarn application
+     * cancel k8s / yarn application
      *
      * @param taskExecutionContext
      * @return

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,8 @@ public boolean isTaskComplete() {`
`347`	`347`
`348`	`348`	`return this.getState().isSuccess()`
`349`	`349`	`\|\| this.getState().isKill()`
`350`		`- \|\| (this.getState().isFailure() && !taskCanRetry());`
	`350`	`+ \|\| (this.getState().isFailure() && !taskCanRetry())`
	`351`	`+ \|\| this.getState().isForceSuccess();`
`351`	`352`	`}`
`352`	`353`
`353`	`354`	`public boolean isSubProcess() {`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public static String getPidsStr(int processId) throws Exception {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`/**`
`138`		`- * cacel k8s / yarn application`
	`138`	`+ * cancel k8s / yarn application`
`139`	`139`	`*`
`140`	`140`	`* @param taskExecutionContext`
`141`	`141`	`* @return`