From 3fced6f07bcef93af8727aa8aa5f46d0add8fab8 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 4 Aug 2015 12:15:17 +0200 Subject: [PATCH] Set the cpu+mem default limit in the SchedulerServer --- contrib/mesos/pkg/scheduler/service/service.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 0e8c556eeb8..a58f00a29b8 100644 --- 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,