ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-08-30 12:45:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(timer): syncConfig concurrency 不变量与控制器 cap 防御

Browse Source 
TimerServiceBase syncConfig 不覆盖 DB concurrency（NULL=继承代码默认）。TimerControllerBase cap 改 >= 语义，放行 concurrency_id < cap 的 0-indexed 分片。

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
augushong
2026-07-25 21:57:39 +08:00
parent f478ae0e4e
commit 3db3f7de78
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extend/base/common/controller/TimerControllerBase.php
View File

@@ -10,6 +10,14 @@ class TimerControllerBase extends ToolsController
{ {
protected $frequency = null; protected $frequency = null;
/**
* 最大并发上限 cap.
* 放行 concurrency_id < $concurrency 的请求（0-indexed 分片，合法 id ∈ [0, cap-1]）；
* 放行 concurrency_count <= $concurrency 的请求（并发总数声明，合法 ∈ [1, cap]）。
* DB 实际并发通过 T6 有效域钳制 = min(DB concurrency, 控制器 cap, max_handles 预算)，
* 动态扩容时高 concurrency_id 只要 < cap 就不会被误杀。
* 子类按任务实际承载力自行设置（默认 1 = 单分片，只允许 id=0）。
*/
protected $concurrency = 1; protected $concurrency = 1;
protected $concurrencyId = 0; protected $concurrencyId = 0;
@@ -21,12 +29,14 @@ class TimerControllerBase extends ToolsController
parent::initialize(); parent::initialize();
$concurrency_id = $this->request->param('concurrency_id', 0); $concurrency_id = $this->request->param('concurrency_id', 0);
if ($concurrency_id > $this->concurrency) { // cap 防御：0-indexed 分片号，合法 id ∈ [0, cap-1]；id >= cap 视为越界（超 cap 的分片不被本控制器承载）
if ($concurrency_id >= $this->concurrency) {
$this->error('concurrency id error'); $this->error('concurrency id error');
} }
$this->concurrencyId = $concurrency_id; $this->concurrencyId = $concurrency_id;
$concurrency_count = $this->request->param('concurrency_count', 1); $concurrency_count = $this->request->param('concurrency_count', 1);
// cap 防御：并发总数声明，合法 ∈ [1, cap]；count > cap 视为超限（DB concurrency 经 T6 钳制后不会超过 cap）
if ($concurrency_count > $this->concurrency) { if ($concurrency_count > $this->concurrency) {
$this->error('concurrency count error'); $this->error('concurrency count error');
} }

5
extend/base/common/service/TimerServiceBase.php
View File

@@ -13,6 +13,11 @@ class TimerServiceBase
/** /**
* 将配置文件中的定时任务同步到数据库. * 将配置文件中的定时任务同步到数据库.
* 仅新增不存在的记录，标记孤立记录，不覆盖 run_type/status. * 仅新增不存在的记录，标记孤立记录，不覆盖 run_type/status.
*
* concurrency 不变量（DB 为准）：
* - 新建行不写 concurrency，列 nullable 自然得 NULL（NULL = 继承代码 config 默认值）；
* - 已有行即便 config 中 concurrency 变化也不覆盖（以 UI/DB 显式配置为准）。
* config 的 concurrency 仅作为代码默认供 NULL 行继承，永不在此同步写入 DB。
*/ */
public static function syncConfigToDatabase(): void public static function syncConfigToDatabase(): void
{ {