From 484edd33cd7912e21770676a8f1d73a8421c8dc5 Mon Sep 17 00:00:00 2001 From: Isabel Jimenez Date: Wed, 25 Nov 2015 04:01:30 -0500 Subject: [PATCH] Changing offers timeout default to prevent other frameworks starvation Signed-off-by: Isabel Jimenez --- cli/help.go | 2 +- cluster/mesos/cluster.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/help.go b/cli/help.go index 4ed2722915..1493f585c8 100644 --- a/cli/help.go +++ b/cli/help.go @@ -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 }} ` diff --git a/cluster/mesos/cluster.go b/cluster/mesos/cluster.go index b540c69fdd..eb3560813b 100644 --- a/cluster/mesos/cluster.go +++ b/cluster/mesos/cluster.go @@ -44,7 +44,7 @@ const ( defaultDockerEnginePort = "2375" defaultDockerEngineTLSPort = "2376" dockerPortAttribute = "docker_port" - defaultOfferTimeout = 10 * time.Minute + defaultOfferTimeout = 30 * time.Second defaultTaskCreationTimeout = 5 * time.Second )