github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Add a function to ensure created nodes are present in scheduler cache

Browse Source
This commit is contained in:
Wei Huang
2020-10-30 13:14:01 -07:00
parent 7e1f4a9fa3
commit f054765762
8 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/scheduler/framework_test.go
View File

@@ -1181,9 +1181,9 @@ func TestBindPlugin(t *testing.T) {
defer testutils.CleanupTest(t, testCtx)
// Add a few nodes.
_, err := createNodes(testCtx.ClientSet, "test-node", st.MakeNode(), 2)
_, err := createAndWaitForNodesInCache(testCtx, "test-node", st.MakeNode(), 2)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
tests := []struct {
@@ -1840,9 +1840,9 @@ func TestPreemptWithPermitPlugin(t *testing.T) {
v1.ResourceCPU: "500m",
v1.ResourceMemory: "500",
}
_, err := createNodes(testCtx.ClientSet, "test-node", st.MakeNode().Capacity(nodeRes), 1)
_, err := createAndWaitForNodesInCache(testCtx, "test-node", st.MakeNode().Capacity(nodeRes), 1)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
permitPlugin.failPermit = false
@@ -1900,9 +1900,8 @@ func initTestSchedulerForFrameworkTest(t *testing.T, testCtx *testutils.TestCont
go testCtx.Scheduler.Run(testCtx.Ctx)
if nodeCount > 0 {
_, err := createNodes(testCtx.ClientSet, "test-node", st.MakeNode(), nodeCount)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
if _, err := createAndWaitForNodesInCache(testCtx, "test-node", st.MakeNode(), nodeCount); err != nil {
t.Fatal(err)
}
}
return testCtx

4
test/integration/scheduler/predicates_test.go
View File

@@ -43,9 +43,9 @@ func TestInterPodAffinity(t *testing.T) {
defer testutils.CleanupTest(t, testCtx)
// Add a few nodes with labels
nodes, err := createNodes(testCtx.ClientSet, "testnode", st.MakeNode().Label("region", "r1").Label("zone", "z11"), 2)
nodes, err := createAndWaitForNodesInCache(testCtx, "testnode", st.MakeNode().Label("region", "r1").Label("zone", "z11"), 2)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
cs := testCtx.ClientSet

16
test/integration/scheduler/priorities_test.go
View File

@@ -72,9 +72,9 @@ func TestNodeAffinity(t *testing.T) {
testCtx := initTestSchedulerForPriorityTest(t, nodeaffinity.Name)
defer testutils.CleanupTest(t, testCtx)
// Add a few nodes.
_, err := createNodes(testCtx.ClientSet, "testnode", st.MakeNode(), 4)
_, err := createAndWaitForNodesInCache(testCtx, "testnode", st.MakeNode(), 4)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
// Add a label to one of the nodes.
labelKey := "kubernetes.io/node-topologyKey"
@@ -126,9 +126,9 @@ func TestPodAffinity(t *testing.T) {
// Add a few nodes.
topologyKey := "node-topologykey"
topologyValue := "topologyvalue"
nodesInTopology, err := createNodes(testCtx.ClientSet, "in-topology", st.MakeNode().Label(topologyKey, topologyValue), 5)
nodesInTopology, err := createAndWaitForNodesInCache(testCtx, "in-topology", st.MakeNode().Label(topologyKey, topologyValue), 5)
if err != nil {
t.Fatalf("Cannot create nodes: %v", err)
t.Fatal(err)
}
// Add a pod with a label and wait for it to schedule.
labelKey := "service"
@@ -142,9 +142,9 @@ func TestPodAffinity(t *testing.T) {
t.Fatalf("Error running the attractor pod: %v", err)
}
// Add a few more nodes without the topology label.
_, err = createNodes(testCtx.ClientSet, "other-node", st.MakeNode(), 5)
_, err = createAndWaitForNodesInCache(testCtx, "other-node", st.MakeNode(), 5)
if err != nil {
t.Fatalf("Cannot create the second set of nodes: %v", err)
t.Fatal(err)
}
// Add a new pod with affinity to the attractor pod.
podName := "pod-with-podaffinity"
@@ -215,9 +215,9 @@ func TestImageLocality(t *testing.T) {
}
// Add a few nodes.
_, err = createNodes(testCtx.ClientSet, "testnode", st.MakeNode(), 10)
_, err = createAndWaitForNodesInCache(testCtx, "testnode", st.MakeNode(), 10)
if err != nil {
t.Fatalf("cannot create nodes: %v", err)
t.Fatal(err)
}
// Create a pod with containers each having the specified image.

4
test/integration/scheduler/scheduler_test.go
View File

@@ -825,6 +825,10 @@ func TestSchedulerInformers(t *testing.T) {
t.Fatalf("Error creating node %v: %v", nodeConf.name, err)
}
}
// Ensure nodes are present in scheduler cache.
if err := waitForNodesInCache(testCtx.Scheduler, len(test.nodes)); err != nil {
t.Fatal(err)
}
pods := make([]*v1.Pod, len(test.existingPods))
var err error

28
test/integration/scheduler/util.go
View File

@@ -111,7 +111,7 @@ func initTestDisablePreemption(t *testing.T, nsPrefix string) *testutils.TestCon
// to see is in the store. Used to observe reflected events.
func waitForReflection(t *testing.T, nodeLister corelisters.NodeLister, key string,
passFunc func(n interface{}) bool) error {
nodes := []*v1.Node{}
var nodes []*v1.Node
err := wait.Poll(time.Millisecond*100, wait.ForeverTestTimeout, func() (bool, error) {
n, err := nodeLister.Get(key)
@@ -143,6 +143,9 @@ func createNode(cs clientset.Interface, node *v1.Node) (*v1.Node, error) {
// createNodes creates `numNodes` nodes. The created node names will be in the
// form of "`prefix`-X" where X is an ordinal.
// DEPRECATED
// use createAndWaitForNodesInCache instead, which ensures the created nodes
// to be present in scheduler cache.
func createNodes(cs clientset.Interface, prefix string, wrapper *st.NodeWrapper, numNodes int) ([]*v1.Node, error) {
nodes := make([]*v1.Node, numNodes)
for i := 0; i < numNodes; i++ {
@@ -156,6 +159,29 @@ func createNodes(cs clientset.Interface, prefix string, wrapper *st.NodeWrapper,
return nodes[:], nil
}
// createAndWaitForNodesInCache calls createNodes(), and wait for the created
// nodes to be present in scheduler cache.
func createAndWaitForNodesInCache(testCtx *testutils.TestContext, prefix string, wrapper *st.NodeWrapper, numNodes int) ([]*v1.Node, error) {
existingNodes := testCtx.Scheduler.SchedulerCache.NodeCount()
nodes, err := createNodes(testCtx.ClientSet, prefix, wrapper, numNodes)
if err != nil {
return nodes, fmt.Errorf("cannot create nodes: %v", err)
}
return nodes, waitForNodesInCache(testCtx.Scheduler, numNodes+existingNodes)
}
// waitForNodesInCache ensures at least <nodeCount> nodes are present in scheduler cache
// within 30 seconds; otherwise returns false.
func waitForNodesInCache(sched *scheduler.Scheduler, nodeCount int) error {
err := wait.Poll(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) {
return sched.SchedulerCache.NodeCount() >= nodeCount, nil
})
if err != nil {
return fmt.Errorf("cannot obtain available nodes in scheduler cache: %v", err)
}
return nil
}
type pausePodConfig struct {
Name string
Namespace string