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

Merge pull request #1329 from vieux/improve_mesos_error_message 

improve error message in mesos
This commit is contained in:
Victor Vieux 2015-10-22 16:59:00 -07:00
parent 756671ac66 a2a8596238
commit 2eb39be3ee
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/mesos/cluster.go
View File

@ -17,7 +17,6 @@ import (
"github.com/docker/swarm/cluster/mesos/queue" "github.com/docker/swarm/cluster/mesos/queue"
"github.com/docker/swarm/scheduler" "github.com/docker/swarm/scheduler"
"github.com/docker/swarm/scheduler/node" "github.com/docker/swarm/scheduler/node"
"github.com/docker/swarm/scheduler/strategy"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/mesos/mesos-go/mesosproto" "github.com/mesos/mesos-go/mesosproto"
mesosscheduler "github.com/mesos/mesos-go/scheduler" mesosscheduler "github.com/mesos/mesos-go/scheduler"
@ -178,7 +177,7 @@ func (c *Cluster) CreateContainer(config *cluster.ContainerConfig, name string)
return nil, err return nil, err
case <-time.After(c.taskCreationTimeout): case <-time.After(c.taskCreationTimeout):
c.pendingTasks.Remove(task) c.pendingTasks.Remove(task)
return nil, strategy.ErrNoResourcesAvailable return nil, fmt.Errorf("container failed to start after %s", c.taskCreationTimeout)
} }
} }