jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-09-30 21:37:47 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

fix(agent): promote existing entry when root key is already registered

Browse Source 
When the root drive is also listed in EXTRA_FILESYSTEMS, its key is
taken before addPartitionRootFs runs. Returning false there sent the
agent to addLastResortRootFs, which picks the most active device and
could register a different drive as root, overwriting that drive's
extra entry. addPartitionRootFs has already resolved the root device,
so promote the existing entry to root instead.
This commit is contained in:
henrygd
2026-09-25 13:24:11 -04:00
parent 3fb97b800c
commit 3dfe062ee4
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
agent/disk.go
View File

@@ -155,7 +155,7 @@ func registerFilesystemStats(existing map[string]*system.FsStats, device, mountp
// addFsStat inserts a discovered filesystem if it resolves to a new tracking // addFsStat inserts a discovered filesystem if it resolves to a new tracking
// key and reports whether it was added. The key selection itself lives in // key and reports whether it was added. The key selection itself lives in
// buildFsStatRegistration so that logic can stay directly unit-tested. // registerFilesystemStats so that logic can stay directly unit-tested.
func (d *diskDiscovery) addFsStat(device, mountpoint string, root bool, customName string) bool { func (d *diskDiscovery) addFsStat(device, mountpoint string, root bool, customName string) bool {
key, fsStats, ok := registerFilesystemStats(d.agent.fsStats, device, mountpoint, root, customName, d.ctx) key, fsStats, ok := registerFilesystemStats(d.agent.fsStats, device, mountpoint, root, customName, d.ctx)
if !ok { if !ok {
@@ -212,10 +212,16 @@ func (d *diskDiscovery) addPartitionRootFs(device, mountpoint string) bool {
if !match { if !match {
return false return false
} }
// The resolved I/O device is already known here, so use it directly to avoid // The root device is already resolved, so if it was registered earlier as an
// a second fallback search inside buildFsStatRegistration. Report failure if // extra filesystem (e.g. root drive listed in EXTRA_FILESYSTEMS), promote that
// the key was already taken (e.g. root drive listed in EXTRA_FILESYSTEMS) so // entry rather than letting addLastResortRootFs guess a different device.
// the caller can still fall back to addLastResortRootFs. if stats, exists := d.agent.fsStats[fs]; exists {
stats.Root = true
stats.Mountpoint = mountpoint
return true
}
// Use the resolved I/O device directly to avoid a second fallback search
// inside registerFilesystemStats.
return d.addFsStat(fs, mountpoint, true, "") return d.addFsStat(fs, mountpoint, true, "")
} }

20
agent/disk_test.go
View File

@@ -1128,11 +1128,11 @@ func TestAddPartitionRootFsWindowsDrive(t *testing.T) {
func TestAddPartitionRootFsKeyAlreadyRegistered(t *testing.T) { func TestAddPartitionRootFsKeyAlreadyRegistered(t *testing.T) {
// The root drive is also listed in EXTRA_FILESYSTEMS, so its key is taken // The root drive is also listed in EXTRA_FILESYSTEMS, so its key is taken
// before the root fallback runs. addPartitionRootFs must report failure so // before the root fallback runs. The existing entry must be promoted to root
// the caller still falls back to addLastResortRootFs instead of ending up // rather than falling back to the most active device, which here is D:.
// with no root filesystem.
agent := &Agent{fsStats: map[string]*system.FsStats{ agent := &Agent{fsStats: map[string]*system.FsStats{
"C:": {Mountpoint: `C:\`}, "C:": {Mountpoint: `C:\`, Name: "System"},
"D:": {Mountpoint: `D:\`},
}} }}
discovery := diskDiscovery{ discovery := diskDiscovery{
agent: agent, agent: agent,
@@ -1141,16 +1141,16 @@ func TestAddPartitionRootFsKeyAlreadyRegistered(t *testing.T) {
isWindows: true, isWindows: true,
diskIoCounters: map[string]disk.IOCountersStat{ diskIoCounters: map[string]disk.IOCountersStat{
"C:": {Name: "C:", ReadBytes: 10}, "C:": {Name: "C:", ReadBytes: 10},
"D:": {Name: "D:"}, "D:": {Name: "D:", ReadBytes: 100},
}, },
}, },
} }
ok := discovery.addPartitionRootFs("C:", `C:\`) ok := discovery.addPartitionRootFs("C:", `C:\`)
assert.False(t, ok) assert.True(t, ok)
assert.False(t, agent.fsStats["C:"].Root) assert.Len(t, agent.fsStats, 2)
discovery.addLastResortRootFs()
assert.Len(t, agent.fsStats, 1)
assert.True(t, agent.fsStats["C:"].Root) assert.True(t, agent.fsStats["C:"].Root)
assert.Equal(t, `C:\`, agent.fsStats["C:"].Mountpoint)
assert.Equal(t, "System", agent.fsStats["C:"].Name)
assert.False(t, agent.fsStats["D:"].Root)
} }