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

Merge pull request #63 from mwielgus/predicate-error 

Fix predicate error messages
This commit is contained in:
Marcin Wielgus 2017-05-12 11:20:24 +02:00 committed by GitHub
parent e17f3507d4 5bc6f88f31
commit 669ba4fa58
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster-autoscaler/simulator/predicates.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package simulator
import (
"bytes"
"fmt"
kube_util "k8s.io/autoscaler/cluster-autoscaler/utils/kubernetes"
@ -105,7 +106,7 @@ func (p *PredicateChecker) FitsAny(pod *apiv1.Pod, nodeInfos map[string]*schedul
// CheckPredicates checks if the given pod can be placed on the given node.
func (p *PredicateChecker) CheckPredicates(pod *apiv1.Pod, nodeInfo *schedulercache.NodeInfo) error {
for _, predicate := range p.predicates {
for name, predicate := range p.predicates {
match, failureReason, err := predicate(pod, nil, nodeInfo)
nodename := "unknown"
@ -113,10 +114,19 @@ func (p *PredicateChecker) CheckPredicates(pod *apiv1.Pod, nodeInfo *schedulerca
nodename = nodeInfo.Node().Name
}
if err != nil {
return fmt.Errorf("cannot put %s on %s due to %v", pod.Name, nodename, err)
return fmt.Errorf("%s predicate error, cannot put %s/%s on %s due to, error %v", name, pod.Namespace,
pod.Name, nodename, err)
}
if !match {
return fmt.Errorf("cannot put %s on %s, reason: %v", pod.Name, nodename, failureReason)
var buffer bytes.Buffer
for i, reason := range failureReason {
if i > 0 {
buffer.WriteString(",")
}
buffer.WriteString(reason.GetReason())
}
return fmt.Errorf("%s predicate mismatch, cannot put %s/%s on %s, reason: %s", name, pod.Namespace,
pod.Name, nodename, buffer.String())
}
}
return nil

3
cluster-autoscaler/simulator/predicates_test.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package simulator
import (
"strings"
"testing"
"time"
@ -55,6 +56,8 @@ func TestPredicates(t *testing.T) {
_, err = predicateChecker.FitsAny(p3, nodeInfos)
assert.Error(t, err)
err = predicateChecker.CheckPredicates(p2, ni1)
assert.True(t, strings.Contains(err.Error(), "Insufficient cpu"))
assert.Error(t, predicateChecker.CheckPredicates(p2, ni1))
assert.NoError(t, predicateChecker.CheckPredicates(p4, ni1))
assert.NoError(t, predicateChecker.CheckPredicates(p2, ni2))