mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-12 15:46:06 +00:00
adc64bb804
* fix(nodes): keep cloned nodes (shared panelGuid) in separate attribution buckets
#4983 keys online/inbound attribution by panelGuid, assuming it is globally unique. Cloned node servers ship an identical panelGuid in their copied settings, so the master collapsed several physical nodes into one bucket: GetMergedNodeTrees merged their online sets under one key and every inbound on those nodes (same origin_node_guid) read that merged set, so the inbound page showed online cross-attributed and counts inflated.
Fall back to the node-unique synthNodeGuid(node.Id) whenever a node's panelGuid is shared by another of the master's direct nodes. Applied consistently at originGuidFor (origin_node_guid write), the online-tree key plus a self-key remap for nodes that report a GUID-keyed tree, effectiveNodeGuid, and recountByGuid's inbound bucketing. sharedNodeGuids computes the collision set. Online now works without node changes; making panelGuids unique restores real-GUID identity and also fixes GUID-keyed IP attribution.
* fix(nodes): extend duplicate-GUID hardening to master collisions, IP attribution, and a heartbeat warning
Builds on the node-vs-node fix: a node's GUID is now also treated as ambiguous when it equals the master's own panelGuid (a node cloned from the master), so the master's local clients and that node can't merge. Centralized as ambiguousNodeGuids(nodes, selfGuid) + effectiveNodeKey(node).
Applied the same node-unique fallback to the GUID-keyed IP attribution that #4983 added but the prior commit left collapsing: MergeClientIpsByGuid remaps a cloned node's own subtree to its node-unique key, nodeGuidNameMap resolves names by that key, and node deletion purges both keys. Added a throttled heartbeat warning so the operator is told to regenerate a duplicate panelGuid. Tests cover master-collision, effectiveNodeKey, and the IP remap.
* fix(node-sync): log the client-IP-attribution 404 once per node, not every cycle
Old-build nodes lack panel/api/clients/clientIpsByGuid and answer 404 on every IP-sync cycle (~10s), which floods the debug log now that the IP phase actually runs. Note the missing endpoint once per node (re-armed if the node later recovers or is upgraded) and keep logging genuine fetch errors.
* fix(nodes): remap a cloned node's own-panelGuid origin so the inbound page shows online
These nodes report their OWN inbounds with their own panelGuid as OriginNodeGuid, so originGuidFor returned the shared GUID verbatim and never remapped it. origin_node_guid stayed the shared GUID while online was keyed under the node-unique key, so the inbound page (which reads the stored origin_node_guid) looked up an empty bucket and showed everyone offline — even though the Nodes page (which derives the key live) was correct. Treat an origin equal to the node's own panelGuid as the node's own inbound and resolve it through selfKey; keep only a genuinely different (descendant) origin across hops.
* fix(node-sync): don't delete a node's central inbounds when its snapshot is empty
The central-inbound sweep deletes any central inbound whose tag is absent from the node's snapshot, with no guard for an empty snapshot. A node mid-restart or with a transient DB error (e.g. Postgres 57P01) can return an empty inbound list with success=true, which wiped all of that node's central inbounds and their clients (and reset traffic history on re-create) — observed on the Germany node: 0 clients but still 44 online (online survives because it comes from the snapshot's online tree, not the central inbound). Skip the sweep entirely when the snapshot reports zero inbounds; a real per-inbound deletion still sweeps via a non-empty snapshot that omits one tag.
* fix(email): stay silent when SMTP notifications are disabled
The event subscriber is registered unconditionally and only checked the per-event list (smtpEnabledEvents, default login.attempt,cpu.high) — not the smtpEnable master toggle. Login events are always published, so a panel with smtpEnable=false still attempted a send on every login and logged 'email subscriber: send failed: smtp host not configured'. Gate HandleEvent on GetSmtpEnable() so a disabled-SMTP panel does nothing, matching the comment where the subscriber is registered.
* fix(nodes): count only expired/exhausted as 'ended', not disabled clients
The per-node depleted (ended) count folded disabled clients in with expired/exhausted (expired || exhausted || !Enable), so the Nodes page 'ended' chip was inflated and inconsistent with the inbound page, where disabled and depleted are separate buckets. Count only expired/exhausted in both GetAll and recountByGuid so 'ended' means the same thing on both pages.
* feat(nodes): show live speed for node-hosted inbounds
Inbound speed is computed on the dashboard from a 'traffics' delta feed, which only the local Xray poll produced — so node-hosted inbounds showed no speed. The node sync now diffs successive per-inbound cumulative totals (it polls @5s, same as the local poll) and broadcasts the byte deltas as a separate 'nodeTraffics' field, keyed by the central tag the dashboard already matches. The frontend applies 'traffics' to local inbounds and 'nodeTraffics' to node inbounds within their own scope, so the two 5s polls don't clobber each other and idle inbounds still clear. Deltas clamp to 0 on a reset; a node that fails to sync keeps a stale total so its delta is 0 (no phantom speed).
* fix(nodes): normalize node-inbound speed by elapsed time to avoid recovery spikes
Adversarial review found that a node's cumulative inbound counter keeps climbing while the master can't reach it, so the first delta after a gap (node outage, skipped poll, slow node) spans more than one 5s window but was still divided by the dashboard's fixed 5s — rendering an impossible one-tick speed spike on recovery (and a 2x over-report after a skipped poll). Now each delta is normalized to the fixed window using the real elapsed time since the inbound's counter last changed, so a backlog shows the true average rate over the gap. The change timestamp advances only on actual movement, so idle stretches average correctly when traffic resumes; resets rebaseline. Also moves the maybePushGlobals doc comment back onto its function.
* fix(inbounds): keep last speed across page navigation instead of blanking
Speed is delta-derived, so it can't be recomputed until the first poll after mount. The websocket subscription and speed state are page-scoped (useWebSocket lives in InboundsPage), so leaving to another page and returning blanked the Speed column for up to one 5s poll. Cache the last speed map across mounts (module scope, 15s recency guard) and seed the state from it, so returning shows the last throughput immediately and the next poll refreshes it. Applies to both local and node-hosted inbound speed.
* fix(inbounds): rebalance table column widths so it fills width without gaps
Inbound list columns had small fixed widths summing far below the table's
full width, so AntD spread the leftover space evenly into wide empty gaps.
Widen the content-heavy columns (protocol, clients, traffic, node) so the
slack lands there, keep the small ones (id, port, enable) tight, and make
scroll.x track the visible columns' total so the table never collapses
below content and adapts when conditional columns are hidden.
* feat(nodes): show active/disabled client counts on the nodes page like inbounds
The nodes page only showed total/online/ended, and (since ended now excludes disabled) disabled clients were invisible there. Compute per-node active and disabled counts — in both GetAll and recountByGuid, with the same depleted-wins-over-disabled precedence the inbound page uses so the buckets stay mutually exclusive — and render total/active/disabled/ended/online chips matching the inbound page (table column + mobile stats modal).
* fix(nodes): count active/disabled/ended by client email, not stale inbound_id
The per-node client breakdown filtered client_traffics by inbound_id, but that column goes stale after an inbound is delete+recreated (e.g. the Germany node), so almost every traffic row pointed at a dead inbound id and the counts collapsed — active showed ~5 instead of ~1100. Classify each node client via client_inbounds -> clients joined to client_traffics by EMAIL (the reliable key), deduped per node/guid, in both GetAll and recountByGuid. Now active/disabled/ended on the nodes page match the inbound page. Added a regression test that proves matching works with a deliberately stale inbound_id.
* style(nodes): widen Clients column so the count chips fit one tidy line
After adding the active/disabled chips, the 5 chips (total/active/disabled/ended/online) no longer fit the 160px Clients column and wrapped to two lines. Widen it to 220 and drop the Space wrap so they render on a single line like the inbound page, and zero the total tag's margin for even spacing. Same principle as 79ff283 (give the content column enough width).
* style(nodes): tighten Clients chip spacing to match the inbound page
AntD's default tag side-padding (~8px) put a wide gap between the count chips. Apply the inbound page's compact padding ('0 2px') + client-count-tag (tabular-nums) to each chip and narrow the column to 180 so the numbers sit close together like the inbound list instead of floating apart.
413 lines
13 KiB
Go
413 lines
13 KiB
Go
package job
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/common"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/runtime"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/websocket"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
)
|
|
|
|
const (
|
|
nodeTrafficSyncConcurrency = 8
|
|
nodeTrafficSyncRequestTimeout = 4 * time.Second
|
|
nodeReconcileTimeout = 30 * time.Second
|
|
nodeClientIpSyncInterval = 10 * time.Second
|
|
nodeClientIpSyncTimeout = 6 * time.Second
|
|
nodeGlobalPushInterval = 30 * time.Second
|
|
// nodeInboundSpeedWindowMs is the poll window node-inbound speed deltas are
|
|
// normalized to; it MUST match the dashboard's TRAFFIC_POLL_INTERVAL_S (5s),
|
|
// the fixed divisor the frontend applies to turn a delta into a rate.
|
|
nodeInboundSpeedWindowMs int64 = 5000
|
|
)
|
|
|
|
// inboundSample is a node inbound's last-seen cumulative up/down and the time
|
|
// (unix millis) its counter last changed, used to derive a normalized speed.
|
|
type inboundSample struct {
|
|
up, down, at int64
|
|
}
|
|
|
|
type NodeTrafficSyncJob struct {
|
|
nodeService service.NodeService
|
|
inboundService service.InboundService
|
|
settingService service.SettingService
|
|
xrayService service.XrayService
|
|
running sync.Mutex
|
|
structural atomicBool
|
|
ipSyncMu sync.Mutex
|
|
lastIpSync int64
|
|
globalPushMu sync.Mutex
|
|
lastGlobalPush int64
|
|
// noGuidIpEndpoint tracks nodes (by id) whose client-IP attribution endpoint
|
|
// returned 404, so an old-build node is noted once instead of every cycle.
|
|
noGuidIpEndpoint sync.Map
|
|
// prevInboundTotals holds the previous poll's cumulative up/down (and the time
|
|
// the counter last changed) per node inbound tag, so the next poll can derive
|
|
// a per-inbound speed delta — node inbounds have no local Xray poll. Touched
|
|
// only from Run (serialized).
|
|
prevInboundTotals map[string]inboundSample
|
|
}
|
|
|
|
type atomicBool struct {
|
|
mu sync.Mutex
|
|
v bool
|
|
}
|
|
|
|
func (a *atomicBool) set() {
|
|
a.mu.Lock()
|
|
a.v = true
|
|
a.mu.Unlock()
|
|
}
|
|
|
|
func (a *atomicBool) takeAndReset() bool {
|
|
a.mu.Lock()
|
|
v := a.v
|
|
a.v = false
|
|
a.mu.Unlock()
|
|
return v
|
|
}
|
|
|
|
func NewNodeTrafficSyncJob() *NodeTrafficSyncJob {
|
|
return &NodeTrafficSyncJob{}
|
|
}
|
|
|
|
func (j *NodeTrafficSyncJob) Run() {
|
|
if !j.running.TryLock() {
|
|
return
|
|
}
|
|
defer j.running.Unlock()
|
|
|
|
mgr := runtime.GetManager()
|
|
if mgr == nil {
|
|
return
|
|
}
|
|
|
|
nodes, err := j.nodeService.GetAll()
|
|
if err != nil {
|
|
logger.Warning("node traffic sync: load nodes failed:", err)
|
|
return
|
|
}
|
|
if len(nodes) == 0 {
|
|
return
|
|
}
|
|
|
|
// Decide once per tick whether this run also syncs client IPs, and stamp the
|
|
// clock before the loop so two back-to-back 5s ticks can't both qualify.
|
|
doIpSync := false
|
|
j.ipSyncMu.Lock()
|
|
if now := time.Now().Unix(); now-j.lastIpSync >= int64(nodeClientIpSyncInterval/time.Second) {
|
|
doIpSync = true
|
|
j.lastIpSync = now
|
|
}
|
|
j.ipSyncMu.Unlock()
|
|
|
|
sem := make(chan struct{}, nodeTrafficSyncConcurrency)
|
|
var wg sync.WaitGroup
|
|
for _, n := range nodes {
|
|
if !n.Enable || n.Status != "online" {
|
|
continue
|
|
}
|
|
wg.Add(1)
|
|
sem <- struct{}{}
|
|
n := n
|
|
common.GoRecover("node-traffic-sync:"+n.Name, func() {
|
|
defer wg.Done()
|
|
defer func() { <-sem }()
|
|
j.syncOne(mgr, n, doIpSync)
|
|
})
|
|
}
|
|
wg.Wait()
|
|
|
|
_, clientsDisabled, err := j.inboundService.AddTraffic(nil, nil)
|
|
if err != nil {
|
|
logger.Warning("node traffic sync: depletion check failed:", err)
|
|
}
|
|
if clientsDisabled {
|
|
if restartOnDisable, settingErr := j.settingService.GetRestartXrayOnClientDisable(); settingErr == nil && restartOnDisable {
|
|
if err := j.xrayService.RestartXray(true); err != nil {
|
|
logger.Warning("node traffic sync: restart xray after disabling clients failed:", err)
|
|
j.xrayService.SetToNeedRestart()
|
|
}
|
|
} else if settingErr != nil {
|
|
logger.Warning("node traffic sync: get RestartXrayOnClientDisable failed:", settingErr)
|
|
}
|
|
j.structural.set()
|
|
}
|
|
|
|
j.maybePushGlobals(mgr, nodes)
|
|
|
|
lastOnline, err := j.inboundService.GetClientsLastOnline()
|
|
if err != nil {
|
|
logger.Warning("node traffic sync: get last-online failed:", err)
|
|
}
|
|
if lastOnline == nil {
|
|
lastOnline = map[string]int64{}
|
|
}
|
|
|
|
// Prune stale local-online entries (no local active emails or inbound tags
|
|
// to add here — only the local xray poll feeds those) so a stopped local
|
|
// xray's clients and inbounds still age out between traffic polls.
|
|
j.inboundService.RefreshLocalOnlineClients(nil, nil)
|
|
|
|
// Derive per-node-inbound speed every tick (keeps the baseline fresh even
|
|
// with no dashboard open); only broadcast it when someone is watching.
|
|
inboundSpeed := j.nodeInboundSpeed()
|
|
|
|
if !websocket.HasClients() {
|
|
return
|
|
}
|
|
|
|
online := j.inboundService.GetOnlineClients()
|
|
if online == nil {
|
|
online = []string{}
|
|
}
|
|
trafficPayload := map[string]any{
|
|
"onlineClients": online,
|
|
"onlineByGuid": j.inboundService.GetOnlineClientsByGuid(),
|
|
"activeInbounds": j.inboundService.GetActiveInboundsByGuid(),
|
|
"lastOnlineMap": lastOnline,
|
|
}
|
|
// Always send the key so the dashboard clears node inbounds that went idle
|
|
// this tick. A nil result (query error) marshals to null and is skipped
|
|
// client-side, leaving the last shown value untouched; an empty (non-nil)
|
|
// slice marshals to [] and clears stale speeds.
|
|
trafficPayload["nodeTraffics"] = inboundSpeed
|
|
websocket.BroadcastTraffic(trafficPayload)
|
|
|
|
clientStats := map[string]any{}
|
|
if stats, err := j.inboundService.GetAllClientTraffics(); err != nil {
|
|
logger.Warning("node traffic sync: get all client traffics for websocket failed:", err)
|
|
} else if len(stats) > 0 {
|
|
clientStats["clients"] = stats
|
|
}
|
|
if summary, err := j.inboundService.GetInboundsTrafficSummary(); err != nil {
|
|
logger.Warning("node traffic sync: get inbounds summary for websocket failed:", err)
|
|
} else if len(summary) > 0 {
|
|
clientStats["inbounds"] = summary
|
|
}
|
|
if len(clientStats) > 0 {
|
|
websocket.BroadcastClientStats(clientStats)
|
|
}
|
|
|
|
if j.structural.takeAndReset() {
|
|
websocket.BroadcastInvalidate(websocket.MessageTypeInbounds)
|
|
websocket.BroadcastInvalidate(websocket.MessageTypeClients)
|
|
}
|
|
}
|
|
|
|
// nodeInboundSpeed derives a per-node-inbound speed delta by diffing the current
|
|
// cumulative up/down against the previous poll's, keyed by the central tag the
|
|
// dashboard matches. The node's counter keeps climbing while the master can't
|
|
// reach it, so the first delta after a gap (node outage, skipped poll, slow
|
|
// node) spans more than one poll window; it is normalized to the fixed
|
|
// nodeInboundSpeedWindowMs using the real elapsed time so the dashboard's fixed
|
|
// divisor yields the true average rate over the gap instead of an impossible
|
|
// one-tick spike. The change timestamp only advances when the value actually
|
|
// moves, so an idle stretch is averaged correctly when traffic resumes. A reset
|
|
// rebaselines to the lower value; a first-seen tag yields no delta until the
|
|
// next poll.
|
|
func (j *NodeTrafficSyncJob) nodeInboundSpeed() []*xray.Traffic {
|
|
totals, err := j.inboundService.GetNodeInboundTrafficTotals()
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
now := time.Now().UnixMilli()
|
|
deltas := make([]*xray.Traffic, 0, len(totals))
|
|
next := make(map[string]inboundSample, len(totals))
|
|
for tag, cur := range totals {
|
|
prev, ok := j.prevInboundTotals[tag]
|
|
if !ok {
|
|
next[tag] = inboundSample{up: cur[0], down: cur[1], at: now}
|
|
continue
|
|
}
|
|
dUp := cur[0] - prev.up
|
|
dDown := cur[1] - prev.down
|
|
if dUp <= 0 && dDown <= 0 {
|
|
// No movement, or a counter reset: hold the change timestamp so a
|
|
// later jump is averaged over the real elapsed window, not shown as a
|
|
// spike. Adopt the lower value on a reset.
|
|
if cur[0] < prev.up || cur[1] < prev.down {
|
|
next[tag] = inboundSample{up: cur[0], down: cur[1], at: now}
|
|
} else {
|
|
next[tag] = prev
|
|
}
|
|
continue
|
|
}
|
|
if dUp < 0 {
|
|
dUp = 0
|
|
}
|
|
if dDown < 0 {
|
|
dDown = 0
|
|
}
|
|
elapsed := now - prev.at
|
|
if elapsed < nodeInboundSpeedWindowMs {
|
|
elapsed = nodeInboundSpeedWindowMs
|
|
}
|
|
up := dUp * nodeInboundSpeedWindowMs / elapsed
|
|
down := dDown * nodeInboundSpeedWindowMs / elapsed
|
|
if up > 0 || down > 0 {
|
|
deltas = append(deltas, &xray.Traffic{Tag: tag, IsInbound: true, Up: up, Down: down})
|
|
}
|
|
next[tag] = inboundSample{up: cur[0], down: cur[1], at: now}
|
|
}
|
|
j.prevInboundTotals = next
|
|
return deltas
|
|
}
|
|
|
|
// maybePushGlobals broadcasts this panel's aggregated per-client usage to its
|
|
// online nodes so each node can display the client's cross-panel total and
|
|
// enforce its quota locally (see InboundService.AcceptGlobalTraffic). Scoped
|
|
// per node to the clients that node actually hosts, and throttled — the
|
|
// aggregates only need to reach nodes on a human timescale, not every poll.
|
|
func (j *NodeTrafficSyncJob) maybePushGlobals(mgr *runtime.Manager, nodes []*model.Node) {
|
|
j.globalPushMu.Lock()
|
|
now := time.Now().Unix()
|
|
if now-j.lastGlobalPush < int64(nodeGlobalPushInterval/time.Second) {
|
|
j.globalPushMu.Unlock()
|
|
return
|
|
}
|
|
j.lastGlobalPush = now
|
|
j.globalPushMu.Unlock()
|
|
|
|
masterGuid, err := j.settingService.GetPanelGuid()
|
|
if err != nil || masterGuid == "" {
|
|
return
|
|
}
|
|
|
|
sem := make(chan struct{}, nodeTrafficSyncConcurrency)
|
|
var wg sync.WaitGroup
|
|
for _, n := range nodes {
|
|
if !n.Enable || n.Status != "online" {
|
|
continue
|
|
}
|
|
remote, err := mgr.RemoteFor(n)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
traffics, err := j.inboundService.GetNodeClientTraffics(n.Id)
|
|
if err != nil {
|
|
logger.Warningf("node traffic sync: load globals for %s failed: %v", n.Name, err)
|
|
continue
|
|
}
|
|
if len(traffics) == 0 {
|
|
continue
|
|
}
|
|
wg.Add(1)
|
|
sem <- struct{}{}
|
|
n, remote, traffics := n, remote, traffics
|
|
common.GoRecover("node-global-push:"+n.Name, func() {
|
|
defer wg.Done()
|
|
defer func() { <-sem }()
|
|
ctx, cancel := context.WithTimeout(context.Background(), nodeTrafficSyncRequestTimeout)
|
|
defer cancel()
|
|
if err := remote.PushGlobalClientTraffics(ctx, masterGuid, traffics); err != nil {
|
|
// An old-build node without the endpoint answers 404 — not worth a
|
|
// warning every cycle.
|
|
if strings.Contains(err.Error(), "HTTP 404") {
|
|
logger.Debugf("node traffic sync: node %s has no global-traffic endpoint (old build)", n.Name)
|
|
} else {
|
|
logger.Warningf("node traffic sync: push globals to %s failed: %v", n.Name, err)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
wg.Wait()
|
|
}
|
|
|
|
func (j *NodeTrafficSyncJob) syncOne(mgr *runtime.Manager, n *model.Node, doIpSync bool) {
|
|
rt, err := mgr.RemoteFor(n)
|
|
if err != nil {
|
|
logger.Warningf("node traffic sync: remote lookup failed for %s: %v", n.Name, err)
|
|
return
|
|
}
|
|
|
|
if n.ConfigDirty {
|
|
reconcileCtx, reconcileCancel := context.WithTimeout(context.Background(), nodeReconcileTimeout)
|
|
reconcileErr := j.inboundService.ReconcileNode(reconcileCtx, rt, n)
|
|
reconcileCancel()
|
|
if reconcileErr != nil {
|
|
logger.Warningf("node traffic sync: reconcile for %s failed: %v", n.Name, reconcileErr)
|
|
return
|
|
}
|
|
if clearErr := j.nodeService.ClearNodeDirty(n.Id, n.ConfigDirtyAt); clearErr != nil {
|
|
logger.Warningf("node traffic sync: clear dirty for %s failed: %v", n.Name, clearErr)
|
|
}
|
|
j.structural.set()
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), nodeTrafficSyncRequestTimeout)
|
|
defer cancel()
|
|
|
|
snap, err := rt.FetchTrafficSnapshot(ctx)
|
|
if err != nil {
|
|
logger.Warningf("node traffic sync: fetch from %s failed: %v", n.Name, err)
|
|
j.inboundService.ClearNodeOnlineClients(n.Id)
|
|
return
|
|
}
|
|
service.FilterNodeSnapshot(n, snap)
|
|
_, _, dirty, _, _ := j.nodeService.NodeSyncState(n.Id)
|
|
changed, err := j.inboundService.SetRemoteTraffic(n.Id, snap, dirty)
|
|
if err != nil {
|
|
logger.Warningf("node traffic sync: merge for %s failed: %v", n.Name, err)
|
|
return
|
|
}
|
|
if changed {
|
|
j.structural.set()
|
|
}
|
|
|
|
if !doIpSync {
|
|
return
|
|
}
|
|
|
|
ipCtx, ipCancel := context.WithTimeout(context.Background(), nodeClientIpSyncTimeout)
|
|
defer ipCancel()
|
|
|
|
nodeIps, err := rt.FetchAllClientIps(ipCtx)
|
|
if err == nil && len(nodeIps) > 0 {
|
|
if err := j.inboundService.MergeInboundClientIps(nodeIps); err != nil {
|
|
logger.Warningf("node traffic sync: merge client ips from %s failed: %v", n.Name, err)
|
|
}
|
|
} else if err != nil {
|
|
logger.Warningf("node traffic sync: fetch client ips from %s failed: %v", n.Name, err)
|
|
}
|
|
|
|
masterIps, err := j.inboundService.GetAllInboundClientIps()
|
|
if err != nil {
|
|
logger.Warningf("node traffic sync: load client ips for push to %s failed: %v", n.Name, err)
|
|
return
|
|
}
|
|
if len(masterIps) > 0 {
|
|
if err := rt.PushAllClientIps(ipCtx, masterIps); err != nil {
|
|
logger.Warningf("node traffic sync: push client ips to %s failed: %v", n.Name, err)
|
|
}
|
|
}
|
|
|
|
// Per-node IP attribution: pull the node's guid-keyed subtree (its own
|
|
// observations plus any descendants) so the master can tell which node each
|
|
// IP is on. Old nodes without the endpoint return HTTP 404 every cycle — note
|
|
// it once per node (re-armed on recovery) instead of flooding the log.
|
|
if guidTrees, err := rt.FetchClientIpsByGuid(ipCtx); err != nil {
|
|
if strings.Contains(err.Error(), "HTTP 404") {
|
|
if _, seen := j.noGuidIpEndpoint.LoadOrStore(n.Id, true); !seen {
|
|
logger.Debugf("node traffic sync: node %s has no client-IP attribution endpoint (old build)", n.Name)
|
|
}
|
|
} else {
|
|
logger.Debugf("node traffic sync: fetch client ip attribution from %s failed: %v", n.Name, err)
|
|
}
|
|
} else {
|
|
j.noGuidIpEndpoint.Delete(n.Id)
|
|
if len(guidTrees) > 0 {
|
|
if err := j.inboundService.MergeClientIpsByGuid(n, guidTrees); err != nil {
|
|
logger.Warningf("node traffic sync: merge client ip attribution from %s failed: %v", n.Name, err)
|
|
}
|
|
}
|
|
}
|
|
}
|