Set the cpu+mem default limit in the SchedulerServer

3fced6f0 · Dr. Stefan Schimanski · 908b1e08 · 3fced6f0
Commit 3fced6f0 authored Aug 04, 2015 by Dr. Stefan Schimanski
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

service.go contrib/mesos/pkg/scheduler/service/service.go +5 -3

No files found.
--- a/contrib/mesos/pkg/scheduler/service/service.go
+++ b/contrib/mesos/pkg/scheduler/service/service.go
@@ -160,9 +160,11 @@ func NewSchedulerServer() *SchedulerServer {
 		Address:         util.IP(net.ParseIP("127.0.0.1")),
 		FailoverTimeout: time.Duration((1 << 62) - 1).Seconds(),

-		RunProxy:               true,
-		ExecutorSuicideTimeout: execcfg.DefaultSuicideTimeout,
-		ExecutorCgroupPrefix:   execcfg.DefaultCgroupPrefix,
+		RunProxy:                 true,
+		ExecutorSuicideTimeout:   execcfg.DefaultSuicideTimeout,
+		ExecutorCgroupPrefix:     execcfg.DefaultCgroupPrefix,
+		DefaultContainerCPULimit: mresource.DefaultDefaultContainerCPULimit,
+		DefaultContainerMemLimit: mresource.DefaultDefaultContainerMemLimit,

 		MinionLogMaxSize:      minioncfg.DefaultLogMaxSize(),
 		MinionLogMaxBackups:   minioncfg.DefaultLogMaxBackups,