Fix #720 - JobAndMark computation + related tweaks

NAICNO · Jan 15, 2025 · 754b42c · 754b42c
1 parent fa773dd
commit 754b42c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/code/generate-table/README.md b/code/generate-table/README.md
@@ -176,6 +176,10 @@ they must also be added to the table.  This is flagged with a comment and is OK,
 bit might be better.  And so instead of the config / NeedsConfig attribute there may be a more
 general flags attribute on fields: flag:"slurm", flag:"config|slurm".
 
+We should check that every alias definition references fields or other aliases, and that there are
+no circular aliases, and that no aliases are defined multiple times.  For very wide tables such as
+jobs there have been bugs where aliases point to nothing.
+
 ### DONTDO
 
 While it's tempting to put all the output definitions together in some sort of struct, allowing them

diff --git a/code/sonalyze/cmd/jobs/jobs-table.go b/code/sonalyze/cmd/jobs/jobs-table.go
@@ -484,7 +484,7 @@ var jobsAliases = map[string][]string{
 	"Gpu":                    []string{"GpuAvgPct", "GpuPeakPct"},
 	"RelativeGpu":            []string{"RelativeGpuAvgPct", "RelativeGpuPeakPct"},
 	"OccupiedRelativeGpu":    []string{"OccupiedRelativeGpuAvgPct", "OccupiedRelativeGpuPeakPct"},
-	"GpuMem":                 []string{"GpuMemAvgPct", "GpuMemPeakPct"},
+	"GpuMem":                 []string{"GpuMemAvgGB", "GpuMemPeakGB"},
 	"RelativeGpuMem":         []string{"RelativeGpuMemAvgPct", "RelativeGpuMemPeakPct"},
 	"OccupiedRelativeGpuMem": []string{"OccupiedRelativeGpuMemAvgPct", "OccupiedRelativeGpuMemPeakPct"},
 	"default":                []string{"std", "cpu", "mem", "gpu", "gpumem", "cmd"},

diff --git a/code/sonalyze/cmd/jobs/perform.go b/code/sonalyze/cmd/jobs/perform.go
@@ -193,7 +193,7 @@ func (jc *JobsCommand) aggregateAndFilterJobs(
 			needCmd = true
 		case "host", "Host":
 			needHost = true
-		case "jobm", "JobsAndMark":
+		case "jobm", "JobAndMark":
 			needJobAndMark = true
 		case "Submit", "JobName", "State", "Account", "Layout", "Reservation",
 			"Partition", "RequestedGpus", "DiskReadAvgGB", "DiskWriteAvgGB",

diff --git a/code/sonalyze/cmd/jobs/print.go b/code/sonalyze/cmd/jobs/print.go
@@ -160,7 +160,7 @@ ALIASES
   RelativeGpu RelativeGpuAvgPct,RelativeGpuPeakPct
   OccupiedRelativeGpu \
               OccupiedRelativeGpuAvgPct,OccupiedRelativeGpuPeakPct
-  GpuMem      GpuMemAvgPct,GpuMemPeakPct
+  GpuMem      GpuMemAvgGB,GpuMemPeakGB
   RelativeGpuMem \
               RelativeGpuMemAvgPct,RelativeGpuMemPeakPct
   OccupiedRelativeGpuMem \