feat: 按运营商账户调度的迁移、配置与账户队列 Lua
- 迁移 000251~000254:运营商账户调度参数、请求检查场景(预置 8 个)、卡轮询失败告警表,以及调度模式、步骤、退避、告警等受控系统配置(默认 legacy,行为不变);并发配置表注释标记废弃 - 受控系统配置注册与 JSON 结构校验:步骤只能是 4 种检查类型且不重复、退避序列递增 - yaml 增加 NSQ 地址、msg_timeout、租约、续期间隔、分发间隔、默认执行上限与 max_in_flight;引入 go-nsq - 测试环境 docker-compose 增加 nsqlookupd 与 nsqd,Worker 注入 NSQ 地址 - 账户队列 Redis 结构与 Lua:领取(执行上限、优先占比、按限流组剩余 QPS 估算)、抢执行权、续期、收尾、请求检查(合并、冷却、执行中打优先标记)、移出、发布失败释放
This commit is contained in:
3
migrations/000251_add_carrier_polling_param.down.sql
Normal file
3
migrations/000251_add_carrier_polling_param.down.sql
Normal file
@@ -0,0 +1,3 @@
|
||||
-- 回滚运营商账户调度参数表。
|
||||
DROP INDEX IF EXISTS uk_carrier_polling_param_carrier;
|
||||
DROP TABLE IF EXISTS tb_carrier_polling_param;
|
||||
42
migrations/000251_add_carrier_polling_param.up.sql
Normal file
42
migrations/000251_add_carrier_polling_param.up.sql
Normal file
@@ -0,0 +1,42 @@
|
||||
-- 运营商账户调度参数(add-carrier-polling-scheduler)。
|
||||
-- 背景:新调度按运营商账户领取与执行卡任务,每个账户的执行上限、每进程并发、优先占比需要可单独配置。
|
||||
--
|
||||
-- 设计选择:
|
||||
-- 1. carrier_id 唯一,一个账户一行;未配置的账户没有记录、使用 yaml 全局默认,不改 tb_carrier。
|
||||
-- 2. 各参数可空,空表示该项使用全局默认。
|
||||
-- 3. stop_resume_* 与 sr_inflight_limit 供停复机指令队列(add-stop-resume-command-queue)使用,本次只建列。
|
||||
-- 4. 不使用数据库外键(ENG-MODEL-001);软删除,后台维护。
|
||||
|
||||
CREATE TABLE tb_carrier_polling_param (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
carrier_id BIGINT NOT NULL,
|
||||
inflight_limit INTEGER,
|
||||
card_max_in_flight INTEGER,
|
||||
stop_resume_max_in_flight INTEGER,
|
||||
sr_inflight_limit INTEGER,
|
||||
priority_max_ratio NUMERIC(4, 3),
|
||||
stop_resume_min_interval INTEGER,
|
||||
stop_resume_confirm_delay INTEGER,
|
||||
creator BIGINT NOT NULL DEFAULT 0,
|
||||
updater BIGINT NOT NULL DEFAULT 0,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
deleted_at TIMESTAMPTZ,
|
||||
CONSTRAINT ck_carrier_polling_param_positive CHECK (
|
||||
(inflight_limit IS NULL OR inflight_limit > 0) AND (card_max_in_flight IS NULL OR card_max_in_flight > 0)
|
||||
AND (stop_resume_max_in_flight IS NULL OR stop_resume_max_in_flight > 0) AND (sr_inflight_limit IS NULL OR sr_inflight_limit > 0)
|
||||
AND (stop_resume_min_interval IS NULL OR stop_resume_min_interval > 0) AND (stop_resume_confirm_delay IS NULL OR stop_resume_confirm_delay > 0)),
|
||||
CONSTRAINT ck_carrier_polling_param_ratio CHECK (priority_max_ratio IS NULL OR (priority_max_ratio > 0 AND priority_max_ratio <= 1))
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX uk_carrier_polling_param_carrier ON tb_carrier_polling_param (carrier_id) WHERE deleted_at IS NULL;
|
||||
|
||||
COMMENT ON TABLE tb_carrier_polling_param IS '运营商账户调度参数:未配置的账户使用全局默认';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.carrier_id IS '运营商账户ID';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.inflight_limit IS '该账户同时执行卡任务的上限(跨 Worker 实例)';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.card_max_in_flight IS '每个 Worker 进程消费该账户卡任务 topic 的 max_in_flight';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.stop_resume_max_in_flight IS '每个 Worker 进程消费该账户停复机 topic 的 max_in_flight';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.sr_inflight_limit IS '该账户同时执行停复机指令的上限';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.priority_max_ratio IS '卡任务每轮领取中优先队列的最大占比(0~1),空表示不限';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.stop_resume_min_interval IS '单卡两次停复机网关调用的最小间隔(秒)';
|
||||
COMMENT ON COLUMN tb_carrier_polling_param.stop_resume_confirm_delay IS '停复机结果未知后查卡状态确认的延迟(秒)';
|
||||
3
migrations/000252_add_polling_check_scene.down.sql
Normal file
3
migrations/000252_add_polling_check_scene.down.sql
Normal file
@@ -0,0 +1,3 @@
|
||||
-- 回滚业务事件与读入口检查场景表。
|
||||
DROP INDEX IF EXISTS uk_polling_check_scene_scene;
|
||||
DROP TABLE IF EXISTS tb_polling_check_scene;
|
||||
41
migrations/000252_add_polling_check_scene.up.sql
Normal file
41
migrations/000252_add_polling_check_scene.up.sql
Normal file
@@ -0,0 +1,41 @@
|
||||
-- 业务事件与读入口检查场景(add-carrier-polling-scheduler)。
|
||||
-- 背景:业务事件与读入口原先各自起"立即、3 分钟、5 分钟"卡观测序列,不受限流、与优先轮询重复;
|
||||
-- 改为"请求检查":把卡的对应检查类型设为立即到期放入运营商账户优先队列,按场景配置确认延迟与冷却。
|
||||
--
|
||||
-- 设计选择:
|
||||
-- 1. scene 唯一,场景由代码预置;后台只可修改检查类型、确认延迟与冷却时长。
|
||||
-- 2. check_types 取值 card_status / carddata / realname;confirm_delays 为秒数数组(空数组表示只立即检查一次);
|
||||
-- cooldown 为秒数,空表示不冷却(读入口场景默认配置冷却,避免反复刷新占满优先队列)。
|
||||
-- 3. 停复机成功与设备操作默认 3 分钟后确认一次(结果已满足预期时取消),沿用原观测序列的确认语义。
|
||||
|
||||
CREATE TABLE tb_polling_check_scene (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
scene VARCHAR(50) NOT NULL,
|
||||
scene_name VARCHAR(100) NOT NULL,
|
||||
check_types JSONB NOT NULL DEFAULT '[]'::jsonb,
|
||||
confirm_delays JSONB NOT NULL DEFAULT '[]'::jsonb,
|
||||
cooldown INTEGER,
|
||||
updater BIGINT NOT NULL DEFAULT 0,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
CONSTRAINT ck_polling_check_scene_cooldown CHECK (cooldown IS NULL OR cooldown > 0)
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX uk_polling_check_scene_scene ON tb_polling_check_scene (scene);
|
||||
|
||||
COMMENT ON TABLE tb_polling_check_scene IS '业务事件与读入口请求检查场景';
|
||||
COMMENT ON COLUMN tb_polling_check_scene.scene IS '场景编码(代码预置)';
|
||||
COMMENT ON COLUMN tb_polling_check_scene.scene_name IS '场景名称';
|
||||
COMMENT ON COLUMN tb_polling_check_scene.check_types IS '需要检查的类型:card_status / carddata / realname';
|
||||
COMMENT ON COLUMN tb_polling_check_scene.confirm_delays IS '延迟确认序列(秒),空数组表示只立即检查一次';
|
||||
COMMENT ON COLUMN tb_polling_check_scene.cooldown IS '冷却时长(秒):最近一次成功检查未超过该时长则不请求,空表示不冷却';
|
||||
|
||||
INSERT INTO tb_polling_check_scene (scene, scene_name, check_types, confirm_delays, cooldown) VALUES
|
||||
('order_paid', '订单支付', '["card_status","carddata","realname"]', '[]', NULL),
|
||||
('package_activated', '套餐激活', '["card_status","carddata","realname"]', '[]', NULL),
|
||||
('stop_resume_succeeded', '停复机成功', '["card_status"]', '[180]', NULL),
|
||||
('device_operation', '设备操作', '["card_status"]', '[180]', NULL),
|
||||
('auto_renewal_purchase', '自动续费购包', '["card_status","carddata","realname"]', '[]', NULL),
|
||||
('client_asset_detail', 'C 端资产详情', '["card_status","carddata"]', '[]', 300),
|
||||
('admin_asset_realtime', '后台资产实时状态', '["card_status","carddata","realname"]', '[]', 60),
|
||||
('realname_link', '实名链接', '["realname"]', '[]', 60);
|
||||
6
migrations/000253_add_polling_failure_alert.down.sql
Normal file
6
migrations/000253_add_polling_failure_alert.down.sql
Normal file
@@ -0,0 +1,6 @@
|
||||
-- 回滚卡轮询失败告警表。
|
||||
DROP INDEX IF EXISTS idx_polling_failure_alert_created;
|
||||
DROP INDEX IF EXISTS idx_polling_failure_alert_card;
|
||||
DROP INDEX IF EXISTS idx_polling_failure_alert_carrier;
|
||||
DROP INDEX IF EXISTS uk_polling_failure_alert_open;
|
||||
DROP TABLE IF EXISTS tb_polling_failure_alert;
|
||||
46
migrations/000253_add_polling_failure_alert.up.sql
Normal file
46
migrations/000253_add_polling_failure_alert.up.sql
Normal file
@@ -0,0 +1,46 @@
|
||||
-- 卡轮询失败告警(add-carrier-polling-scheduler)。
|
||||
-- 背景:新调度按"卡 × 检查类型"记连续失败并退避重试;持续失败需要告警,由运营联系上游或关闭该卡轮询。
|
||||
--
|
||||
-- 设计选择:
|
||||
-- 1. 同一卡同一检查类型只保留一条未处理告警(部分唯一索引),后续失败更新计数与最近错误。
|
||||
-- 2. status:1-未处理 2-已恢复(首次成功自动转入)3-已关闭轮询 4-已处理(人工标记)。
|
||||
-- 3. check_type 取值 card_status / carddata / realname / package;停复机方向在停复机指令队列接入同一张表。
|
||||
-- 4. alert_level:card 卡级 / carrier 账户级(同账户窗口内告警数超阈值时产生,card_id 为 0)。
|
||||
-- 5. 告警写入走异步,失败只记日志,不影响轮询;不使用数据库外键(ENG-MODEL-001)。
|
||||
|
||||
CREATE TABLE tb_polling_failure_alert (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
alert_level VARCHAR(20) NOT NULL DEFAULT 'card',
|
||||
card_id BIGINT NOT NULL DEFAULT 0,
|
||||
iccid VARCHAR(30) NOT NULL DEFAULT '',
|
||||
carrier_id BIGINT NOT NULL DEFAULT 0,
|
||||
check_type VARCHAR(30) NOT NULL,
|
||||
error_category VARCHAR(50) NOT NULL DEFAULT '',
|
||||
fail_count INTEGER NOT NULL DEFAULT 0,
|
||||
first_failed_at TIMESTAMPTZ,
|
||||
last_failed_at TIMESTAMPTZ,
|
||||
last_error VARCHAR(500) NOT NULL DEFAULT '',
|
||||
status SMALLINT NOT NULL DEFAULT 1,
|
||||
handled_by BIGINT NOT NULL DEFAULT 0,
|
||||
handled_at TIMESTAMPTZ,
|
||||
handle_remark VARCHAR(500) NOT NULL DEFAULT '',
|
||||
recovered_at TIMESTAMPTZ,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
CONSTRAINT ck_polling_failure_alert_status CHECK (status IN (1, 2, 3, 4)),
|
||||
CONSTRAINT ck_polling_failure_alert_level CHECK (alert_level IN ('card', 'carrier'))
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX uk_polling_failure_alert_open ON tb_polling_failure_alert (alert_level, card_id, carrier_id, check_type) WHERE status = 1;
|
||||
CREATE INDEX idx_polling_failure_alert_carrier ON tb_polling_failure_alert (carrier_id, status, last_failed_at DESC);
|
||||
CREATE INDEX idx_polling_failure_alert_card ON tb_polling_failure_alert (card_id, created_at DESC);
|
||||
CREATE INDEX idx_polling_failure_alert_created ON tb_polling_failure_alert (created_at DESC);
|
||||
|
||||
COMMENT ON TABLE tb_polling_failure_alert IS '卡轮询失败告警:同一卡同一检查类型只保留一条未处理告警';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.alert_level IS '告警级别 card-卡级 carrier-账户级';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.card_id IS '卡ID,账户级告警为 0';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.check_type IS '检查类型 card_status / carddata / realname / package;账户级告警为 all';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.error_category IS '最近错误类别(网关错误类别或上游错误分类)';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.fail_count IS '连续失败次数;账户级告警为窗口内告警数';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.last_error IS '最近错误(脱敏截断)';
|
||||
COMMENT ON COLUMN tb_polling_failure_alert.status IS '状态 1-未处理 2-已恢复 3-已关闭轮询 4-已处理';
|
||||
@@ -0,0 +1,7 @@
|
||||
-- 回滚按运营商账户调度的受控系统配置与并发配置表注释。
|
||||
DELETE FROM tb_system_config WHERE config_key IN (
|
||||
'polling.scheduler.mode', 'polling.scheduler.step_order', 'polling.scheduler.step_timeout_seconds',
|
||||
'polling.scheduler.task_timeout_margin_seconds', 'polling.scheduler.skip_package_after_flow',
|
||||
'polling.failure.backoff_seconds', 'polling.failure.alert_fail_count', 'polling.failure.alert_fail_duration_seconds',
|
||||
'polling.failure.immediate_alert_categories', 'polling.failure.account_alert_window_seconds', 'polling.failure.account_alert_threshold');
|
||||
COMMENT ON TABLE tb_polling_concurrency_config IS '并发控制配置表 - 控制不同类型任务的最大并发数';
|
||||
31
migrations/000254_add_carrier_scheduler_system_config.up.sql
Normal file
31
migrations/000254_add_carrier_scheduler_system_config.up.sql
Normal file
@@ -0,0 +1,31 @@
|
||||
-- 按运营商账户调度的受控系统配置(add-carrier-polling-scheduler),module = polling。
|
||||
-- 配置的权威定义(类型、取值范围、默认值、JSON 结构校验)在代码注册表中;本迁移只落库初始值。
|
||||
-- 已存在同名 Key 时不覆盖(ON CONFLICT DO NOTHING),避免覆盖运营已修改的值。
|
||||
--
|
||||
-- 1. polling.scheduler.mode:legacy 旧分片调度(默认)/ carrier 按运营商账户调度;全局整体切换,不按账户灰度。
|
||||
-- 2. polling.scheduler.step_order:卡任务步骤顺序,只能是 card_status / carddata / realname / package 且不重复。
|
||||
-- 3. polling.scheduler.step_timeout_seconds:各检查类型单步超时(秒)。
|
||||
-- 4. polling.scheduler.task_timeout_margin_seconds:卡任务总超时 = 各步骤超时之和 + 余量。
|
||||
-- 5. polling.scheduler.skip_package_after_flow:同轮流量步骤已触发停复机评估时跳过套餐步骤。
|
||||
-- 6. polling.failure.backoff_seconds:失败退避序列(秒,递增),可按检查类型覆盖 default;最长不超过该类型正常间隔。
|
||||
-- 7. polling.failure.alert_fail_count:连续失败告警阈值,可按检查类型覆盖 default。
|
||||
-- 8. polling.failure.alert_fail_duration_seconds:持续失败时长告警阈值(秒)。
|
||||
-- 9. polling.failure.immediate_alert_categories:首次出现即告警的错误类别。
|
||||
-- 10. polling.failure.account_alert_window_seconds / account_alert_threshold:账户级告警窗口与阈值。
|
||||
-- 同时把 tb_polling_concurrency_config 表注释标记为废弃(新调度按账户执行上限与限流取代全局并发配置),不删表。
|
||||
|
||||
INSERT INTO tb_system_config (config_key, config_value, value_type, module, description, is_readonly, is_sensitive, creator, updater, created_at, updated_at) VALUES
|
||||
('polling.scheduler.mode', 'legacy', 'string', 'polling', '卡轮询调度模式:legacy 旧分片调度,carrier 按运营商账户调度(整体切换)', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.scheduler.step_order', '["card_status","carddata","realname","package"]', 'json', 'polling', '卡任务步骤顺序', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.scheduler.step_timeout_seconds', '{"card_status":15,"carddata":15,"realname":15,"package":20}', 'json', 'polling', '各检查类型单步超时(秒)', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.scheduler.task_timeout_margin_seconds', '10', 'int', 'polling', '卡任务总超时余量(秒):总超时 = 各步骤超时之和 + 余量', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.scheduler.skip_package_after_flow', 'true', 'bool', 'polling', '同轮流量步骤已触发停复机评估时跳过套餐步骤', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.failure.backoff_seconds', '{"default":[60,300,900,1800,3600]}', 'json', 'polling', '失败退避序列(秒,递增),可按检查类型覆盖 default', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.failure.alert_fail_count', '{"default":5}', 'json', 'polling', '连续失败告警阈值,可按检查类型覆盖 default', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.failure.alert_fail_duration_seconds', '21600', 'int', 'polling', '持续失败时长告警阈值(秒)', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.failure.immediate_alert_categories', '["account_config"]', 'json', 'polling', '首次出现即告警的错误类别', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.failure.account_alert_window_seconds', '600', 'int', 'polling', '账户级告警统计窗口(秒)', FALSE, FALSE, 0, 0, NOW(), NOW()),
|
||||
('polling.failure.account_alert_threshold', '50', 'int', 'polling', '账户级告警阈值:窗口内同账户新增失败告警数', FALSE, FALSE, 0, 0, NOW(), NOW())
|
||||
ON CONFLICT (config_key) DO NOTHING;
|
||||
|
||||
COMMENT ON TABLE tb_polling_concurrency_config IS '已废弃:按运营商账户调度后由账户执行上限与网关限流取代,仅旧分片调度使用';
|
||||
Reference in New Issue
Block a user