Skip to content

fix: 任务创建失败KeyError问题修复 (closed #2648) #2649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpyoung3 wants to merge 1 commit into
base: v2.4.12-dev
Choose a base branch
from
Open

fix: 任务创建失败KeyError问题修复 (closed #2648) #2649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions apps/backend/subscription/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ def wrapper(subscription: models.Subscription, subscription_task: models.Subscri
return wrapper


def get_deleted_instance_info(subscription, subscription_task, not_exist_instance_id, instance_host_id_map):
def get_deleted_instance_info(subscription, subscription_task, not_exist_instance_id, instance_host_id_map=None):
deleted_instance_info = {}
# 查找最新的记录
latest_instance_ids = set()
Expand Down Expand Up @@ -815,9 +815,6 @@ def run_subscription_task_and_create_instance(
instance_not_in_scope = [instance_id for instance_id in instance_actions if instance_id not in instances]

if instance_not_in_scope:
instance_host_id_map = {
node["id"]: node.get("bk_host_id") for node in scope["nodes"] if node.get("bk_host_id") is not None
}
deleted_id_not_in_scope = []
for instance_id in instance_not_in_scope:
if subscription.object_type == models.Subscription.ObjectType.HOST:
Expand Down Expand Up @@ -847,9 +844,7 @@ def run_subscription_task_and_create_instance(

# 如果被删掉的实例在 CMDB 找不到，那么就使用最近一次的 InstanceRecord 的快照数据
not_exist_instance_id = set(instance_not_in_scope) - set(deleted_instance_info)
deleted_instance_info.update(
get_deleted_instance_info(subscription, subscription_task, not_exist_instance_id, instance_host_id_map)
)
deleted_instance_info.update(get_deleted_instance_info(subscription, subscription_task, not_exist_instance_id))

instances.update(deleted_instance_info)

Expand Down
Loading