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

use inspect sent by mesos 0.23 

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-06-01 15:16:23 -07:00
parent 3cc53769ec
commit 4212b69c96
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cluster/mesos/cluster.go
View File

@ -2,6 +2,7 @@ package mesos
import (
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"io"
@ -397,7 +398,7 @@ func (c *Cluster) scheduleTask(t *task) bool {
}
c.Unlock()
// block until we get the container
finished, err := t.monitor()
finished, data, err := t.monitor()
taskID := t.TaskInfo.TaskId.GetValue()
if err != nil {
//remove task
@ -408,7 +409,7 @@ func (c *Cluster) scheduleTask(t *task) bool {
if !finished {
go func() {
for {
finished, err := t.monitor()
finished, _, err := t.monitor()
if err != nil {
// TODO do a better log by sending proper error message
log.Error(err)
@ -423,18 +424,29 @@ func (c *Cluster) scheduleTask(t *task) bool {
}
// Register the container immediately while waiting for a state refresh.
// Force a state refresh to pick up the newly created container.
// FIXME: unexport this method, see FIXME in engine.go
// In mesos 0.23+ the docker inspect will be sent back in the taskStatus.Data
// We can use this to find the right container.
inspect := []dockerclient.ContainerInfo{}
if data != nil && json.Unmarshal(data, &inspect) != nil && len(inspect) == 1 {
container := &cluster.Container{Container: dockerclient.Container{Id: inspect[0].Id}, Engine: s.engine}
if container.Refresh() == nil {
t.container <- container
return true
}
}
log.Debug("Cannot parse docker info from task status, please upgrade Mesos to the last version")
// For mesos <= 0.22 we fallback to a full refresh + using labels
// TODO: once 0.23 or 0.24 is released, remove all this block of code as it
// doesn't scale very well.
s.engine.RefreshContainers(true)
// TODO: We have to return the right container that was just created.
// Once we receive the ContainerID from the executor.
for _, container := range s.engine.Containers() {
if container.Config.Labels[cluster.SwarmLabelNamespace+".mesos.task"] == taskID {
t.container <- container
return true
}
// TODO save in store
}
t.error <- fmt.Errorf("Container failed to create")

14
cluster/mesos/task.go
View File

@ -140,7 +140,7 @@ func (t *task) getStatus() *mesosproto.TaskStatus {
return <-t.updates
}
func (t *task) monitor() (bool, error) {
func (t *task) monitor() (bool, []byte, error) {
taskStatus := t.getStatus()
switch taskStatus.GetState() {
@ -148,16 +148,16 @@ func (t *task) monitor() (bool, error) {
case mesosproto.TaskState_TASK_STARTING:
case mesosproto.TaskState_TASK_RUNNING:
case mesosproto.TaskState_TASK_FINISHED:
return true, nil
return true, taskStatus.Data, nil
case mesosproto.TaskState_TASK_FAILED:
return true, errors.New(taskStatus.GetMessage())
return true, nil, errors.New(taskStatus.GetMessage())
case mesosproto.TaskState_TASK_KILLED:
return true, nil
return true, taskStatus.Data, nil
case mesosproto.TaskState_TASK_LOST:
return true, errors.New(taskStatus.GetMessage())
return true, nil, errors.New(taskStatus.GetMessage())
case mesosproto.TaskState_TASK_ERROR:
return true, errors.New(taskStatus.GetMessage())
return true, nil, errors.New(taskStatus.GetMessage())
}
return false, nil
return false, taskStatus.Data, nil
}