perf: 优化账号任务

apps/accounts/tasks/common.py

@@ -9,7 +9,7 @@ def quickstart_automation_by_snapshot(task_name, tp, task_snapshot=None):
     data = generate_automation_execution_data(task_name, tp, task_snapshot)
 
     pk = data['id']
-    if AutomationExecution.objects.exists(id=pk):
+    if AutomationExecution.objects.filter(id=pk).exists():
         data['id'] = str(uuid.uuid4())
 
     execution = AutomationExecution.objects.create(

apps/accounts/tasks/push_account.py

@@ -1,5 +1,4 @@
 from celery import shared_task
-from collections import defaultdict
 from django.utils.translation import gettext_noop, ugettext_lazy as _
 
 from accounts.const import AutomationTypes
@@ -21,20 +20,15 @@ def push_accounts_to_assets_task(account_ids):
     from accounts.models import Account
 
     accounts = Account.objects.filter(id__in=account_ids)
-
     task_name = gettext_noop("Push accounts to assets")
     task_name = PushAccountAutomation.generate_unique_name(task_name)
 
-    account_asset_mapper = defaultdict(set)
     for account in accounts:
-        account_asset_mapper[account.username].add(account.asset)
-
-    for username, assets in account_asset_mapper.items():
         task_snapshot = {
             'secret': account.secret,
             'secret_type': account.secret_type,
             'accounts': [account.username],
-            'assets': asset_ids,
+            'assets': [str(account.asset_id)],
         }
         tp = AutomationTypes.push_account
-        quickstart_automation_by_snapshot(task_name, tp, task_snapshot)
+        quickstart_automation_by_snapshot(task_name, tp, task_snapshot)

apps/accounts/tasks/verify_account.py

@@ -26,15 +26,22 @@ def verify_connectivity_util(assets, tp, accounts, task_name):
 
 
 @org_aware_func("assets")
-def verify_accounts_connectivity_util(accounts, assets, task_name):
-    gateway_assets = assets.filter(platform__name=GATEWAY_NAME)
+def verify_accounts_connectivity_util(accounts, task_name):
+    from assets.models import Asset
+
+    asset_ids = [a.asset_id for a in accounts]
+    assets = Asset.objects.filter(id__in=asset_ids)
+
+    gateways = assets.filter(platform__name=GATEWAY_NAME)
     verify_connectivity_util(
-        gateway_assets, AutomationTypes.verify_gateway_account, accounts, task_name
+        gateways, AutomationTypes.verify_gateway_account,
+        accounts, task_name
     )
 
-    non_gateway_assets = assets.exclude(platform__name=GATEWAY_NAME)
+    common_assets = assets.exclude(platform__name=GATEWAY_NAME)
     verify_connectivity_util(
-        non_gateway_assets, AutomationTypes.verify_account, accounts, task_name
+        common_assets, AutomationTypes.verify_account,
+        accounts, task_name
     )
 
 
@@ -42,11 +49,9 @@ def verify_accounts_connectivity_util(accounts, assets, task_name):
     queue="ansible", verbose_name=_('Verify asset account availability'),
     activity_callback=lambda self, account_ids, asset_ids: (account_ids, None)
 )
-def verify_accounts_connectivity_task(account_ids, asset_ids):
-    from assets.models import Asset
+def verify_accounts_connectivity_task(account_ids):
     from accounts.models import Account, VerifyAccountAutomation
-    assets = Asset.objects.filter(id__in=asset_ids)
     accounts = Account.objects.filter(id__in=account_ids)
     task_name = gettext_noop("Verify accounts connectivity")
     task_name = VerifyAccountAutomation.generate_unique_name(task_name)
-    return verify_accounts_connectivity_util(accounts, assets, task_name)
+    return verify_accounts_connectivity_util(accounts, task_name)