github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

delete the hostport from usedmap

Browse Source
This commit is contained in:
chenxingyu 2017-10-25 15:41:04 +08:00
parent c0a519be1f
commit 195de933f1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/scheduler/schedulercache/cache_test.go
View File

@ -228,7 +228,7 @@ func TestExpirePod(t *testing.T) {
}, },
allocatableResource: &Resource{}, allocatableResource: &Resource{},
pods: []*v1.Pod{testPods[1]}, pods: []*v1.Pod{testPods[1]},
usedPorts: map[int]bool{80: false, 8080: true}, usedPorts: map[int]bool{8080: true},
}, },
}} }}
@ -277,7 +277,7 @@ func TestAddPodWillConfirm(t *testing.T) {
}, },
allocatableResource: &Resource{}, allocatableResource: &Resource{},
pods: []*v1.Pod{testPods[0]}, pods: []*v1.Pod{testPods[0]},
usedPorts: map[int]bool{80: true, 8080: false}, usedPorts: map[int]bool{80: true},
}, },
}} }}

6
plugin/pkg/scheduler/schedulercache/node_info.go
View File

@ -403,7 +403,11 @@ func (n *NodeInfo) updateUsedPorts(pod *v1.Pod, used bool) {
// "0" is explicitly ignored in PodFitsHostPorts, // "0" is explicitly ignored in PodFitsHostPorts,
// which is the only function that uses this value. // which is the only function that uses this value.
if podPort.HostPort != 0 { if podPort.HostPort != 0 {
n.usedPorts[int(podPort.HostPort)] = used if used {
n.usedPorts[int(podPort.HostPort)] = used
} else {
delete(n.usedPorts, int(podPort.HostPort))
}
} }
} }
} }