feat(backend): 配置优雅退出时间 #8977

TencentBlueKing · Jan 13, 2025 · 9a02e93 · 9a02e93
1 parent 4eef615
commit 9a02e93
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/dbm-ui/backend/flow/utils/cloud/script_template/drs_template.py b/dbm-ui/backend/flow/utils/cloud/script_template/drs_template.py
@@ -32,15 +32,15 @@
 export DRS_WEBCONSOLE_PASSWORD="{{drs_webconsole_password}}"
 export DRS_PORT={{drs_port}}
 export DRS_LOG_JSON=true # 是否使用 json 格式日志
-export DRS_LOG_CONSOLE=true # 是否在 stdout 打印日志
+export DRS_LOG_CONSOLE=false # 是否在 stdout 打印日志
 export DRS_LOG_DEBUG=true # 启用 debug 日志级别
 export DRS_KEY_FILE="/home/mysql/db-remote-service/server.key"
 
 
 # 容器环境不要使用
 export DRS_TMYSQLPARSER_BIN="tmysqlparse"
 export DRS_LOG_FILE=test.log # 是否在文件打印日志, 文件路径
-export DRS_LOG_FILE_ROTATE_SIZE=10 # rotate 大小, MB
+export DRS_LOG_FILE_ROTATE_SIZE=20 # rotate 大小, MB
 export DRS_LOG_FILE_MAX_BACKUP=5 # 旧日志保留数
 export DRS_LOG_FILE_MAX_AGE=5 # 过期天数
 export DRS_CA_FILE=/home/mysql/db-remote-service/server.crt

diff --git a/dbm-ui/backend/ticket/exclusive_ticket.xlsx b/dbm-ui/backend/ticket/exclusive_ticket.xlsx
diff --git a/dbm-ui/backend/ticket/flow_manager/manager.py b/dbm-ui/backend/ticket/flow_manager/manager.py
@@ -12,7 +12,6 @@
 
 from django.db import transaction
 
-from backend import env
 from backend.core import notify
 from backend.ticket import constants
 from backend.ticket.constants import FLOW_FINISHED_STATUS, FlowType, TicketStatus

diff --git a/helm-charts/bk-dbm/Chart.lock b/helm-charts/bk-dbm/Chart.lock
@@ -19,7 +19,7 @@ dependencies:
   version: 7.9.8
 - name: dbm
   repository: file://charts/dbm
-  version: 0.1.44
+  version: 0.1.45
 - name: dbconfig
   repository: file://charts/dbconfig
   version: 0.1.13
@@ -65,5 +65,5 @@ dependencies:
 - name: db-dbha
   repository: file://charts/db-dbha
   version: 0.1.0
-digest: sha256:293e4133fc64f236159a34fdbc0ab61a732ef1fa5f7b76fa91c3de18d1c59d48
-generated: "2024-09-25T19:33:01.490734+08:00"
+digest: sha256:4569713d2f5d7645e6e9e6a33424e0a6ea226da1623acddcea7ee55c5e5af43e
+generated: "2025-01-09T10:17:34.916203+08:00"
diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
@@ -27,7 +27,7 @@ dependencies:
   - condition: dbm.enabled
     name: dbm
     repository: file://charts/dbm
-    version: 0.1.44
+    version: 0.1.45
   - condition: dbconfig.enabled
     name: dbconfig
     repository: file://charts/dbconfig

diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 1.5.0-alpha.1556
 description: A Helm chart for dbm
 name: dbm
 type: application
-version: 0.1.44
+version: 0.1.45
diff --git a/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/celery-worker.yaml b/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/celery-worker.yaml
@@ -31,6 +31,7 @@ spec:
       serviceAccountName: {{ include "dbm.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds.worker }}
       containers:
         - name: "{{ .Chart.Name }}-celery"
           securityContext:

diff --git a/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/pipeline-worker.yaml b/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/pipeline-worker.yaml
@@ -31,6 +31,7 @@ spec:
       serviceAccountName: {{ include "dbm.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds.worker }}
       containers:
         - name: "{{ .Chart.Name }}-celery-pipeline"
           securityContext:

diff --git a/helm-charts/bk-dbm/values.yaml b/helm-charts/bk-dbm/values.yaml
@@ -94,6 +94,9 @@ dbm:
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
 
+  terminationGracePeriodSeconds:
+    worker: 60
+
   serviceAccount:
     # Specifies whether a service account should be created
     create: true