[3.1.9] add 3.1.9 release doc (#15333)

zhuangchong · web-flow · commit 7252e22f47f6 · 2023-12-18T16:54:52.000+08:00
diff --git a/deploy/docker/.env b/deploy/docker/.env
@@ -16,7 +16,7 @@
 # under the License.
 #
 HUB=apache
-TAG=3.1.8
+TAG=3.1.9
 
 TZ=Asia/Shanghai
 DATABASE=postgresql
diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml
@@ -35,11 +35,11 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 3.1.8
+version: 3.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 3.1.8
+appVersion: 3.1.9
 
 dependencies:
 - name: postgresql
diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -23,7 +23,7 @@ timezone: "Asia/Shanghai"
 
 image:
   registry: "dolphinscheduler.docker.scarf.sh/apache"
-  tag: "3.1.8"
+  tag: "3.1.9"
   pullPolicy: "IfNotPresent"
   pullSecret: ""
   master: dolphinscheduler-master
diff --git a/docs/configs/docsdev.js b/docs/configs/docsdev.js
diff --git a/docs/configs/site.js b/docs/configs/site.js
@@ -45,7 +45,7 @@ export default {
         children: [
           {
             key: 'docs0',
-            text: 'latest(3.1.8)',
+            text: 'latest(3.1.9)',
             link: '/en-us/docs/latest/user_doc/about/introduction.html',
           },
           {
@@ -173,7 +173,7 @@ export default {
         children: [
           {
             key: 'docs0',
-            text: '最新版本latest(3.1.8)',
+            text: '最新版本latest(3.1.9)',
             link: '/zh-cn/docs/latest/user_doc/about/introduction.html',
           },
           {
diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md
@@ -30,9 +30,9 @@ Attention: DolphinScheduler itself does not depend on Hadoop, Hive, Spark, but w
 mkdir -p /opt
 cd /opt
 # decompress
-tar -zxvf apache-dolphinscheduler-3.1.8-bin.tar.gz -C /opt 
+tar -zxvf apache-dolphinscheduler-3.1.9-bin.tar.gz -C /opt 
 cd /opt
-mv apache-dolphinscheduler-3.1.8-bin  dolphinscheduler
+mv apache-dolphinscheduler-3.1.9-bin  dolphinscheduler
 ```
 
 ```markdown
diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md
@@ -19,7 +19,7 @@ Start DolphinScheduler with standalone-server Docker images is the easiest way t
 you can learn DolphinScheduler's concepts and usage, with minimal cost.
 
 ```shell
-$ DOLPHINSCHEDULER_VERSION=3.1.8
+$ DOLPHINSCHEDULER_VERSION=3.1.9
 $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
 ```
 
@@ -41,7 +41,7 @@ After complete the installation, get the `docker-compose.yaml` file from [downlo
 form its source package, and make sure you get the right version. After download the package, you can run the commands as below.
 
 ```shell
-$ DOLPHINSCHEDULER_VERSION=3.1.8
+$ DOLPHINSCHEDULER_VERSION=3.1.9
 $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
 # Going to docker-compose's location
 # For Mac or Linux users 
@@ -68,7 +68,7 @@ $ docker-compose --profile all up -d
 container when it up. You could start DolphinScheduler server separately if you want to reuse your exists services.
 
 ```shell
-$ DOLPHINSCHEDULER_VERSION=3.1.8
+$ DOLPHINSCHEDULER_VERSION=3.1.9
 # Initialize the database, make sure database <DATABASE> already exists
 $ docker run -d --name dolphinscheduler-tools \
     -e DATABASE="postgresql" \
@@ -129,5 +129,5 @@ and use `admin` and `dolphinscheduler123` as default username and password in th
 
 You can modify some environment variables to change configurations when you are starting servers through Docker. We have
 an example in [using exists PostgreSQL ZooKeeper](#using-exists-postgresql-zookeeper) to change database and ZooKeeper configurations,
-and you could find all environment variables in [all environment variables](https://github.com/apache/dolphinscheduler/blob/3.1.8/script/env/dolphinscheduler_env.sh) <!-- markdown-link-check-disable-line -->
+and you could find all environment variables in [all environment variables](https://github.com/apache/dolphinscheduler/blob/3.1.9/script/env/dolphinscheduler_env.sh) <!-- markdown-link-check-disable-line -->
 and change them if you want.
diff --git a/docs/docs/en/history-versions.md b/docs/docs/en/history-versions.md
@@ -4,6 +4,10 @@
 
 #### Setup instructions,  are available for each stable version of Apache DolphinScheduler below:
 
+### Versions: 3.1.9
+
+#### Links： [3.1.9 Document](../3.1.9/user_doc/about/introduction.md)
+
 ### Versions: 3.1.8
 
 #### Links： [3.1.8 Document](../3.1.8/user_doc/about/introduction.md)
diff --git a/docs/docs/zh/guide/expansion-reduction.md b/docs/docs/zh/guide/expansion-reduction.md
@@ -30,9 +30,9 @@
 mkdir -p /opt
 cd /opt
 # 解压缩
-tar -zxvf apache-dolphinscheduler-3.1.8-bin.tar.gz -C /opt 
+tar -zxvf apache-dolphinscheduler-3.1.9-bin.tar.gz -C /opt 
 cd /opt
-mv apache-dolphinscheduler-3.1.8-bin  dolphinscheduler
+mv apache-dolphinscheduler-3.1.9-bin  dolphinscheduler
 ```
 
 ```markdown
diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md
@@ -18,7 +18,7 @@
 你可以最快速的体验到 DolphinScheduler 的大部分功能，了解主要和概念和内容。
 
 ```shell
-$ DOLPHINSCHEDULER_VERSION=3.1.8
+$ DOLPHINSCHEDULER_VERSION=3.1.9
 $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:25333 -d apache/dolphinscheduler-standalone-server:"${DOLPHINSCHEDULER_VERSION}"
 ```
 
@@ -37,7 +37,7 @@ $ docker run --name dolphinscheduler-standalone-server -p 12345:12345 -p 25333:2
 下载对应版本源码包可能是最快的方法，当下载完源码后就可以运行命令进行部署了。
 
 ```shell
-$ DOLPHINSCHEDULER_VERSION=3.1.8
+$ DOLPHINSCHEDULER_VERSION=3.1.9
 $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
 # Mac Linux 用户
 $ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker
@@ -61,7 +61,7 @@ $ docker-compose --profile all up -d
 ZooKeeper 且不想启动新的服务，可以使用这个方式分别启动 DolphinScheduler 容器。
 
 ```shell
-$ DOLPHINSCHEDULER_VERSION=3.1.8
+$ DOLPHINSCHEDULER_VERSION=3.1.9
 # 初始化数据库，其确保数据库 <DATABASE> 已经存在
 $ docker run -d --name dolphinscheduler-tools \
     -e DATABASE="postgresql" \
diff --git a/docs/docs/zh/history-versions.md b/docs/docs/zh/history-versions.md
@@ -4,6 +4,10 @@
 
 #### 以下是Apache DolphinScheduler每个稳定版本的设置说明。
 
+### Versions: 3.1.9
+
+#### Links： [3.1.9 文档](../3.1.9/user_doc/about/introduction.md)
+
 ### Versions: 3.1.8
 
 #### Links： [3.1.8 文档](../3.1.8/user_doc/about/introduction.md)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -398,7 +398,7 @@ public Map<String, Object> updateUser(User loginUser, int userId,
 
         // non-admin should not modify tenantId and queue
         if (!isAdmin(loginUser)) {
-            if (tenantId != null && user.getTenantId() != tenantId) {
+            if (user.getTenantId() != tenantId) {
                 throw new ServiceException(Status.USER_NO_OPERATION_PERM);
             }
             if (StringUtils.isNotEmpty(queue) && !StringUtils.equals(queue, user.getQueue())) {
diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
@@ -990,7 +990,7 @@ CREATE TABLE t_ds_version
 -- Records of t_ds_version
 -- ----------------------------
 INSERT INTO t_ds_version
-VALUES ('1', '3.1.8');
+VALUES ('1', '3.1.9');
 
 
 -- ----------------------------
diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
@@ -981,7 +981,7 @@ CREATE TABLE `t_ds_version` (
 -- ----------------------------
 -- Records of t_ds_version
 -- ----------------------------
-INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.1.8');
+INSERT IGNORE INTO `t_ds_version` VALUES ('1', '3.1.9');
 
 
 -- ----------------------------
diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
@@ -973,7 +973,7 @@ INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time)
 VALUES ('default', 'default', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
 
 -- Records of t_ds_queue,default queue name : default
-INSERT INTO t_ds_version(version) VALUES ('3.1.8');
+INSERT INTO t_ds_version(version) VALUES ('3.1.9');
 
 --
 -- Table structure for table t_ds_plugin_define
diff --git a/dolphinscheduler-dao/src/main/resources/sql/soft_version b/dolphinscheduler-dao/src/main/resources/sql/soft_version
@@ -1 +1 @@
-3.1.8
+3.1.9
diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/mysql/dolphinscheduler_ddl.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/mysql/dolphinscheduler_ddl.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/mysql/dolphinscheduler_dml.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/mysql/dolphinscheduler_dml.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/postgresql/dolphinscheduler_ddl.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/postgresql/dolphinscheduler_ddl.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/postgresql/dolphinscheduler_dml.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.9_schema/postgresql/dolphinscheduler_dml.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowSubmitFailStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowSubmitFailStateEventHandler.java
@@ -34,9 +34,8 @@ public class WorkflowSubmitFailStateEventHandler implements StateEventHandler {
     public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable,
                                     StateEvent stateEvent) throws StateEventHandleException {
         WorkflowStateEvent workflowStateEvent = (WorkflowStateEvent) stateEvent;
-        ProcessInstance processInstance =
-                workflowExecuteRunnable.getWorkflowExecuteContext().getWorkflowInstance();
-        measureProcessState(workflowStateEvent, processInstance.getProcessDefinitionCode().toString());
+        ProcessInstance processInstance = workflowExecuteRunnable.getProcessInstance();
+        measureProcessState(workflowStateEvent);
         log.info(
                 "Handle workflow instance submit fail state event, the current workflow instance state {} will be changed to {}",
                 processInstance.getState(), workflowStateEvent.getStatus());
@@ -51,20 +50,19 @@ public StateEventType getEventType() {
         return StateEventType.PROCESS_SUBMIT_FAILED;
     }
 
-    private void measureProcessState(WorkflowStateEvent processStateEvent, String processDefinitionCode) {
+    private void measureProcessState(WorkflowStateEvent processStateEvent) {
         if (processStateEvent.getStatus().isFinished()) {
-            ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("finish", processDefinitionCode);
+            ProcessInstanceMetrics.incProcessInstanceByState("finish");
         }
         switch (processStateEvent.getStatus()) {
             case STOP:
-                ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("stop", processDefinitionCode);
+                ProcessInstanceMetrics.incProcessInstanceByState("stop");
                 break;
             case SUCCESS:
-                ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("success",
-                        processDefinitionCode);
+                ProcessInstanceMetrics.incProcessInstanceByState("success");
                 break;
             case FAILURE:
-                ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("fail", processDefinitionCode);
+                ProcessInstanceMetrics.incProcessInstanceByState("fail");
                 break;
             default:
                 break;

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`# under the License.`
`17`	`17`	`#`
`18`	`18`	`HUB=apache`
`19`		`-TAG=3.1.8`
	`19`	`+TAG=3.1.9`
`20`	`20`
`21`	`21`	`TZ=Asia/Shanghai`
`22`	`22`	`DATABASE=postgresql`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export default {`
`45`	`45`	`children: [`
`46`	`46`	`{`
`47`	`47`	`key: 'docs0',`
`48`		`- text: 'latest(3.1.8)',`
	`48`	`+ text: 'latest(3.1.9)',`
`49`	`49`	`link: '/en-us/docs/latest/user_doc/about/introduction.html',`
`50`	`50`	`},`
`51`	`51`	`{`
`@@ -173,7 +173,7 @@ export default {`
`173`	`173`	`children: [`
`174`	`174`	`{`
`175`	`175`	`key: 'docs0',`
`176`		`- text: '最新版本latest(3.1.8)',`
	`176`	`+ text: '最新版本latest(3.1.9)',`
`177`	`177`	`link: '/zh-cn/docs/latest/user_doc/about/introduction.html',`
`178`	`178`	`},`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ public Map<String, Object> updateUser(User loginUser, int userId,`
`398`	`398`
`399`	`399`	`// non-admin should not modify tenantId and queue`
`400`	`400`	`if (!isAdmin(loginUser)) {`
`401`		`- if (tenantId != null && user.getTenantId() != tenantId) {`
	`401`	`+ if (user.getTenantId() != tenantId) {`
`402`	`402`	`throw new ServiceException(Status.USER_NO_OPERATION_PERM);`
`403`	`403`	`}`
`404`	`404`	`if (StringUtils.isNotEmpty(queue) && !StringUtils.equals(queue, user.getQueue())) {`