From 3fced6f07bcef93af8727aa8aa5f46d0add8fab8 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 4 Aug 2015 12:15:17 +0200 Subject: [PATCH 1/2] 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 0e8c556eeb..a58f00a29b 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, From 191f2def5f06b4659373874b6e974dbc3546d677 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 4 Aug 2015 21:58:19 +0200 Subject: [PATCH 2/2] Add test to check that NewSchedulerServer sets resource defaults --- contrib/mesos/pkg/scheduler/service/service_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/mesos/pkg/scheduler/service/service_test.go b/contrib/mesos/pkg/scheduler/service/service_test.go index e329e89334..7894074554 100644 --- a/contrib/mesos/pkg/scheduler/service/service_test.go +++ b/contrib/mesos/pkg/scheduler/service/service_test.go @@ -28,6 +28,8 @@ import ( "time" "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/archive" + mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" + "github.com/stretchr/testify/assert" ) @@ -115,6 +117,14 @@ func Test_awaitFailoverDoneFailover(t *testing.T) { } } +func Test_DefaultResourceLimits(t *testing.T) { + assert := assert.New(t) + + s := NewSchedulerServer() + assert.Equal(s.DefaultContainerCPULimit, mresource.DefaultDefaultContainerCPULimit) + assert.Equal(s.DefaultContainerMemLimit, mresource.DefaultDefaultContainerMemLimit) +} + func Test_StaticPods(t *testing.T) { assert := assert.New(t)