docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1448 from jimenez/timeout_default 

Changing offers timeout default to prevent other frameworks starvation
This commit is contained in:
Victor Vieux 2015-11-30 14:35:09 -08:00
parent b7ca0e7844 484edd33cd
commit de6383c4dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/help.go
View File

@ -46,7 +46,7 @@ Options:
{{end}}{{if (eq .Name "manage")}}{{printf "\t * swarm.overcommit=0.05\tovercommit to apply on resources"}}
{{printf "\t * mesos.address=\taddress to bind on [$SWARM_MESOS_ADDRESS]"}}
{{printf "\t * mesos.port=\tport to bind on [$SWARM_MESOS_PORT]"}}
{{printf "\t * mesos.offertimeout=10m\ttimeout for offers [$SWARM_MESOS_OFFER_TIMEOUT]"}}
{{printf "\t * mesos.offertimeout=30s\ttimeout for offers [$SWARM_MESOS_OFFER_TIMEOUT]"}}
{{printf "\t * mesos.tasktimeout=5s\ttimeout for task creation [$SWARM_MESOS_TASK_TIMEOUT]"}}
{{printf "\t * mesos.user=\tframework user [$SWARM_MESOS_USER]"}}{{end}}{{ end }}
`

2
cluster/mesos/cluster.go
View File

@ -46,7 +46,7 @@ const (
defaultDockerEnginePort = "2375"
defaultDockerEngineTLSPort = "2376"
dockerPortAttribute = "docker_port"
defaultOfferTimeout = 10 * time.Minute
defaultOfferTimeout = 30 * time.Second
defaultTaskCreationTimeout = 5 * time.Second
)