Disk was the one resource nothing reported. `statfs` was already being called on every model directory, but only to ask whether the filesystem was a network one — the free space it returns in the same struct was thrown away. So the only way to find out why a node was filling up was to ssh to it, which is what this system exists to avoid. Reported per filesystem rather than per configured directory. Free space belongs to the disk, not the path: two model directories on one disk are one pool of bytes, and counting them separately would let the control plane add 24 GB to 24 GB and place a 40 GB model on a node that has 24. Shared filesystems are summed separately from local ones and left out of a node's own total. Space on a filer belongs to everyone mounting it, so twenty nodes would otherwise each report the same free terabyte, and a scheduler would place twenty models into room for one. Nothing reported means nothing is known, everywhere: an agent too old to send storage and a node with no model directories both send nothing, and both must read as unknown rather than as a full disk. `ctl nodes` and the dashboard show a dash, the metric is absent rather than zero, and a missing directory — which is what an unmounted filer looks like — is skipped rather than reported as having no space. Shown as free out of total, because the first is useless without the second: 8 GB free is comfortable on a 10 TB filer and nearly full on a 10 GB root partition, and only the second stops a model being placed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
b5177b70f6
commit
753f4e3265
13 files changed
+515
-83
No files matched your search
@@ -84,6 +84,12 @@ type Node struct {
|
||||
// Empty means the node was not asked to look, which is not the same as
|
||||
// holding none — so it constrains nothing.
|
||||
Weights []discovery.LocalWeights `json:"weights,omitempty"`
|
||||
// Storage is the disk those weights sit on, one entry per filesystem.
|
||||
//
|
||||
// Empty means the node was not asked, not that it has no disk — so an
|
||||
// agent too old to report it, or one with no model directories, is left
|
||||
// unconstrained rather than treated as full.
|
||||
Storage []discovery.Storage `json:"storage,omitempty"`
|
||||
|
||||
GPUs []discovery.GPU `json:"gpus"`
|
||||
// Fabrics is empty on a node without IB. Such a node is its own
|
||||
@@ -310,6 +316,28 @@ func (s *Store) FreeGPUs(nodeID string) []int {
|
||||
return out
|
||||
}
|
||||
|
||||
// LocalDisk sums the space on filesystems this node fills itself.
|
||||
//
|
||||
// Shared filesystems are left out on purpose. Space on a filer belongs to
|
||||
// everyone mounting it, and counting it per node would let twenty nodes each
|
||||
// believe they have the same free terabyte — then place twenty models into it.
|
||||
// A node whose weights are all on a shared mount therefore reports no local
|
||||
// disk, which is correct: it has none to spend.
|
||||
//
|
||||
// Both zero means nothing is known — an agent too old to report storage, or a
|
||||
// node with no model directories — and callers must read that as unknown
|
||||
// rather than as a full disk.
|
||||
func (n Node) LocalDisk() (free, total int64) {
|
||||
for _, s := range n.Storage {
|
||||
if s.Shared {
|
||||
continue
|
||||
}
|
||||
free += s.FreeBytes
|
||||
total += s.TotalBytes
|
||||
}
|
||||
return free, total
|
||||
}
|
||||
|
||||
// HasWeights reports whether this node can see the given source.
|
||||
//
|
||||
// An exact path match, deliberately. A source that is not a path — a model id
|
||||
|
||||
@@ -248,3 +248,42 @@ func TestConcurrentAccess(t *testing.T) {
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
func TestSharedFilesystemsAreNotThisNodesSpaceToSpend(t *testing.T) {
|
||||
// Twenty nodes mounting one filer have 500 GB between them, not ten
|
||||
// terabytes. Counting a shared mount per node is how a scheduler places
|
||||
// twenty models into space for one.
|
||||
n := Node{Storage: []discovery.Storage{
|
||||
{Path: "/mnt/filer", FreeBytes: 500 << 30, TotalBytes: 900 << 30, Shared: true},
|
||||
{Path: "/var/lib/llmgw-models", FreeBytes: 20 << 30, TotalBytes: 60 << 30},
|
||||
}}
|
||||
free, total := n.LocalDisk()
|
||||
if free != 20<<30 || total != 60<<30 {
|
||||
t.Errorf("shared space was counted as local: free=%d total=%d", free, total)
|
||||
}
|
||||
}
|
||||
|
||||
func TestANodeThatReportedNoStorageIsUnknownNotFull(t *testing.T) {
|
||||
// An agent too old to report storage, and a node with no model directories,
|
||||
// both send nothing. Reading that as a full disk would take every such node
|
||||
// out of placement for a reason that is not true.
|
||||
free, total := Node{}.LocalDisk()
|
||||
if free != 0 || total != 0 {
|
||||
t.Errorf("a node with no storage reported %d/%d", free, total)
|
||||
}
|
||||
// The contract callers rely on: total of zero is the signal for "unknown",
|
||||
// which is why nothing may read free alone.
|
||||
if total != 0 {
|
||||
t.Error("callers cannot distinguish unknown from full")
|
||||
}
|
||||
}
|
||||
|
||||
func TestLocalDiskSumsSeveralDisks(t *testing.T) {
|
||||
n := Node{Storage: []discovery.Storage{
|
||||
{Path: "/a", FreeBytes: 10, TotalBytes: 100},
|
||||
{Path: "/b", FreeBytes: 5, TotalBytes: 50},
|
||||
}}
|
||||
if free, total := n.LocalDisk(); free != 15 || total != 150 {
|
||||
t.Errorf("free=%d total=%d, want 15/150", free, total)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user