github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12198 from mesosphere/default-mem-and-cpu-limit 

MESOS: Set the cpu+mem default limit in the SchedulerServer
pull/6/head
Alex Mohr 2015-08-04 17:42:51 -07:00
parent 927268e619 191f2def5f
commit e528d2d948
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/mesos/pkg/scheduler/service/service.go
View File

@ -163,6 +163,8 @@ func NewSchedulerServer() *SchedulerServer {
RunProxy: true, RunProxy: true,
ExecutorSuicideTimeout: execcfg.DefaultSuicideTimeout, ExecutorSuicideTimeout: execcfg.DefaultSuicideTimeout,
ExecutorCgroupPrefix: execcfg.DefaultCgroupPrefix, ExecutorCgroupPrefix: execcfg.DefaultCgroupPrefix,
DefaultContainerCPULimit: mresource.DefaultDefaultContainerCPULimit,
DefaultContainerMemLimit: mresource.DefaultDefaultContainerMemLimit,
MinionLogMaxSize: minioncfg.DefaultLogMaxSize(), MinionLogMaxSize: minioncfg.DefaultLogMaxSize(),
MinionLogMaxBackups: minioncfg.DefaultLogMaxBackups, MinionLogMaxBackups: minioncfg.DefaultLogMaxBackups,

10
contrib/mesos/pkg/scheduler/service/service_test.go
View File

@ -28,6 +28,8 @@ import (
"time" "time"
"github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/archive" "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/archive"
mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource"
"github.com/stretchr/testify/assert" "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) { func Test_StaticPods(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)