github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Improve "constraint violation" error message.

Browse Source
This commit is contained in:
Jerzy Szczepkowski 2015-02-04 23:41:27 +01:00
parent 63c07ad58b
commit ad4c2ee630
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/constraint/constraint.go
View File

@ -17,11 +17,16 @@ limitations under the License.
package constraint package constraint
import ( import (
"fmt"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
) )
// Allowed returns true if pods is a collection of bound pods // Allowed returns true if pods is a collection of bound pods
// which can run without conflict on a single minion. // which can run without conflict on a single minion.
func Allowed(pods []api.BoundPod) bool { func Allowed(pods []api.BoundPod) error {
return !PortsConflict(pods) if (PortsConflict(pods)) {
return fmt.Errorf("conflicting ports");
}
return nil;
} }

13
pkg/constraint/constraint_test.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package constraint package constraint
import ( import (
"fmt"
"testing" "testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@ -40,11 +41,11 @@ func podWithContainers(containers ...api.Container) api.BoundPod {
func TestAllowed(t *testing.T) { func TestAllowed(t *testing.T) {
table := []struct { table := []struct {
allowed bool err error
pods []api.BoundPod pods []api.BoundPod
}{ }{
{ {
allowed: true, err: nil,
pods: []api.BoundPod{ pods: []api.BoundPod{
podWithContainers( podWithContainers(
containerWithHostPorts(1, 2, 3), containerWithHostPorts(1, 2, 3),
@ -57,7 +58,7 @@ func TestAllowed(t *testing.T) {
}, },
}, },
{ {
allowed: true, err: nil,
pods: []api.BoundPod{ pods: []api.BoundPod{
podWithContainers( podWithContainers(
containerWithHostPorts(0, 0), containerWithHostPorts(0, 0),
@ -70,7 +71,7 @@ func TestAllowed(t *testing.T) {
}, },
}, },
{ {
allowed: false, err: fmt.Errorf("conflicting ports"),
pods: []api.BoundPod{ pods: []api.BoundPod{
podWithContainers( podWithContainers(
containerWithHostPorts(3, 3), containerWithHostPorts(3, 3),
@ -78,7 +79,7 @@ func TestAllowed(t *testing.T) {
}, },
}, },
{ {
allowed: false, err: fmt.Errorf("conflicting ports"),
pods: []api.BoundPod{ pods: []api.BoundPod{
podWithContainers( podWithContainers(
containerWithHostPorts(6), containerWithHostPorts(6),
@ -91,7 +92,7 @@ func TestAllowed(t *testing.T) {
} }
for _, item := range table { for _, item := range table {
if e, a := item.allowed, Allowed(item.pods); e != a { if e, a := item.err, Allowed(item.pods); e != a && e.Error() != a.Error() {
t.Errorf("Expected %v, got %v: \n%v\v", e, a, item.pods) t.Errorf("Expected %v, got %v: \n%v\v", e, a, item.pods)
} }
} }

4
pkg/registry/etcd/etcd.go
View File

@ -214,8 +214,8 @@ func (r *Registry) assignPod(ctx api.Context, podID string, machine string) erro
err = r.AtomicUpdate(contKey, &api.BoundPods{}, func(in runtime.Object) (runtime.Object, error) { err = r.AtomicUpdate(contKey, &api.BoundPods{}, func(in runtime.Object) (runtime.Object, error) {
boundPodList := in.(*api.BoundPods) boundPodList := in.(*api.BoundPods)
boundPodList.Items = append(boundPodList.Items, *boundPod) boundPodList.Items = append(boundPodList.Items, *boundPod)
if !constraint.Allowed(boundPodList.Items) { if e := constraint.Allowed(boundPodList.Items); e != nil {
return nil, fmt.Errorf("the assignment would cause a constraint violation") return nil, fmt.Errorf("the assignment would cause the following constraint violation: %v", e)
} }
return boundPodList, nil return boundPodList, nil
}) })