fix: file-worker任务状态更新请求无序到达导致第三方源文件偶现分发失败 TencentBlueKing#2434

处理Review意见。
jsonwan · Sep 26, 2023 · 310dc27 · 310dc27
1 parent 5e72128
commit 310dc27
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/support-files/kubernetes/charts/bk-job/templates/job-assemble/configmap.yaml b/support-files/kubernetes/charts/bk-job/templates/job-assemble/configmap.yaml
@@ -374,7 +374,13 @@ data:
             start:
               begin: {{ .Values.crontabConfig.notificationPolicy.failed.start.begin | default 1 }}
               frequency: {{ .Values.crontabConfig.notificationPolicy.failed.start.frequency | default 5 }}
-              total: {{ .Values.crontabConfig.notificationPolicy.failed.start.total | default -1 }}     
+              total: {{ .Values.crontabConfig.notificationPolicy.failed.start.total | default -1 }}
+      file-gateway:
+        reDispatch:
+          {{- toYaml .Values.fileGatewayConfig.reDispatch | nindent 10 }}
+        worker-tags:
+          white: {{ .Values.fileGatewayConfig.workerTags.white }}
+          black: {{ .Values.fileGatewayConfig.workerTags.black }}
     bk:
       doc:
         root: {{ .Values.bkDocsCenterUrl }}

diff --git a/support-files/templates/#etc#job#job-assemble#application-assemble.yml b/support-files/templates/#etc#job#job-assemble#application-assemble.yml
@@ -400,7 +400,16 @@ job:
           # 通知频率：默认 5 - 每5次通知， 1 - 每次通知
           frequency: 5
           # 通知次数：默认 -1 - 不限制通知次数， 0 - 不通知， 1 - 只通知1次，
-          total: -1   
+          total: -1
+  file-gateway:
+    # 任务重调度相关配置
+    reDispatch:
+      # 超时任务
+      timeoutTask:
+        # 是否开启重调度
+        enabled: true
+        # 超时时间（秒）
+        timeoutSeconds: 10
 bk:
   {% if job_edition == "ce" -%}
   doc: