From 043ec46c331b4ad82d73916f7a9491ecc8d877fb Mon Sep 17 00:00:00 2001
From: "Junyan Qin (Chin)" <rockchinq@gmail.com>
Date: Sun, 28 Sep 2025 10:26:11 +0800
Subject: [PATCH] perf: distribute concurrent plugin auto upgrade tasks
 (#26282)

---
 api/schedule/check_upgradable_plugin_task.py | 33 ++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py
index 08a5cfce79..a9ad27b059 100644
--- a/api/schedule/check_upgradable_plugin_task.py
+++ b/api/schedule/check_upgradable_plugin_task.py
@@ -1,3 +1,4 @@
+import math
 import time
 
 import click
@@ -8,6 +9,7 @@ from models.account import TenantPluginAutoUpgradeStrategy
 from tasks.process_tenant_plugin_autoupgrade_check_task import process_tenant_plugin_autoupgrade_check_task
 
 AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL = 15 * 60  # 15 minutes
+MAX_CONCURRENT_CHECK_TASKS = 20
 
 
 @app.celery.task(queue="plugin")
@@ -30,15 +32,28 @@ def check_upgradable_plugin_task():
         .all()
     )
 
-    for strategy in strategies:
-        process_tenant_plugin_autoupgrade_check_task.delay(
-            strategy.tenant_id,
-            strategy.strategy_setting,
-            strategy.upgrade_time_of_day,
-            strategy.upgrade_mode,
-            strategy.exclude_plugins,
-            strategy.include_plugins,
-        )
+    total_strategies = len(strategies)
+    click.echo(click.style(f"Total strategies: {total_strategies}", fg="green"))
+
+    batch_chunk_count = math.ceil(
+        total_strategies / MAX_CONCURRENT_CHECK_TASKS
+    )  # make sure all strategies are checked in this interval
+    batch_interval_time = (AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL / batch_chunk_count) if batch_chunk_count > 0 else 0
+
+    for i in range(0, total_strategies, MAX_CONCURRENT_CHECK_TASKS):
+        batch_strategies = strategies[i : i + MAX_CONCURRENT_CHECK_TASKS]
+        for strategy in batch_strategies:
+            process_tenant_plugin_autoupgrade_check_task.delay(
+                strategy.tenant_id,
+                strategy.strategy_setting,
+                strategy.upgrade_time_of_day,
+                strategy.upgrade_mode,
+                strategy.exclude_plugins,
+                strategy.include_plugins,
+            )
+
+        if batch_interval_time > 0.0001:  # if lower than 1ms, skip
+            time.sleep(batch_interval_time)
 
     end_at = time.perf_counter()
     click.echo(