From 01fc95fe31c60cd439b1c6e01f2671a9d3d9e1f2 Mon Sep 17 00:00:00 2001 From: Sun Hongliang Date: Fri, 18 Mar 2016 21:51:31 +0800 Subject: [PATCH] classify whether constraint error or affinity error Signed-off-by: Sun Hongliang --- scheduler/filter/affinity.go | 2 +- scheduler/filter/constraint.go | 2 +- test/integration/api/run.bats | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scheduler/filter/affinity.go b/scheduler/filter/affinity.go index d3903aff6a..80bb7ea8aa 100644 --- a/scheduler/filter/affinity.go +++ b/scheduler/filter/affinity.go @@ -69,7 +69,7 @@ func (f *AffinityFilter) Filter(config *cluster.ContainerConfig, nodes []*node.N } } if len(candidates) == 0 { - return nil, fmt.Errorf("unable to find a node that satisfies %s%s%s", affinity.key, OPERATORS[affinity.operator], affinity.value) + return nil, fmt.Errorf("unable to find a node that satisfies the affinity %s%s%s", affinity.key, OPERATORS[affinity.operator], affinity.value) } nodes = candidates } diff --git a/scheduler/filter/constraint.go b/scheduler/filter/constraint.go index 91ab8b0c3d..72bd60bb5a 100644 --- a/scheduler/filter/constraint.go +++ b/scheduler/filter/constraint.go @@ -45,7 +45,7 @@ func (f *ConstraintFilter) Filter(config *cluster.ContainerConfig, nodes []*node } } if len(candidates) == 0 { - return nil, fmt.Errorf("unable to find a node that satisfies %s%s%s", constraint.key, OPERATORS[constraint.operator], constraint.value) + return nil, fmt.Errorf("unable to find a node that satisfies the constraint %s%s%s", constraint.key, OPERATORS[constraint.operator], constraint.value) } nodes = candidates } diff --git a/test/integration/api/run.bats b/test/integration/api/run.bats index ec2c6dd8db..c4b93e1861 100644 --- a/test/integration/api/run.bats +++ b/test/integration/api/run.bats @@ -209,7 +209,7 @@ function teardown() { run docker_swarm run -d --name test_container -e constraint:node==node-1 busyboxabcde sleep 1000 # check error message - [[ "${output}" != *"unable to find a node that satisfies"* ]] + [[ "${output}" != *"unable to find a node that satisfies the constraint"* ]] [[ "${output}" == *"not found"* ]] }