From 5f8e05b74e2db3a667cb61002b11cbc6a7273f97 Mon Sep 17 00:00:00 2001 From: dcd <1151627903@qq.com> Date: Tue, 30 Apr 2024 18:52:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E9=97=B4=E4=B8=BA=E5=8F=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=20(closed=20#2178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/components/collections/plugin.py | 5 ++++- apps/node_man/models.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/backend/components/collections/plugin.py b/apps/backend/components/collections/plugin.py index 222199971..1f9ab5f54 100644 --- a/apps/backend/components/collections/plugin.py +++ b/apps/backend/components/collections/plugin.py @@ -1170,6 +1170,9 @@ def _execute(self, data, parent_data, common_data: PluginCommonData): host_id__resource_policy_map = self.get_resource_policy(common_data.bk_host_ids, plugin.name) proc_operate_req = [] + start_check_secs = models.GlobalSettings.get_config( + models.GlobalSettings.KeyEnum.PLUGIN_PROC_START_CHECK_SECS.value, default=9 + ) for process_status in process_statuses: bk_host_id = process_status.bk_host_id host = host_id_obj_map.get(bk_host_id) @@ -1206,7 +1209,7 @@ def _execute(self, data, parent_data, common_data: PluginCommonData): "alive_monitor_policy": { # 托管类型，0为周期执行进程，1为常驻进程，2为单次执行进程, 1.0沿用1 "auto_type": plugin.auto_type if gse_version == GseVersion.V2.value else 1, - "start_check_secs": 9, + "start_check_secs": start_check_secs, }, }, } diff --git a/apps/node_man/models.py b/apps/node_man/models.py index b15db4075..239e2102a 100644 --- a/apps/node_man/models.py +++ b/apps/node_man/models.py @@ -158,6 +158,8 @@ class KeyEnum(Enum): SUBSCRIPTION_UPDATE_TASK_QUEUE = "SUBSCRIPTION_UPDATE_TASK_QUEUE" # JOB任务策略 JOB_TASK_POLICY = "JOB_TASK_POLICY" + # 重启插件进程启动检查时间 + PLUGIN_PROC_START_CHECK_SECS = "PLUGIN_PROC_START_CHECK_SECS" key = models.CharField(_("键"), max_length=255, db_index=True, primary_key=True) v_json = JSONField(_("值"))