Merge branch 'dev' of github.com:wangxj3/dolphinscheduler into dev

docs/configs/site.js

@@ -173,7 +173,7 @@ export default {
         children: [
           {
             key: 'docs0',
-            text: '最新版本latest(2)',
+            text: '最新版本latest(3.2.2)',
             link: '/zh-cn/docs/latest/user_doc/about/introduction.html',
           },
           {

docs/docs/en/guide/installation/kubernetes.md

@@ -491,16 +491,10 @@ Take MinIO as an example: Modify the following configurations in `values.yaml`:
 common:
   configmap:
     RESOURCE_STORAGE_TYPE: "S3"
-    RESOURCE_UPLOAD_PATH: "/dolphinscheduler"
-    FS_DEFAULT_FS: "s3a://BUCKET_NAME"
-    FS_S3A_ENDPOINT: "http://MINIO_IP:9000"
-    FS_S3A_ACCESS_KEY: "MINIO_ACCESS_KEY"
-    FS_S3A_SECRET_KEY: "MINIO_SECRET_KEY"
+    ...
 ```
 
-Modify `BUCKET_NAME`, `MINIO_IP`, `MINIO_ACCESS_KEY` and `MINIO_SECRET_KEY` to actual environment values.
-
-> **Note**: `MINIO_IP` can only use IP instead of the domain name, because DolphinScheduler currently doesn't support S3 path style access.
+For detailed explanation of specific fields, please see: [Resource Center Configuration](../resource/configuration.md)
 
 ### How to deploy specific components separately?
 

docs/docs/zh/guide/installation/kubernetes.md

@@ -490,16 +490,10 @@ common:
 common:
   configmap:
     RESOURCE_STORAGE_TYPE: "S3"
-    RESOURCE_UPLOAD_PATH: "/dolphinscheduler"
-    FS_DEFAULT_FS: "s3a://BUCKET_NAME"
-    FS_S3A_ENDPOINT: "http://MINIO_IP:9000"
-    FS_S3A_ACCESS_KEY: "MINIO_ACCESS_KEY"
-    FS_S3A_SECRET_KEY: "MINIO_SECRET_KEY"
+    ...
 ```
 
-`BUCKET_NAME`, `MINIO_IP`, `MINIO_ACCESS_KEY` 和 `MINIO_SECRET_KEY` 需要被修改为实际值
-
-> **注意**: `MINIO_IP` 只能使用 IP 而非域名, 因为 DolphinScheduler 尚不支持 S3 路径风格访问 (S3 path style access)
+对于配置其他字段相关细节, 请参考: [资源中心配置详情](../resource/configuration.md)
 
 ### 如何单独部署特定组件?
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java

@@ -184,5 +184,9 @@ public void close(String cause) {
     @Override
     public void stop(String cause) {
         close(cause);
+
+        // make sure exit after server closed, don't call System.exit in close logic, will cause deadlock if close
+        // multiple times at the same time
+        System.exit(1);
     }
 }

dolphinscheduler-master/src/main/resources/application.yaml

@@ -112,9 +112,7 @@ master:
   kill-application-when-task-failover: true
   registry-disconnect-strategy:
     # The disconnect strategy: stop, waiting
-    strategy: waiting
-    # The max waiting time to reconnect to registry if you set the strategy to waiting
-    max-waiting-time: 100s
+    strategy: stop
   worker-group-refresh-interval: 10s
   command-fetch-strategy:
     type: ID_SLOT_BASED

dolphinscheduler-master/src/test/resources/application.yaml

@@ -127,9 +127,7 @@ master:
   kill-application-when-task-failover: true
   registry-disconnect-strategy:
     # The disconnect strategy: stop, waiting
-    strategy: waiting
-    # The max waiting time to reconnect to registry if you set the strategy to waiting
-    max-waiting-time: 100s
+    strategy: stop
   worker-group-refresh-interval: 10s
   command-fetch-strategy:
     type: ID_SLOT_BASED

dolphinscheduler-ui/src/views/resource/components/resource/edit/index.tsx

@@ -24,12 +24,14 @@ import { useEdit, useIsDetailPageStore } from './use-edit'
 import Card from '@/components/card'
 import MonacoEditor from '@/components/monaco-editor'
 import styles from '../index.module.scss'
+import { useDetailPageStore } from "@/views/resource/components/resource/table/use-table";
 
 export default defineComponent({
   name: 'ResourceEdit',
   setup() {
     const route = useRoute()
     const router = useRouter()
+    const detailPageStore = useDetailPageStore()
     const isDetailPageStore = useIsDetailPageStore()
     isDetailPageStore.$reset()
 
@@ -43,16 +45,24 @@ export default defineComponent({
     const { getResourceView, handleUpdateContent } = useEdit(state)
 
     const handleFileContent = () => {
-      isDetailPageStore.setIsDetailPage(true)
       state.fileForm.content = resourceViewRef.state.value.content
       handleUpdateContent(fullName, tenantCode)
+      updateDetailPage()
     }
 
     const handleReturn = () => {
-      isDetailPageStore.setIsDetailPage(true)
+      updateDetailPage()
       router.go(-1)
     }
 
+    const updateDetailPage = () => {
+      isDetailPageStore.setIsDetailPage(true)
+      const pathSplit = fullName.split('/')
+      pathSplit.pop()
+      detailPageStore.fullName = pathSplit.join('/')
+      detailPageStore.tenantCode = tenantCode
+    }
+
     const resourceViewRef = getResourceView(fullName, tenantCode)
     watch(
       () => resourceViewRef.state.value.content,

dolphinscheduler-ui/src/views/resource/components/resource/edit/use-edit.ts

@@ -19,10 +19,7 @@ import { useI18n } from 'vue-i18n'
 import type { Router } from 'vue-router'
 import { useRouter } from 'vue-router'
 import { useAsyncState } from '@vueuse/core'
-import {
-  updateResourceContent,
-  viewResource
-} from '@/service/modules/resources'
+import { updateResourceContent, viewResource } from '@/service/modules/resources'
 import { defineStore } from 'pinia'
 
 export function useEdit(state: any) {

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java

@@ -146,6 +146,10 @@ public void close(String cause) {
     @Override
     public void stop(String cause) {
         close(cause);
+
+        // make sure exit after server closed, don't call System.exit in close logic, will cause deadlock if close
+        // multiple times at the same time
+        System.exit(1);
     }
 
     public void killAllRunningTasks() {

dolphinscheduler-worker/src/main/resources/application.yaml

@@ -61,9 +61,7 @@ worker:
     max-disk-usage-percentage-thresholds: 0.7
   registry-disconnect-strategy:
     # The disconnect strategy: stop, waiting
-    strategy: waiting
-    # The max waiting time to reconnect to registry if you set the strategy to waiting
-    max-waiting-time: 100s
+    strategy: stop
   task-execute-threads-full-policy: REJECT
   tenant-config:
     # tenant corresponds to the user of the system, which is used by the worker to submit the job. If system does not have this user, it will be automatically created after the parameter worker.tenant.auto.create is true.