Only schedule to pods that are available. kubernetes#5545

duda · Mar 26, 2015 · c2938b2 · c2938b2
1 parent 35b2c5c
commit c2938b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go
@@ -230,8 +230,8 @@ func (factory *ConfigFactory) pollMinions() (cache.Enumerator, error) {
 			}
 		} else {
 			// If no condition is set, we get unknown node condition. In such cases,
-			// we add nodes unconditionally.
-			nodes.Items = append(nodes.Items, node)
+			// do not add the node
+			glog.V(2).Infof("Minion %s is not available.  Skipping", node.Name)
 		}
 	}
 	return &nodeEnumerator{nodes}, nil

diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go
@@ -220,7 +220,7 @@ func TestPollMinions(t *testing.T) {
 					},
 				},
 			},
-			expectedCount: 6,
+			expectedCount: 5,
 		},
 		{
 			minions: []api.Node{
@@ -262,7 +262,7 @@ func TestPollMinions(t *testing.T) {
 					},
 				},
 			},
-			expectedCount: 1,
+			expectedCount: 0,
 		},
 		{
 			minions: []api.Node{
@@ -299,7 +299,7 @@ func TestPollMinions(t *testing.T) {
 					},
 				},
 			},
-			expectedCount: 1,
+			expectedCount: 0,
 		},
 	}