jianf/webui4frpc
1
0
Fork 0
mirror of https://gitcode.com/JianFeeeee/webui4frpc.git synced 2026-10-02 23:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cluster): restart 任务必须只由 owner 执行

Browse Source 
上线实测抓到的：从 .60（非 owner）启动 owner 在 .30 的 portal，日志出现
**两条** `.60 restarted t4` —— 关键帧是 `[192.168.2.60:7500] restarted t4`。
pending 任务对所有成员可见，而 restart 分支没有 owner 判定，于是谁先轮到
谁就执行：非 owner 给自己的机器起了一个属于别人的转发 worker，而真正的
owner（.30）什么也没做，worker 一直没起来。

这正是上面 duplicate-claim 防御本来要防的「孤儿 worker + 重复认领」，只是
restart 分支为了绕开那层防御，把 owner 校验也一并跳过了 —— 绕开的是
「重复建条目」的必要性，不是「只有 owner 能动手」的必要性。

修法与 RemoveNode 分支一致：`owner != e.ID` 时只清标志、不执行 handler。
owner 已消失的情况不是错误：条目已被重新标为启用，OfflineReassign() 会在
下一次离线清理时把它转入 pending，再由正常认领流程重新安置。

测试 TestRestartOnlyAppliedByOwner：同一份 restart 任务分别交给 owner 与非
owner，断言非 owner 调用 0 次、owner 恰好 1 次。双向验证 —— 去掉守卫后
如期变红（"a NON-owner applied the restart 1 time(s)"），还原后变绿。

go build / go vet / go test ./... 全绿，gofmt 干净。
This commit is contained in:
JianFeeeee
2026-09-26 10:48:28 +08:00
parent 1c835425de
commit 5cdc052d01
2 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/cluster/ring_engine.go
View File

@ -505,10 +505,22 @@ func (e *Engine) runCommands(ctx context.Context, tk *Token) error {
}
}
if claimed.Restart {
// Re-enable in place and hand the worker back to this node (the
// entry's owner). This must NOT create a second topology entry, which
// is why it skips the claim bookkeeping below.
// Only the OWNER may act. Pending tasks are visible to every member, so
// without this guard whichever node happened to process the task would
// spawn a worker for a forward attributed to somebody else — an
// orphaned worker plus a duplicate claim, exactly what the duplicate
// guard above exists to prevent. (Observed live: a non-owner logged
// "restarted t4" and ran the forward itself.)
//
// A restart whose owner has vanished is not an error: the entry is
// re-enabled, OfflineReassign() will move it to pending on the next
// departure sweep, and the normal claim path then re-homes it.
owner := e.state.TopologyOwner(claimed)
e.state.UpdateTopologyDisabled(claimed.Local.Name, claimed.Remote.Name, claimed.Link.RemotePort, false)
if owner != e.ID {
log.Printf("ring[%s] skip restart %s: owned by %s", e.ID, claimed.ID, owner)
continue
}
if e.Handler != nil {
if err := e.Handler.Restart(ctx, claimed); err != nil {
e.state.PendingTasks[claimed.ID] = claimed