jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-10-03 14:57:46 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

fix(agent): resolve device symlinks so LVM volumes map to disk I/O (#2486)

Browse Source
This commit is contained in:
Santhi Prakash
2026-10-02 04:14:29 +05:30
committed by GitHub
parent 4ffd83677d
commit c394a6b5b1
2 changed files with 192 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
agent/disk.go
View File

@@ -97,21 +97,41 @@ func isDockerSpecialMountpoint(mountpoint string) bool {
return false
}
// evalSymlinks resolves device symlinks; it is a seam so tests can fake the
// /dev topology (e.g. /dev/vg/lv -> /dev/dm-N created by udev for LVM).
var evalSymlinks = filepath.EvalSymlinks
// registerFilesystemStats resolves the tracked key and stats payload for a
// filesystem before it is inserted into fsStats.
func registerFilesystemStats(existing map[string]*system.FsStats, device, mountpoint string, root bool, customName string, ctx fsRegistrationContext) (string, *system.FsStats, bool) {
key := device
resolvedKey := ""
if !ctx.isWindows {
key = filepath.Base(device)
// Device-mapper mounts appear as symlinked paths like /dev/vg/lv whose
// base name matches neither the diskstats name (dm-N) nor the dm label
// (vg-lv); the resolved target's base is one of those existing names.
// Bare names (folder devices, ZFS datasets) are skipped because they
// would resolve relative to the agent's working directory.
if filepath.IsAbs(device) {
if resolved, err := evalSymlinks(device); err == nil {
if base := filepath.Base(resolved); base != key {
resolvedKey = base
}
}
}
}
if root {
// Try to map root device to a diskIoCounters entry. First checks for an
// exact key match, then uses findIoDevice for normalized / prefix-based
// matching (e.g. nda0p2 -> nda0), and finally falls back to FILESYSTEM.
// matching (e.g. nda0p2 -> nda0) and the symlink-resolved device name,
// and finally falls back to FILESYSTEM.
if _, ioMatch := ctx.diskIoCounters[key]; !ioMatch {
if matchedKey, match := findIoDevice(key, ctx.diskIoCounters); match {
key = matchedKey
} else if matchedKey, match := findIoDevice(resolvedKey, ctx.diskIoCounters); match {
key = matchedKey
} else if ctx.filesystem != "" {
if matchedKey, match := findIoDevice(ctx.filesystem, ctx.diskIoCounters); match {
key = matchedKey
@@ -137,6 +157,8 @@ func registerFilesystemStats(existing map[string]*system.FsStats, device, mountp
if _, ioMatch = ctx.diskIoCounters[key]; !ioMatch {
if matchedKey, match := findIoDevice(key, ctx.diskIoCounters); match {
key = matchedKey
} else if matchedKey, match := findIoDevice(resolvedKey, ctx.diskIoCounters); match {
key = matchedKey
}
}
}