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 index aa1796329e..310e681a8c 100644 --- 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,7 +32,7 @@ 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" @@ -40,7 +40,7 @@ # 容器环境不要使用 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 index 3c85735425..65f805f7fe 100644 Binary files a/dbm-ui/backend/ticket/exclusive_ticket.xlsx and b/dbm-ui/backend/ticket/exclusive_ticket.xlsx differ diff --git a/helm-charts/bk-dbm/Chart.lock b/helm-charts/bk-dbm/Chart.lock index 9c20c8c5bd..ad2bd73e0b 100644 --- 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 index a2e20da227..b66f4efd91 100644 --- 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 index 6cc4c47e8f..3dc896c3b5 100644 --- 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 index 6e0976481c..677b259c41 100644 --- 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 index 013179284a..f760620852 100644 --- 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 index 1350ceeadc..f0c2c89216 100644 --- 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