Error when missing cgroup value memory.peak

eldering · eldering · commit 5a9e20c17277 · 2024-11-04T22:21:16.000+01:00
This replaces the `memory.memsw.max_usage_in_bytes` value from cgroup v1. We always assume it's there so we should fail if it is not. Otherwise things silently degrade as they would not have before. Addresses #2763
diff --git a/judge/runguard.cc b/judge/runguard.cc
@@ -501,7 +501,7 @@ void output_cgroup_stats_v2(double *cputime)
 	int64_t max_usage = 0;
 	ret = cgroup_get_value_int64(cg_controller, "memory.peak", &max_usage);
 	if ( ret == ECGROUPVALUENOTEXIST ) {
-		write_meta("internal-warning", "Kernel too old and does not support memory.peak");
+		error(ret, "kernel too old and does not support memory.peak");
 	} else if ( ret!=0 ) {
 		error(ret,"get cgroup value memory.peak");
 	}

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ void output_cgroup_stats_v2(double *cputime)`
`501`	`501`	`int64_t max_usage = 0;`
`502`	`502`	`ret = cgroup_get_value_int64(cg_controller, "memory.peak", &max_usage);`
`503`	`503`	`if ( ret == ECGROUPVALUENOTEXIST ) {`
`504`		`- write_meta("internal-warning", "Kernel too old and does not support memory.peak");`
	`504`	`+ error(ret, "kernel too old and does not support memory.peak");`
`505`	`505`	`} else if ( ret!=0 ) {`
`506`	`506`	`error(ret,"get cgroup value memory.peak");`
`507`	`507`	`}`