mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-08-21 22:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Phase 20 T4 — fail-closed on missing projection + NVMe gate

Browse Source 
Fix two tester findings:

1. Missing engine projection now fails closed: if v2Core is active but
   CoreProjection(path) is missing, gate locally with reason
   "missing_engine_projection". Mirrors T2's fail-closed posture.
   Only skips enforcement when V2 core is entirely absent.

2. NVMe/TCP now gated alongside iSCSI: gateServing() calls both
   targetServer.DisconnectVolume() and nvmeServer.RemoveVolume().
   ungateServing() re-registers with both iSCSI and NVMe. A gated
   volume is unreachable through all frontend paths.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
pingqiu
2026-04-05 18:29:58 -07:00
co-authored by Claude Opus 4.6
parent 46f72572c5
commit 9cead1b502
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weed/server/volume_server_block.go
+31 -10
View File
@@ -588,7 +588,20 @@ func (bs *BlockService) applyCoreAssignmentEvent(a blockvol.BlockVolumeAssignmen
func (bs *BlockService) evaluateActivationGate(path string) {
proj, ok := bs.CoreProjection(path)
if !ok {
return // no V2 core, no gate enforcement
// Fail-closed: if V2 core is active but projection is missing for
// this path, gate locally. Mirrors T2's missing_engine_projection
// posture. Only skip enforcement if V2 core is entirely absent.
if bs.v2Core == nil {
return
}
bs.activationGateMu.Lock()
_, wasGated := bs.activationGated[path]
bs.activationGated[path] = "missing_engine_projection"
bs.activationGateMu.Unlock()
if !wasGated {
bs.gateServing(path, "missing_engine_projection")
}
return
}
bs.activationGateMu.Lock()
_, wasGated := bs.activationGated[path]
@@ -618,29 +631,37 @@ func (bs *BlockService) evaluateActivationGate(path string) {
// sessions and preventing new connections. This is the actual serving
// enforcement for T4 — not just bookkeeping.
func (bs *BlockService) gateServing(path, reason string) {
glog.V(0).Infof("activation gated: %s — %s (disconnecting from iSCSI)", path, reason)
name := volumeNameFromPath(path)
glog.V(0).Infof("activation gated: %s — %s (disconnecting frontends)", path, reason)
if bs.targetServer != nil {
name := volumeNameFromPath(path)
iqn := bs.iqnPrefix + blockvol.SanitizeIQN(name)
bs.targetServer.DisconnectVolume(iqn)
}
if bs.nvmeServer != nil {
nqn := blockvol.BuildNQN(bs.nqnPrefix, name)
bs.nvmeServer.RemoveVolume(nqn)
}
}
// ungateServing re-registers a volume with the iSCSI target after the gate
// clears (projection reaches a serving-allowed state).
func (bs *BlockService) ungateServing(path string) {
glog.V(0).Infof("activation gate cleared: %s (re-registering with iSCSI)", path)
if bs.targetServer == nil {
return
}
glog.V(0).Infof("activation gate cleared: %s (re-registering frontends)", path)
vol, ok := bs.blockStore.GetBlockVolume(path)
if !ok || vol == nil {
return
}
name := volumeNameFromPath(path)
iqn := bs.iqnPrefix + blockvol.SanitizeIQN(name)
adapter := blockvol.NewBlockVolAdapter(vol)
bs.targetServer.AddVolume(iqn, adapter)
if bs.targetServer != nil {
iqn := bs.iqnPrefix + blockvol.SanitizeIQN(name)
adapter := blockvol.NewBlockVolAdapter(vol)
bs.targetServer.AddVolume(iqn, adapter)
}
if bs.nvmeServer != nil {
nqn := blockvol.BuildNQN(bs.nqnPrefix, name)
nvmeAdapter := nvme.NewNVMeAdapter(vol)
bs.nvmeServer.AddVolume(nqn, nvmeAdapter, nvmeAdapter.DeviceNGUID())
}
}
// volumeNameFromPath extracts the volume name from a .blk file path.