feat: 轮询观测入库异步化,调网关与入库分离,采集记录经消息攒批写入
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 16m2s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 16m2s
- 轮询步骤异步模式下只调网关并发布 card.ingest 入库消息,入库消费者固定并发 30、按采集 ID 去重、可重试错误不限次数退避重投 - 采集记录经 card.collection 攒批写入,失败整批重投,新增 (observation_id, observed_at) 唯一索引 - 网络、实名观测增加乱序保护;轮询读查询走缓存,套餐状态查询各自计时且失败不缓存 - 入库积压告警与反压;系统配置 polling.ingest.mode 默认 sync 可回退;测试环境 nsqd 消息全部落盘 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -76,7 +76,7 @@ func (r *TierResolver) Prefill(ctx context.Context, cards []*model.IotCard) {
|
||||
}
|
||||
results := make(map[uint]TierFacts, len(cards))
|
||||
if len(standaloneIDs) > 0 {
|
||||
states, err := r.usage.PackageStatesByCarriers(ctx, constants.AssetTypeIotCard, standaloneIDs)
|
||||
states, err := r.packageStates(ctx, constants.AssetTypeIotCard, standaloneIDs)
|
||||
if err != nil {
|
||||
r.logger.Warn("批量查询卡套餐状态失败,相关卡本次不按套餐状态匹配", zap.Error(err))
|
||||
}
|
||||
@@ -87,7 +87,9 @@ func (r *TierResolver) Prefill(ctx context.Context, cards []*model.IotCard) {
|
||||
}
|
||||
}
|
||||
if len(boundCardIDs) > 0 && r.bindings != nil {
|
||||
bindings, err := r.bindings.GetActiveBindingsByCardIDs(ctx, boundCardIDs)
|
||||
bindCtx, cancel := context.WithTimeout(ctx, constants.PollingTierQueryTimeout)
|
||||
bindings, err := r.bindings.GetActiveBindingsByCardIDs(bindCtx, boundCardIDs)
|
||||
cancel()
|
||||
if err != nil {
|
||||
r.logger.Warn("批量查询卡绑定设备失败,相关卡本次不按套餐状态匹配", zap.Error(err))
|
||||
} else {
|
||||
@@ -97,8 +99,8 @@ func (r *TierResolver) Prefill(ctx context.Context, cards []*model.IotCard) {
|
||||
deviceOf[binding.IotCardID] = binding.DeviceID
|
||||
deviceIDs = append(deviceIDs, binding.DeviceID)
|
||||
}
|
||||
deviceStates, devErr := r.usage.PackageStatesByCarriers(ctx, constants.AssetTypeDevice, deviceIDs)
|
||||
cardStates, cardErr := r.usage.PackageStatesByCarriers(ctx, constants.AssetTypeIotCard, boundCardIDs)
|
||||
deviceStates, devErr := r.packageStates(ctx, constants.AssetTypeDevice, deviceIDs)
|
||||
cardStates, cardErr := r.packageStates(ctx, constants.AssetTypeIotCard, boundCardIDs)
|
||||
for _, id := range boundCardIDs {
|
||||
// 有有效设备绑定按设备计算;绑定已失效的卡按卡自身计算(与 resolvePackageCarrier 口径一致)。
|
||||
if deviceID, bound := deviceOf[id]; bound {
|
||||
@@ -111,17 +113,22 @@ func (r *TierResolver) Prefill(ctx context.Context, cards []*model.IotCard) {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 只缓存查询成功的卡:查询失败的卡本次按未知处理,下次重新查询,不把"未知"留在缓存里。
|
||||
now := time.Now()
|
||||
r.mu.Lock()
|
||||
for _, card := range cards {
|
||||
if card == nil {
|
||||
continue
|
||||
}
|
||||
r.cache[card.ID] = tierCacheEntry{facts: results[card.ID], loadedAt: now}
|
||||
for id, facts := range results {
|
||||
r.cache[id] = tierCacheEntry{facts: facts, loadedAt: now}
|
||||
}
|
||||
r.mu.Unlock()
|
||||
}
|
||||
|
||||
// packageStates 以单独的超时查询一批载体的套餐状态,避免多次查询共用一个超时。
|
||||
func (r *TierResolver) packageStates(ctx context.Context, carrierType string, ids []uint) (map[uint]string, error) {
|
||||
queryCtx, cancel := context.WithTimeout(ctx, constants.PollingTierQueryTimeout)
|
||||
defer cancel()
|
||||
return r.usage.PackageStatesByCarriers(queryCtx, carrierType, ids)
|
||||
}
|
||||
|
||||
// Invalidate 清除某卡的分层事实缓存(套餐变化后可调用,未调用时最迟缓存过期后更新)。
|
||||
func (r *TierResolver) Invalidate(cardID uint) {
|
||||
if r == nil {
|
||||
|
||||
Reference in New Issue
Block a user