fix: use the correct cgroup policy to work on most of the systems (#2421)

alepane21 · web-flow · commit e6479844cc2c · 2025-12-18T14:17:05.000+01:00
diff --git a/router/cmd/plan_generator.go b/router/cmd/plan_generator.go
@@ -104,8 +104,7 @@ func PlanGenerator(args []string) {
 		// More details: https://tip.golang.org/doc/gc-guide#Memory_limit
 		mLimit, err := memlimit.SetGoMemLimitWithOpts(
 			memlimit.WithRatio(0.9),
-			// FromCgroupHybrid retrieves the memory limit from the cgroup v2 and v1 controller sequentially
-			memlimit.WithProvider(memlimit.FromCgroupHybrid),
+			memlimit.WithProvider(memlimit.FromCgroup),
 		)
 		if err == nil {
 			logger.Info("GOMEMLIMIT set automatically", zap.String("size", humanize.Bytes(uint64(mLimit))))
diff --git a/router/core/supervisor_instance.go b/router/core/supervisor_instance.go
@@ -41,7 +41,7 @@ func newRouter(ctx context.Context, params RouterResources, additionalOptions ..
 		// More details: https://tip.golang.org/doc/gc-guide#Memory_limit
 		mLimit, err := memlimit.SetGoMemLimitWithOpts(
 			memlimit.WithRatio(0.9),
-			memlimit.WithProvider(memlimit.FromCgroupHybrid),
+			memlimit.WithProvider(memlimit.FromCgroup),
 		)
 		if err == nil {
 			params.Logger.Info("GOMEMLIMIT set automatically", zap.String("limit", humanize.Bytes(uint64(mLimit))))

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func newRouter(ctx context.Context, params RouterResources, additionalOptions ..`
`41`	`41`	`// More details: https://tip.golang.org/doc/gc-guide#Memory_limit`
`42`	`42`	`mLimit, err := memlimit.SetGoMemLimitWithOpts(`
`43`	`43`	`memlimit.WithRatio(0.9),`
`44`		`- memlimit.WithProvider(memlimit.FromCgroupHybrid),`
	`44`	`+ memlimit.WithProvider(memlimit.FromCgroup),`
`45`	`45`	`)`
`46`	`46`	`if err == nil {`
`47`	`47`	`params.Logger.Info("GOMEMLIMIT set automatically", zap.String("limit", humanize.Bytes(uint64(mLimit))))`