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

Merge pull request #1449 from jimenez/mesos_user_abnormal_error 

Improving error output for bad swarm mesos user
This commit is contained in:
Victor Vieux 2015-12-07 13:43:34 -08:00
parent d9265c4f21 e71bda76f8
commit 67a4d559db
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/mesos/task.go
View File

@ -184,7 +184,11 @@ func (t *task) monitor() (bool, []byte, error) {
case mesosproto.TaskState_TASK_FINISHED:
return true, taskStatus.Data, nil
case mesosproto.TaskState_TASK_FAILED:
return true, nil, errors.New(taskStatus.GetMessage())
errorMessage := taskStatus.GetMessage()
if errorMessage == "Abnormal executor termination" {
errorMessage += " : please verify your SWARM_MESOS_USER is correctly set"
}
return true, nil, errors.New(errorMessage)
case mesosproto.TaskState_TASK_KILLED:
return true, taskStatus.Data, nil
case mesosproto.TaskState_TASK_LOST:

15
test/integration/mesos/api/run.bats
View File

@ -8,6 +8,19 @@ function teardown() {
stop_docker
}
@test "mesos - docker run with wrong user" {
start_docker_with_busybox 2
start_mesos
swarm_manage --cluster-driver mesos-experimental --cluster-opt mesos.user=test_wrong_user 127.0.0.1:$MESOS_MASTER_PORT
# run
run docker_swarm run -m 20m -d --name test_container busybox sleep 100
# error check
[ "$status" -ne 0 ]
[[ "${output}" == *"please verify your SWARM_MESOS_USER is correctly set"* ]]
}
@test "mesos - docker run" {
start_docker_with_busybox 2
start_mesos
@ -62,4 +75,4 @@ function teardown() {
run docker_swarm ps -aq
[ "${#lines[@]}" -eq 100 ]
}
}