fix(onlines): 恢复被 P9 掏空的在线状态存储(第11条)
根因:1035d00删本地核心时, inbound_node.go 的在线存储层被一并掏空 (GetOnlineClients 写死空/SetNodeOnlineTree 等空函数/SetRemoteTraffic 末尾喂树整块删除), 而节点轮询与 agent 上报两条到达路径完好, 数据 送达即被扔, 客户端/入站在线永远全零。 修复: 把原 xray.Process 上的在线存储(算法/锁/grace 20s 语义逐字 移植)落到 service 包单例 onlineStore(sharedOnlineStore, 对应原 currentXrayProcess 的单一持有语义); 恢复六个 wrapper + 新增 SetNodeActiveInboundTree; setRemoteTrafficLocked 补回 guidShared 与喂树块(原f727d04逻辑, process. 换 s.)。 偏离: 本地集在精简主控无本地核心喂养, 仅 mtproto job 折入(该 job 已不被调度, 路径保留无害); GetOnlineClients 对 nil 归一为 []。 测试: online_store_test 9 例(-race 全过: 并集/按GUID/替换/清空/ grace 边界/跨实例共享/并发); SetRemoteTraffic 集成 2 例(传统节点 GUID 树+active 树落库、旧节点 flat 回退); 全量 go test 串行复跑失败集合与基线 9 红逐字一致(零新增); service 包单跑唯一红为基线既有的 TestGetXrayConfig 红, 其余全过。
This commit is contained in:
@@ -439,6 +439,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
|
||||
nodeRow.Id = nodeID
|
||||
unmanagedTag := unmanagedTagPredicate(&nodeRow)
|
||||
selfKey := effectiveNodeKey(&model.Node{Id: nodeID, Guid: nodeRow.Guid})
|
||||
guidShared := nodeRow.Guid != "" && selfKey != nodeRow.Guid
|
||||
originGuidFor := func(snapIb *model.Inbound) string {
|
||||
if snapIb.OriginNodeGuid != "" && snapIb.OriginNodeGuid != nodeRow.Guid {
|
||||
return snapIb.OriginNodeGuid
|
||||
@@ -1267,6 +1268,32 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
|
||||
}
|
||||
}
|
||||
|
||||
tree := snap.OnlineTree
|
||||
switch {
|
||||
case len(tree) == 0 && len(snap.OnlineEmails) > 0:
|
||||
// Old-build node (no GUID tree): key its flat online list under its
|
||||
// own effective identity so attribution still works for that branch.
|
||||
tree = map[string][]string{selfKey: snap.OnlineEmails}
|
||||
case guidShared && len(tree) > 0:
|
||||
// Newer cloned node: its own clients arrive keyed under the shared
|
||||
// panelGuid. Remap just that entry to the node-unique key so the
|
||||
// clones don't merge; descendant subtrees keep their distinct GUIDs.
|
||||
if _, ok := tree[nodeRow.Guid]; ok {
|
||||
tree = remapGuidTreeKey(tree, nodeRow.Guid, selfKey)
|
||||
}
|
||||
}
|
||||
s.SetNodeOnlineTree(nodeID, tree)
|
||||
|
||||
activeTree := normalizeActiveInboundTreeTags(snap.ActiveInboundTree, tagToCentral)
|
||||
if guidShared && len(activeTree) > 0 {
|
||||
if _, ok := activeTree[nodeRow.Guid]; ok {
|
||||
activeTree = remapGuidTreeKey(activeTree, nodeRow.Guid, selfKey)
|
||||
}
|
||||
}
|
||||
if len(activeTree) > 0 {
|
||||
activeTree = filterGuidTreeKeys(activeTree, activeInboundGuidKeys(snap.Inbounds, tagToCentral, originGuidFor))
|
||||
}
|
||||
s.SetNodeActiveInboundTree(nodeID, activeTree)
|
||||
|
||||
return structuralChange, nil
|
||||
}
|
||||
@@ -1294,8 +1321,11 @@ func (s *InboundService) restartRemoteNodesOnDisable(nodeIDs []int) {
|
||||
}
|
||||
|
||||
func (s *InboundService) GetOnlineClients() []string {
|
||||
// Lite master: no local core aggregates online clients; node onlines
|
||||
// arrive through agent reports and node polling instead.
|
||||
// Lite master: no local core aggregates online clients; the online
|
||||
// store (see online_store.go) is fed by agent reports and node polling.
|
||||
if out := sharedOnlineStore.GetOnlineClients(); out != nil {
|
||||
return out
|
||||
}
|
||||
return []string{}
|
||||
}
|
||||
|
||||
@@ -1305,7 +1335,13 @@ func (s *InboundService) GetOnlineClients() []string {
|
||||
// node-id keying so a client three hops down is attributed to its real node,
|
||||
// not the intermediate one it was synced through.
|
||||
func (s *InboundService) GetOnlineClientsByGuid() map[string][]string {
|
||||
return map[string][]string{}
|
||||
out := sharedOnlineStore.GetMergedNodeTrees()
|
||||
if local := sharedOnlineStore.GetLocalOnlineClients(); len(local) > 0 {
|
||||
if guid := s.panelGuid(); guid != "" {
|
||||
out[guid] = mergeEmails(out[guid], local)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// GetActiveInboundsByGuid returns the inbound tags that carried traffic within
|
||||
@@ -1313,12 +1349,30 @@ func (s *InboundService) GetOnlineClientsByGuid() map[string][]string {
|
||||
// each inbound. A GUID missing from the map means "don't gate" for that node's
|
||||
// inbounds (old-build node or no active-inbound signal).
|
||||
func (s *InboundService) GetActiveInboundsByGuid() map[string][]string {
|
||||
return map[string][]string{}
|
||||
out := sharedOnlineStore.GetMergedActiveInboundTrees()
|
||||
active := sharedOnlineStore.GetLocalActiveInbounds()
|
||||
if len(active) == 0 {
|
||||
return out
|
||||
}
|
||||
guid := s.panelGuid()
|
||||
if guid == "" {
|
||||
return out
|
||||
}
|
||||
out[guid] = mergeEmails(out[guid], active)
|
||||
return out
|
||||
}
|
||||
|
||||
func (s *InboundService) SetNodeOnlineTree(nodeID int, tree map[string][]string) {}
|
||||
func (s *InboundService) SetNodeOnlineTree(nodeID int, tree map[string][]string) {
|
||||
sharedOnlineStore.SetNodeOnlineTree(nodeID, tree)
|
||||
}
|
||||
|
||||
func (s *InboundService) ClearNodeOnlineClients(nodeID int) {}
|
||||
func (s *InboundService) SetNodeActiveInboundTree(nodeID int, tree map[string][]string) {
|
||||
sharedOnlineStore.SetNodeActiveInboundTree(nodeID, tree)
|
||||
}
|
||||
|
||||
func (s *InboundService) ClearNodeOnlineClients(nodeID int) {
|
||||
sharedOnlineStore.ClearNodeOnlineClients(nodeID)
|
||||
}
|
||||
|
||||
// panelGuid returns this panel's stable self-identifier, used to key the local
|
||||
// panel's own clients in the per-node online maps (#4983).
|
||||
@@ -1451,11 +1505,13 @@ func (s *InboundService) GetClientsLastOnline() (map[string]int64, error) {
|
||||
}
|
||||
|
||||
// RefreshLocalOnlineClients folds the emails and inbound tags active on this
|
||||
// panel's own xray this poll into the local online/active sets, applying the
|
||||
// grace window and pruning stale entries. Pass nil to only prune. See
|
||||
// xray.Process for why the local sets are kept separate from the shared
|
||||
// panel's own inbounds this poll into the local online/active sets, applying
|
||||
// the grace window and pruning stale entries. Pass nil to only prune. See
|
||||
// onlineStore for why the local sets are kept separate from the shared
|
||||
// last_online column.
|
||||
func (s *InboundService) RefreshLocalOnlineClients(activeEmails, activeInboundTags []string) {}
|
||||
func (s *InboundService) RefreshLocalOnlineClients(activeEmails, activeInboundTags []string) {
|
||||
sharedOnlineStore.RefreshLocalOnline(activeEmails, activeInboundTags, time.Now().UnixMilli(), onlineGracePeriodMs)
|
||||
}
|
||||
|
||||
func (s *InboundService) FilterAndSortClientEmails(emails []string) ([]string, []string, error) {
|
||||
db := database.GetDB()
|
||||
|
||||
Reference in New Issue
Block a user