github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

add flags for initial executor cpu and memory resources

Browse Source
This commit is contained in:
James DeFelice 2015-09-06 00:31:39 +00:00
parent 2e2def36a9
commit cf908df89c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,9 +75,8 @@ const (
defaultReconcileInterval = 300 // 5m default task reconciliation interval defaultReconcileInterval = 300 // 5m default task reconciliation interval
defaultReconcileCooldown = 15 * time.Second defaultReconcileCooldown = 15 * time.Second
defaultFrameworkName = "Kubernetes" defaultFrameworkName = "Kubernetes"
defaultExecutorCPUs = mresource.CPUShares(0.25) // initial CPU allocated for executor
executorCPUs = mresource.CPUShares(0.25) // initial CPU allocated for executor defaultExecutorMem = mresource.MegaBytes(128.0) // initial memory allocated for executor
executorMem = mresource.MegaBytes(64.0) // initial memory allocated for executor
) )
type SchedulerServer struct { type SchedulerServer struct {
@ -97,6 +96,8 @@ type SchedulerServer struct {
MesosAuthPrincipal string MesosAuthPrincipal string
MesosAuthSecretFile string MesosAuthSecretFile string
MesosCgroupPrefix string MesosCgroupPrefix string
MesosExecutorCPUs mresource.CPUShares
MesosExecutorMem mresource.MegaBytes
Checkpoint bool Checkpoint bool
FailoverTimeout float64 FailoverTimeout float64
@ -177,6 +178,8 @@ func NewSchedulerServer() *SchedulerServer {
MesosCgroupPrefix: minioncfg.DefaultCgroupPrefix, MesosCgroupPrefix: minioncfg.DefaultCgroupPrefix,
MesosMaster: defaultMesosMaster, MesosMaster: defaultMesosMaster,
MesosUser: defaultMesosUser, MesosUser: defaultMesosUser,
MesosExecutorCPUs: defaultExecutorCPUs,
MesosExecutorMem: defaultExecutorMem,
ReconcileInterval: defaultReconcileInterval, ReconcileInterval: defaultReconcileInterval,
ReconcileCooldown: defaultReconcileCooldown, ReconcileCooldown: defaultReconcileCooldown,
Checkpoint: true, Checkpoint: true,
@ -221,6 +224,8 @@ func (s *SchedulerServer) addCoreFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.MesosAuthProvider, "mesos-authentication-provider", s.MesosAuthProvider, fmt.Sprintf("Authentication provider to use, default is SASL that supports mechanisms: %+v", mech.ListSupported())) fs.StringVar(&s.MesosAuthProvider, "mesos-authentication-provider", s.MesosAuthProvider, fmt.Sprintf("Authentication provider to use, default is SASL that supports mechanisms: %+v", mech.ListSupported()))
fs.StringVar(&s.DockerCfgPath, "dockercfg-path", s.DockerCfgPath, "Path to a dockercfg file that will be used by the docker instance of the minions.") fs.StringVar(&s.DockerCfgPath, "dockercfg-path", s.DockerCfgPath, "Path to a dockercfg file that will be used by the docker instance of the minions.")
fs.StringVar(&s.MesosCgroupPrefix, "mesos-cgroup-prefix", s.MesosCgroupPrefix, "The cgroup prefix concatenated with MESOS_DIRECTORY must give the executor cgroup set by Mesos") fs.StringVar(&s.MesosCgroupPrefix, "mesos-cgroup-prefix", s.MesosCgroupPrefix, "The cgroup prefix concatenated with MESOS_DIRECTORY must give the executor cgroup set by Mesos")
fs.Var(&s.MesosExecutorCPUs, "mesos-executor-cpus", "Initial CPU shares to allocate for each Mesos executor container.")
fs.Var(&s.MesosExecutorMem, "mesos-executor-mem", "Initial memory (MB) to allocate for each Mesos executor container.")
fs.BoolVar(&s.Checkpoint, "checkpoint", s.Checkpoint, "Enable/disable checkpointing for the kubernetes-mesos framework.") fs.BoolVar(&s.Checkpoint, "checkpoint", s.Checkpoint, "Enable/disable checkpointing for the kubernetes-mesos framework.")
fs.Float64Var(&s.FailoverTimeout, "failover-timeout", s.FailoverTimeout, fmt.Sprintf("Framework failover timeout, in sec.")) fs.Float64Var(&s.FailoverTimeout, "failover-timeout", s.FailoverTimeout, fmt.Sprintf("Framework failover timeout, in sec."))
fs.UintVar(&s.DriverPort, "driver-port", s.DriverPort, "Port that the Mesos scheduler driver process should listen on.") fs.UintVar(&s.DriverPort, "driver-port", s.DriverPort, "Port that the Mesos scheduler driver process should listen on.")
@ -452,8 +457,8 @@ func (s *SchedulerServer) prepareExecutorInfo(hks hyperkube.Interface) (*mesos.E
} }
execInfo.Resources = []*mesos.Resource{ execInfo.Resources = []*mesos.Resource{
mutil.NewScalarResource("cpus", float64(executorCPUs)+staticPodCPUs), mutil.NewScalarResource("cpus", float64(s.MesosExecutorCPUs)+staticPodCPUs),
mutil.NewScalarResource("mem", float64(executorMem)+staticPodMem), mutil.NewScalarResource("mem", float64(s.MesosExecutorMem)+staticPodMem),
} }
// calculate ExecutorInfo hash to be used for validating compatibility // calculate ExecutorInfo hash to be used for validating compatibility

2
hack/verify-flags/known-flags.txt
View File

@ -158,6 +158,8 @@ mesos-authentication-principal
mesos-authentication-provider mesos-authentication-provider
mesos-authentication-secret-file mesos-authentication-secret-file
mesos-cgroup-prefix mesos-cgroup-prefix
mesos-executor-cpus
mesos-executor-mem
mesos-master mesos-master
mesos-role mesos-role
mesos-user mesos-user