github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89908 from alculquicondor/fix_cache

Browse Source 
Skip updating scheduler cache on pod update if the node was deleted
This commit is contained in:
Kubernetes Prow Robot 2020-04-07 16:46:06 -07:00 committed by GitHub
commit 1edbfe1745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/scheduler/internal/cache/cache.go vendored
View File

@ -427,6 +427,13 @@ func (cache *schedulerCache) addPod(pod *v1.Pod) {
// Assumes that lock is already acquired. // Assumes that lock is already acquired.
func (cache *schedulerCache) updatePod(oldPod, newPod *v1.Pod) error { func (cache *schedulerCache) updatePod(oldPod, newPod *v1.Pod) error {
if _, ok := cache.nodes[newPod.Spec.NodeName]; !ok {
// The node might have been deleted already.
// This is not a problem in the case where a pod update arrives before the
// node creation, because we will always have a create pod event before
// that, which will create the placeholder node item.
return nil
}
if err := cache.removePod(oldPod); err != nil { if err := cache.removePod(oldPod); err != nil {
return err return err
} }

32
pkg/scheduler/internal/cache/cache_test.go vendored
View File

@ -1232,7 +1232,7 @@ func TestSchedulerCache_UpdateSnapshot(t *testing.T) {
// Create a few pods for tests. // Create a few pods for tests.
pods := []*v1.Pod{} pods := []*v1.Pod{}
for i := 0; i < 10; i++ { for i := 0; i < 20; i++ {
pod := &v1.Pod{ pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("test-pod%v", i), Name: fmt.Sprintf("test-pod%v", i),
@ -1240,7 +1240,7 @@ func TestSchedulerCache_UpdateSnapshot(t *testing.T) {
UID: types.UID(fmt.Sprintf("test-puid%v", i)), UID: types.UID(fmt.Sprintf("test-puid%v", i)),
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
NodeName: fmt.Sprintf("test-node%v", i), NodeName: fmt.Sprintf("test-node%v", i%10),
}, },
} }
pods = append(pods, pod) pods = append(pods, pod)
@ -1313,6 +1313,13 @@ func TestSchedulerCache_UpdateSnapshot(t *testing.T) {
} }
} }
} }
removePod := func(i int) operation {
return func() {
if err := cache.RemovePod(pods[i]); err != nil {
t.Error(err)
}
}
}
removePodWithAffinity := func(i int) operation { removePodWithAffinity := func(i int) operation {
return func() { return func() {
if err := cache.RemovePod(podsWithAffinity[i]); err != nil { if err := cache.RemovePod(podsWithAffinity[i]); err != nil {
@ -1381,13 +1388,6 @@ func TestSchedulerCache_UpdateSnapshot(t *testing.T) {
}, },
expected: []*v1.Node{nodes[6], nodes[5], nodes[2], nodes[0]}, expected: []*v1.Node{nodes[6], nodes[5], nodes[2], nodes[0]},
}, },
{
name: "Remove non-existing node",
operations: []operation{
addNode(0), addNode(1), updateSnapshot(),
},
expected: []*v1.Node{nodes[1], nodes[0]},
},
{ {
name: "Update some nodes", name: "Update some nodes",
operations: []operation{ operations: []operation{
@ -1444,11 +1444,19 @@ func TestSchedulerCache_UpdateSnapshot(t *testing.T) {
expected: []*v1.Node{nodes[0], nodes[4], nodes[2]}, expected: []*v1.Node{nodes[0], nodes[4], nodes[2]},
}, },
{ {
name: "Remove pod from non-existing node", name: "Add pod before its node",
operations: []operation{ operations: []operation{
addNode(0), addPod(0), addNode(2), updateSnapshot(), addNode(0), addPod(1), updatePod(1), addNode(1),
}, },
expected: []*v1.Node{nodes[2], nodes[0]}, expected: []*v1.Node{nodes[1], nodes[0]},
},
{
name: "Remove node before its pods",
operations: []operation{
addNode(0), addNode(1), addPod(1), addPod(11),
removeNode(1), updatePod(1), updatePod(11), removePod(1), removePod(11),
},
expected: []*v1.Node{nodes[0]},
}, },
{ {
name: "Add Pods with affinity", name: "Add Pods with affinity",