Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler in…

…to taskGroupApi
apache · Dec 24, 2021 · c9da913 · c9da913
2 parents 086a6ef + b2852a7
commit c9da913
Show file tree

Hide file tree

Showing 97 changed files with 2,342 additions and 818 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,11 +1,11 @@
-
-# Development
+# How To Contribute
 
 Start by forking the dolphinscheduler GitHub repository, make changes in a branch and then send a pull request.
 
 ## Set up your dolphinscheduler GitHub Repository
 
 There are three branches in the remote repository currently:
+
   - `master` : normal delivery branch. After the stable version is released, the code for the stable version branch is merged into the master branch.
 
   - `dev` : daily development branch. The daily development branch, the newly submitted code can pull requests to this branch.
@@ -17,12 +17,12 @@ So, you should fork the `dev` branch.
 After forking the [dolphinscheduler upstream source repository](https://github.com/apache/dolphinscheduler/fork) to your personal repository, you can set your  personal development environment.
 
 ```sh
-$ cd <your work direcotry>
-$ git clone < your personal forked dolphinscheduler repo>
-$ cd dolphinscheduler
+cd <your work direcotry>
+git clone <your personal forked dolphinscheduler repo>
+cd dolphinscheduler
 ```
 
-## Set git remote as ``upstream``
+## Set git remote as `upstream`
 
 Add remote repository address, named upstream
 
@@ -52,35 +52,35 @@ git checkout origin/dev
 git merge --no-ff upstream/dev
 ```
 
-If remote branch has a new branch `DEV-1.0`, you need to synchronize this branch to the local repository.
+If remote branch has a new branch `dev-1.0`, you need to synchronize this branch to the local repository, then push to your own repository.
 
-```
+```sh
 git checkout -b dev-1.0 upstream/dev-1.0
 git push --set-upstream origin dev-1.0
 ```
 
 ## Create your feature branch
+
 Before making code changes, make sure you create a separate branch for them.
 
 ```sh
-$ git checkout -b <your-feature>
+git checkout -b <your-feature-branch> dev
 ```
 
 ## Commit changes
+
 After modifying the code locally, submit it to your own repository:
 
 ```sh
-
 git commit -m 'information about your feature'
 ```
 
 ## Push to the branch
 
-
 Push your locally committed changes to the remote origin (your fork).
 
-```
-$ git push origin <your-feature>
+```sh
+git push origin <your-feature-branch>
 ```
 
 ## Create a pull request
@@ -99,14 +99,3 @@ Select the modified local branch and the branch to merge past to create a pull r
 </p>
 
 Next, the administrator is responsible for **merging** to complete the pull request.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/README.md b/README.md
@@ -102,6 +102,16 @@ You are very welcome to communicate with the developers and users of Dolphin Sch
 
 The community welcomes everyone to contribute, please refer to this page to find out more: [How to contribute](https://dolphinscheduler.apache.org/en-us/community/development/contribute.html).
 
+# Landscapes
+
+<p align="center">
+<br/><br/>
+<img src="https://landscape.cncf.io/images/left-logo.svg" width="150"/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/right-logo.svg" width="200"/>
+<br/><br/>
+DolphinScheduler enriches the <a href="https://landscape.cncf.io/landscape=observability-and-analysis&license=apache-license-2-0">CNCF CLOUD NATIVE Landscape.</a >
+
+</p >
+
 ## License
 
 Please refer to the [LICENSE](https://github.com/apache/dolphinscheduler/blob/dev/LICENSE) file.
diff --git a/...uler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/...uler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -81,8 +81,11 @@
                 #{i}
             </foreach>
         </if>
-        <if test="startTime != null and endTime != null">
-            and t.start_time > #{startTime} and t.start_time <![CDATA[ <= ]]> #{endTime}
+        <if test="startTime != null">
+            and t.start_time <![CDATA[ > ]]> #{startTime}
+        </if>
+        <if test="endTime != null">
+            and t.start_time <![CDATA[ <= ]]> #{endTime}
         </if>
         group by t.state
     </select>

diff --git a/...esources/sql/dolphinscheduler_postgre.sql → ...urces/sql/dolphinscheduler_postgresql.sql b/...esources/sql/dolphinscheduler_postgre.sql → ...urces/sql/dolphinscheduler_postgresql.sql
diff --git a/dolphinscheduler-e2e/README.md b/dolphinscheduler-e2e/README.md
@@ -14,13 +14,13 @@ following fields,
 
 ```java
 public final class LoginPage {
-    @FindBy(id = "input-username")
+    @FindBy(id = "inputUsername")
     private WebElement inputUsername;
 
-    @FindBy(id = "input-password")
+    @FindBy(id = "inputPassword")
     private WebElement inputPassword;
 
-    @FindBy(id = "button-login")
+    @FindBy(id = "btnLogin")
     private WebElement buttonLogin;
 }
 ```

diff --git a/...phinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/LoginPage.java b/...phinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/LoginPage.java
@@ -33,13 +33,13 @@
 
 @Getter
 public final class LoginPage extends NavBarPage {
-    @FindBy(id = "input-username")
+    @FindBy(id = "inputUsername")
     private WebElement inputUsername;
 
-    @FindBy(id = "input-password")
+    @FindBy(id = "inputPassword")
     private WebElement inputPassword;
 
-    @FindBy(id = "button-login")
+    @FindBy(id = "btnLogin")
     private WebElement buttonLogin;
 
     public LoginPage(RemoteWebDriver driver) {

diff --git a/...duler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/common/NavBarPage.java b/...duler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/common/NavBarPage.java
@@ -33,9 +33,9 @@
 public class NavBarPage {
     protected final RemoteWebDriver driver;
 
-    @FindBy(id = "project-tab")
+    @FindBy(id = "tabProject")
     private WebElement projectTab;
-    @FindBy(id = "security-tab")
+    @FindBy(id = "tabSecurity")
     private WebElement securityTab;
 
     public NavBarPage(RemoteWebDriver driver) {

diff --git a/...e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectDetailPage.java b/...e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectDetailPage.java
@@ -31,9 +31,9 @@
 
 @Getter
 public final class ProjectDetailPage extends NavBarPage {
-    @FindBy(className = "process-definition")
+    @FindBy(className = "tab-process-definition")
     private WebElement menuProcessDefinition;
-    @FindBy(className = "process-instance")
+    @FindBy(className = "tab-process-instance")
     private WebElement menuProcessInstances;
 
     public ProjectDetailPage(RemoteWebDriver driver) {

diff --git a/...ler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectPage.java b/...ler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/ProjectPage.java
@@ -37,10 +37,10 @@
 
 @Getter
 public final class ProjectPage extends NavBarPage implements NavBarItem {
-    @FindBy(id = "button-create-project")
+    @FindBy(id = "btnCreateProject")
     private WebElement buttonCreateProject;
 
-    @FindBy(className = "rows-project")
+    @FindBy(className = "items-project")
     private List<WebElement> projectList;
 
     @FindBys({
@@ -105,10 +105,10 @@ public class CreateProjectForm {
             PageFactory.initElements(driver, this);
         }
 
-        @FindBy(id = "input-project-name")
+        @FindBy(id = "inputProjectName")
         private WebElement inputProjectName;
 
-        @FindBy(id = "button-submit")
+        @FindBy(id = "btnSubmit")
         private WebElement buttonSubmit;
     }
 }
diff --git a/...st/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java b/...st/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java
@@ -34,18 +34,18 @@
 
 @Getter
 public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDetailPage.Tab {
-    @FindBy(id = "button-create-process")
+    @FindBy(id = "btnCreateProcess")
     private WebElement buttonCreateProcess;
     @FindBy(className = "select-all")
     private WebElement checkBoxSelectAll;
-    @FindBy(className = "button-delete-all")
+    @FindBy(className = "btn-delete-all")
     private WebElement buttonDeleteAll;
     @FindBys({
         @FindBy(className = "el-popconfirm"),
         @FindBy(className = "el-button--primary"),
     })
     private List<WebElement> buttonConfirm;
-    @FindBy(className = "rows-workflow-definitions")
+    @FindBy(className = "items")
     private List<WebElement> workflowList;
 
     public WorkflowDefinitionTab(RemoteWebDriver driver) {
@@ -88,7 +88,7 @@ public WorkflowDefinitionTab cancelPublishAll() {
         final Supplier<List<WebElement>> cancelButtons = () ->
             workflowList()
                 .stream()
-                .flatMap(it -> it.findElements(By.className("button-cancel-publish")).stream())
+                .flatMap(it -> it.findElements(By.className("btn-cancel-publish")).stream())
                 .filter(WebElement::isDisplayed)
                 .collect(Collectors.toList());
 

diff --git a/...se/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowForm.java b/...se/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowForm.java
@@ -42,7 +42,7 @@ public final class WorkflowForm {
     private final WebDriver driver;
     private final WorkflowSaveDialog saveForm;
 
-    @FindBy(id = "button-save")
+    @FindBy(id = "btnSave")
     private WebElement buttonSave;
 
     public WorkflowForm(WebDriver driver) {

diff --git a/...test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowInstanceTab.java b/...test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowInstanceTab.java
@@ -36,11 +36,11 @@
 
 @Getter
 public final class WorkflowInstanceTab extends NavBarPage implements ProjectDetailPage.Tab {
-    @FindBy(className = "rows-workflow-instances")
+    @FindBy(className = "items-workflow-instances")
     private List<WebElement> instanceList;
     @FindBy(className = "select-all")
     private WebElement checkBoxSelectAll;
-    @FindBy(className = "button-delete-all")
+    @FindBy(className = "btn-delete-all")
     private WebElement buttonDeleteAll;
     @FindBys({
         @FindBy(className = "el-popconfirm"),
@@ -82,7 +82,7 @@ public static class Row {
         private final WebElement row;
 
         public WebElement rerunButton() {
-            return row.findElement(By.className("button-rerun"));
+            return row.findElement(By.className("btn-rerun"));
         }
 
         public boolean isSuccess() {
@@ -94,7 +94,7 @@ public int executionTime() {
         }
 
         public Row rerun() {
-            row.findElements(By.className("button-rerun"))
+            row.findElements(By.className("btn-rerun"))
                .stream()
                .filter(WebElement::isDisplayed)
                .findFirst()

diff --git a/...c/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowRunDialog.java b/...c/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowRunDialog.java
@@ -29,7 +29,7 @@
 public final class WorkflowRunDialog {
     private final WorkflowDefinitionTab parent;
 
-    @FindBy(id = "button-submit")
+    @FindBy(id = "btnSubmit")
     private WebElement buttonSubmit;
 
     public WorkflowRunDialog(WorkflowDefinitionTab parent) {

diff --git a/.../test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowSaveDialog.java b/.../test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowSaveDialog.java
@@ -38,9 +38,9 @@ public final class WorkflowSaveDialog {
     private final WebDriver driver;
     private final WorkflowForm parent;
 
-    @FindBy(id = "input-name")
+    @FindBy(id = "inputName")
     private WebElement inputName;
-    @FindBy(id = "button-submit")
+    @FindBy(id = "btnSubmit")
     private WebElement buttonSubmit;
     @FindBys({
         @FindBy(className = "input-param-key"),
@@ -52,7 +52,7 @@ public final class WorkflowSaveDialog {
         @FindBy(tagName = "input"),
     })
     private List<WebElement> inputParamVal;
-    @FindBy(id = "select-tenant")
+    @FindBy(id = "selectTenant")
     private WebElement selectTenant;
 
     public WorkflowSaveDialog(WorkflowForm parent) {

diff --git a/...c/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/TaskNodeForm.java b/...c/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/task/TaskNodeForm.java
@@ -34,9 +34,9 @@
 
 @Getter
 public abstract class TaskNodeForm {
-    @FindBy(id = "input-node-name")
+    @FindBy(id = "inputNodeName")
     private WebElement inputNodeName;
-    @FindBy(id = "button-submit")
+    @FindBy(id = "btnSubmit")
     private WebElement buttonSubmit;
     @FindBys({
         @FindBy(className = "input-param-key"),

diff --git a/...r-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/SecurityPage.java b/...r-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/SecurityPage.java
@@ -30,7 +30,7 @@
 
 @Getter
 public class SecurityPage extends NavBarPage implements NavBarItem {
-    @FindBy(className = "tenant-manage")
+    @FindBy(className = "tab-tenant-manage")
     private WebElement menuTenantManage;
 
     public SecurityPage(RemoteWebDriver driver) {

diff --git a/...ler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/TenantPage.java b/...ler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/security/TenantPage.java
@@ -37,10 +37,10 @@
 
 @Getter
 public final class TenantPage extends NavBarPage implements SecurityPage.Tab {
-    @FindBy(id = "button-create-tenant")
+    @FindBy(id = "btnCreateTenant")
     private WebElement buttonCreateTenant;
 
-    @FindBy(className = "rows-tenant")
+    @FindBy(className = "items")
     private List<WebElement> tenantList;
 
     @FindBys({
@@ -93,19 +93,19 @@ public class CreateTenantForm {
             PageFactory.initElements(driver, this);
         }
 
-        @FindBy(id = "input-tenant-code")
+        @FindBy(id = "inputTenantCode")
         private WebElement inputTenantCode;
 
-        @FindBy(id = "select-queue")
+        @FindBy(id = "selectQueue")
         private WebElement selectQueue;
 
-        @FindBy(id = "input-description")
+        @FindBy(id = "inputDescription")
         private WebElement inputDescription;
 
-        @FindBy(id = "button-submit")
+        @FindBy(id = "btnSubmit")
         private WebElement buttonSubmit;
 
-        @FindBy(id = "button-cancel")
+        @FindBy(id = "btnCancel")
         private WebElement buttonCancel;
     }
 }
diff --git a/...rc/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java b/...rc/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java
@@ -427,8 +427,7 @@ public void handleConnectionState(ConnectionState state) {
                 logger.debug("registry connection state is {}", state);
                 break;
             case SUSPENDED:
-                logger.warn("registry connection state is {}, ready to stop myself", state);
-                registryClient.getStoppable().stop("registry connection state is SUSPENDED, stop myself");
+                logger.warn("registry connection state is {}, ready to retry connection", state);
                 break;
             case RECONNECTED:
                 logger.debug("registry connection state is {}, clean the node info", state);

diff --git a/...c/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java b/...c/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
@@ -187,12 +187,12 @@ private void checkTask4Retry() {
             if (taskInstance == null) {
                 continue;
             }
-            if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {
+
+            if (!taskInstance.getState().typeIsFinished() && (taskInstance.isSubProcess() || taskInstance.isDependTask())) {
                 addTaskStateChangeEvent(taskInstance);
-                taskInstanceRetryCheckList.remove(taskInstance.getId());
-            }
-            if (taskInstance.isSubProcess() || taskInstance.isDependTask()) {
+            } else if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {
                 addTaskStateChangeEvent(taskInstance);
+                taskInstanceRetryCheckList.remove(taskInstance.getId());
             }
         }
     }