Merge pull request kubernetes#10642 from davidopp/clean

Clarify and make less verbose event message for infeasible pods.
nikhiljindal · Jul 6, 2015 · ea16e52 · ea16e52
2 parents 1817f74 + 950ab8f
commit ea16e52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/plugin/pkg/scheduler/generic_scheduler.go b/plugin/pkg/scheduler/generic_scheduler.go
@@ -41,12 +41,15 @@ var ErrNoNodesAvailable = fmt.Errorf("no nodes available to schedule pods")
 
 // implementation of the error interface
 func (f *FitError) Error() string {
-	predicates := util.NewStringSet()
+	var reason string
+	// We iterate over all nodes for logging purposes, even though we only return one reason from one node
 	for node, predicateList := range f.FailedPredicates {
-		predicates = predicates.Union(predicateList)
 		glog.Infof("failed to find fit for pod %v on node %s: %s", f.Pod.Name, node, strings.Join(predicateList.List(), ","))
+		if len(reason) == 0 {
+			reason, _ = predicateList.PopAny()
+		}
 	}
-	return fmt.Sprintf("For each of these fitness predicates, pod %v failed on at least one node: %v.", f.Pod.Name, strings.Join(predicates.List(), ","))
+	return fmt.Sprintf("Failed for reason %s and possibly others", reason)
 }
 
 type genericScheduler struct {

diff --git a/plugin/pkg/scheduler/scheduler.go b/plugin/pkg/scheduler/scheduler.go
@@ -125,7 +125,7 @@ func (s *Scheduler) scheduleOne() {
 	metrics.SchedulingAlgorithmLatency.Observe(metrics.SinceInMicroseconds(start))
 	if err != nil {
 		glog.V(1).Infof("Failed to schedule: %v", pod)
-		s.config.Recorder.Eventf(pod, "failedScheduling", "Error scheduling: %v", err)
+		s.config.Recorder.Eventf(pod, "failedScheduling", "%v", err)
 		s.config.Error(pod, err)
 		return
 	}