github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #49491 from eparis/make-plus-append-is-bad 

Automatic merge from submit-queue (batch tested with PRs 49898, 49897, 49919, 48860, 49491)

Fix usage a make(struct, len()) followed by append()

A couple of places in the code we allocate with make() but then use
append(), instead of copy() or direct assignment. This results in a
slice with len() zero elements at the front followed by the expected
data. The correct form for such usage is `make(struct, 0, len())`.

I found these by running:
```
$ git grep -EI -A7 'make\([^,]*, len\(' | grep 'append(' -B7 | grep -v vendor
```
And then manually looking through the results. I'm sure something better
could exist.

**Release note**:
```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-08-01 17:57:20 -07:00 committed by GitHub
parent bcb78ad1ce 5e22e149c5
commit 23bb765498
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/statefulset/stateful_pod_control_test.go
View File

@ -282,7 +282,7 @@ func TestStatefulPodControlUpdatesPodStorage(t *testing.T) {
pvcLister := corelisters.NewPersistentVolumeClaimLister(pvcIndexer) pvcLister := corelisters.NewPersistentVolumeClaimLister(pvcIndexer)
control := NewRealStatefulPodControl(fakeClient, nil, nil, pvcLister, recorder) control := NewRealStatefulPodControl(fakeClient, nil, nil, pvcLister, recorder)
pvcs := getPersistentVolumeClaims(set, pod) pvcs := getPersistentVolumeClaims(set, pod)
volumes := make([]v1.Volume, len(pod.Spec.Volumes)) volumes := make([]v1.Volume, 0, len(pod.Spec.Volumes))
for i := range pod.Spec.Volumes { for i := range pod.Spec.Volumes {
if _, contains := pvcs[pod.Spec.Volumes[i].Name]; !contains { if _, contains := pvcs[pod.Spec.Volumes[i].Name]; !contains {
volumes = append(volumes, pod.Spec.Volumes[i]) volumes = append(volumes, pod.Spec.Volumes[i])
@ -329,7 +329,7 @@ func TestStatefulPodControlUpdatePodStorageFailure(t *testing.T) {
pvcLister := corelisters.NewPersistentVolumeClaimLister(pvcIndexer) pvcLister := corelisters.NewPersistentVolumeClaimLister(pvcIndexer)
control := NewRealStatefulPodControl(fakeClient, nil, nil, pvcLister, recorder) control := NewRealStatefulPodControl(fakeClient, nil, nil, pvcLister, recorder)
pvcs := getPersistentVolumeClaims(set, pod) pvcs := getPersistentVolumeClaims(set, pod)
volumes := make([]v1.Volume, len(pod.Spec.Volumes)) volumes := make([]v1.Volume, 0, len(pod.Spec.Volumes))
for i := range pod.Spec.Volumes { for i := range pod.Spec.Volumes {
if _, contains := pvcs[pod.Spec.Volumes[i].Name]; !contains { if _, contains := pvcs[pod.Spec.Volumes[i].Name]; !contains {
volumes = append(volumes, pod.Spec.Volumes[i]) volumes = append(volumes, pod.Spec.Volumes[i])

6
test/e2e/framework/resource_usage_gatherer.go
View File

@ -83,9 +83,9 @@ func computePercentiles(timeSeries []ResourceUsagePerContainer, percentilesToCom
for name, data := range timeSeries[i] { for name, data := range timeSeries[i] {
if dataMap[name] == nil { if dataMap[name] == nil {
dataMap[name] = &usageDataPerContainer{ dataMap[name] = &usageDataPerContainer{
cpuData: make([]float64, len(timeSeries)), cpuData: make([]float64, 0, len(timeSeries)),
memUseData: make([]uint64, len(timeSeries)), memUseData: make([]uint64, 0, len(timeSeries)),
memWorkSetData: make([]uint64, len(timeSeries)), memWorkSetData: make([]uint64, 0, len(timeSeries)),
} }
} }
dataMap[name].cpuData = append(dataMap[name].cpuData, data.CPUUsageInCores) dataMap[name].cpuData = append(dataMap[name].cpuData, data.CPUUsageInCores)