clean up of the codebase
This commit is contained in:
1 parent
7822529a38
commit
0ac61b4ece
52 files changed
+2545
-2274
No files matched your search
@@ -0,0 +1,136 @@
|
||||
package balance
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"math"
|
||||
"sort"
|
||||
|
||||
"slackerbot/internal/model"
|
||||
"slackerbot/internal/node"
|
||||
"slackerbot/internal/storage"
|
||||
)
|
||||
|
||||
var ErrMaxedOut = errors.New("no node has room for this container")
|
||||
|
||||
type NodeView struct {
|
||||
Name string
|
||||
Usable model.Size
|
||||
Used model.Size
|
||||
Drives []storage.DriveReport
|
||||
Running int
|
||||
}
|
||||
|
||||
func (v NodeView) Storage() (usableMB, committedMB, bookedMB int64) {
|
||||
for _, d := range v.Drives {
|
||||
usableMB += d.UsableMB
|
||||
committedMB += d.CommittedMB
|
||||
bookedMB += d.BookedMB
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func ratio(used, total float64) float64 {
|
||||
if total <= 0 {
|
||||
return math.Inf(1)
|
||||
}
|
||||
return used / total
|
||||
}
|
||||
|
||||
func (v NodeView) Homes() int {
|
||||
n := 0
|
||||
for _, d := range v.Drives {
|
||||
n += d.Homes
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func (v NodeView) Load() (cpu, ram, storage float64) {
|
||||
us, cm, _ := v.Storage()
|
||||
return ratio(v.Used.CPUs, v.Usable.CPUs),
|
||||
ratio(float64(v.Used.MemoryMB), float64(v.Usable.MemoryMB)),
|
||||
ratio(float64(cm), float64(us))
|
||||
}
|
||||
|
||||
// The fullest of CPU, RAM and storage after adding the container. Placing
|
||||
// where this stays lowest keeps all three level across nodes.
|
||||
func (v NodeView) loadAfter(want model.Size, storageMB int64) float64 {
|
||||
us, cm, _ := v.Storage()
|
||||
return max(
|
||||
ratio(v.Used.CPUs+want.CPUs, v.Usable.CPUs),
|
||||
ratio(float64(v.Used.MemoryMB+want.MemoryMB), float64(v.Usable.MemoryMB)),
|
||||
ratio(float64(cm+storageMB), float64(us)),
|
||||
)
|
||||
}
|
||||
|
||||
func ChoosePlacement(views []NodeView, want model.Size, storageMB int64) (node, drive string, err error) {
|
||||
sorted := append([]NodeView(nil), views...)
|
||||
sort.Slice(sorted, func(i, j int) bool { return sorted[i].Name < sorted[j].Name })
|
||||
|
||||
best := math.Inf(1)
|
||||
roomForCompute := false
|
||||
for _, v := range sorted {
|
||||
if !v.Used.Add(want).Fits(v.Usable) {
|
||||
continue
|
||||
}
|
||||
roomForCompute = true
|
||||
d, err := storage.PickDrive(v.Drives, storageMB)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
if score := v.loadAfter(want, storageMB); score < best {
|
||||
best, node, drive = score, v.Name, d
|
||||
}
|
||||
}
|
||||
switch {
|
||||
case node != "":
|
||||
return node, drive, nil
|
||||
case roomForCompute:
|
||||
return "", "", storage.ErrStorageFull
|
||||
}
|
||||
return "", "", ErrMaxedOut
|
||||
}
|
||||
|
||||
func BuildView(info node.NodeInfo, owners []model.Owner, defaultSize model.Size) NodeView {
|
||||
v := NodeView{Name: info.Name, Usable: info.Usable}
|
||||
|
||||
byMachine := map[string]*model.Owner{}
|
||||
for i := range owners {
|
||||
if owners[i].Node == info.Name {
|
||||
byMachine[owners[i].Machine] = &owners[i]
|
||||
}
|
||||
}
|
||||
v.Running = len(info.Running)
|
||||
for _, r := range info.Running {
|
||||
if u := byMachine[r.Name]; u != nil {
|
||||
v.Used = v.Used.Add(u.Size)
|
||||
} else {
|
||||
v.Used = v.Used.Add(defaultSize)
|
||||
}
|
||||
}
|
||||
|
||||
for _, d := range info.Drives {
|
||||
r := storage.DriveReport{Path: d.Path}
|
||||
var homesUsed int64
|
||||
for machine, used := range d.HomesMB {
|
||||
homesUsed += used
|
||||
if u := byMachine[machine]; u != nil && u.Drive == d.Path {
|
||||
continue
|
||||
}
|
||||
r.CommittedMB += used
|
||||
r.BookedMB += used
|
||||
r.Homes++
|
||||
}
|
||||
for _, u := range byMachine {
|
||||
if u.Drive != d.Path {
|
||||
continue
|
||||
}
|
||||
used := d.HomesMB[u.Machine]
|
||||
r.CommittedMB += storage.Committed(u.StorageMinMB, used)
|
||||
r.BookedMB += u.StorageMaxMB
|
||||
r.Homes++
|
||||
}
|
||||
r.UsableMB = d.FreeMB + homesUsed - d.ReserveMB
|
||||
v.Drives = append(v.Drives, r)
|
||||
}
|
||||
return v
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package balance
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"slackerbot/internal/model"
|
||||
"slackerbot/internal/node"
|
||||
"slackerbot/internal/storage"
|
||||
)
|
||||
|
||||
func TestPlacementBalancesAllThree(t *testing.T) {
|
||||
drive := func(usable, committed int64) []storage.DriveReport {
|
||||
return []storage.DriveReport{{Path: "/d", UsableMB: usable, CommittedMB: committed}}
|
||||
}
|
||||
want := model.Size{MemoryMB: 2048, CPUs: 1}
|
||||
views := []NodeView{
|
||||
{Name: "cpu-busy", Usable: model.Size{MemoryMB: 16384, CPUs: 8}, Used: model.Size{MemoryMB: 2048, CPUs: 6}, Drives: drive(100_000, 10_000)},
|
||||
{Name: "ram-busy", Usable: model.Size{MemoryMB: 16384, CPUs: 8}, Used: model.Size{MemoryMB: 12288, CPUs: 1}, Drives: drive(100_000, 10_000)},
|
||||
{Name: "disk-busy", Usable: model.Size{MemoryMB: 16384, CPUs: 8}, Used: model.Size{MemoryMB: 2048, CPUs: 1}, Drives: drive(100_000, 80_000)},
|
||||
{Name: "calm", Usable: model.Size{MemoryMB: 16384, CPUs: 8}, Used: model.Size{MemoryMB: 4096, CPUs: 2}, Drives: drive(100_000, 20_000)},
|
||||
}
|
||||
node, d, err := ChoosePlacement(views, want, 5120)
|
||||
if err != nil || node != "calm" || d != "/d" {
|
||||
t.Fatalf("got %s %s %v, want calm", node, d, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPlacementSpreadsAcrossEqualNodes(t *testing.T) {
|
||||
views := []NodeView{
|
||||
{Name: "a", Usable: model.Size{MemoryMB: 8192, CPUs: 4}, Drives: []storage.DriveReport{{Path: "/a", UsableMB: 50_000}}},
|
||||
{Name: "b", Usable: model.Size{MemoryMB: 8192, CPUs: 4}, Drives: []storage.DriveReport{{Path: "/b", UsableMB: 50_000}}},
|
||||
}
|
||||
want := model.Size{MemoryMB: 2048, CPUs: 1}
|
||||
counts := map[string]int{}
|
||||
for i := 0; i < 4; i++ {
|
||||
node, _, err := ChoosePlacement(views, want, 5120)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
counts[node]++
|
||||
for j := range views {
|
||||
if views[j].Name == node {
|
||||
views[j].Used = views[j].Used.Add(want)
|
||||
views[j].Drives[0].CommittedMB += 5120
|
||||
}
|
||||
}
|
||||
}
|
||||
if counts["a"] != 2 || counts["b"] != 2 {
|
||||
t.Fatalf("uneven spread: %v", counts)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPlacementWhenFull(t *testing.T) {
|
||||
full := []NodeView{{Name: "a", Usable: model.Size{MemoryMB: 4096, CPUs: 2}, Used: model.Size{MemoryMB: 4096, CPUs: 2}, Drives: []storage.DriveReport{{Path: "/a", UsableMB: 50_000}}}}
|
||||
if _, _, err := ChoosePlacement(full, model.Size{MemoryMB: 1024, CPUs: 1}, 1024); !errors.Is(err, ErrMaxedOut) {
|
||||
t.Fatalf("want maxed out, got %v", err)
|
||||
}
|
||||
noDisk := []NodeView{{Name: "a", Usable: model.Size{MemoryMB: 4096, CPUs: 2}, Drives: []storage.DriveReport{{Path: "/a", UsableMB: 1000}}}}
|
||||
if _, _, err := ChoosePlacement(noDisk, model.Size{MemoryMB: 1024, CPUs: 1}, 5120); !errors.Is(err, storage.ErrStorageFull) {
|
||||
t.Fatalf("want storage full, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildView(t *testing.T) {
|
||||
info := node.NodeInfo{
|
||||
Name: "n1",
|
||||
Usable: model.Size{MemoryMB: 16384, CPUs: 8},
|
||||
Running: []node.RunningMachine{{Name: "c-a"}, {Name: "u-stranger"}},
|
||||
Drives: []node.DriveInfo{{Path: "/d", FreeMB: 90_000, ReserveMB: 10_000,
|
||||
HomesMB: map[string]int64{"c-a": 8000, "c-b": 100, "u-stranger": 3000}}},
|
||||
}
|
||||
owners := []model.Owner{
|
||||
{ID: "A", Machine: "c-a", Node: "n1", Drive: "/d", Size: model.Size{MemoryMB: 4096, CPUs: 2}, StorageMinMB: 5120, StorageMaxMB: 10240},
|
||||
{ID: "B", Machine: "c-b", Node: "n1", Drive: "/d", Size: model.Size{MemoryMB: 2048, CPUs: 1}, StorageMinMB: 5120, StorageMaxMB: 10240},
|
||||
{ID: "C", Machine: "c-c", Node: "n1", Drive: "/d", Size: model.Size{MemoryMB: 2048, CPUs: 1}, StorageMinMB: 5120, StorageMaxMB: 10240},
|
||||
{ID: "D", Machine: "c-d", Node: "other", Drive: "/d", Size: model.Size{MemoryMB: 2048, CPUs: 1}, StorageMinMB: 5120, StorageMaxMB: 10240},
|
||||
}
|
||||
v := BuildView(info, owners, model.Size{MemoryMB: 1024, CPUs: 1})
|
||||
if v.Used != (model.Size{MemoryMB: 4096 + 1024, CPUs: 3}) {
|
||||
t.Fatalf("used = %v", v.Used)
|
||||
}
|
||||
d := v.Drives[0]
|
||||
if d.UsableMB != 90_000+11_100-10_000 {
|
||||
t.Fatalf("usable = %d", d.UsableMB)
|
||||
}
|
||||
if d.CommittedMB != 8000+5120+5120+3000 || d.BookedMB != 3*10240+3000 || d.Homes != 4 {
|
||||
t.Fatalf("committed %d booked %d homes %d", d.CommittedMB, d.BookedMB, d.Homes)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user