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

Merge pull request #71170 from atlassian/rand-cleanup2

Browse Source 
Cleanup math/rand package usage
This commit is contained in:
Kubernetes Prow Robot 2019-07-01 21:33:08 -07:00 committed by GitHub
commit cdddcf9b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 144 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubelet/app/server.go
View File

@ -22,7 +22,6 @@ import (
"crypto/tls"
"errors"
"fmt"
"math/rand"
"net"
"net/http"
"net/url"
@ -728,8 +727,6 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
utilruntime.ReallyCrash = s.ReallyCrashForTesting
rand.Seed(time.Now().UnixNano())
// TODO(vmarmol): Do this through container config.
oomAdjuster := kubeDeps.OOMAdjuster
if err := oomAdjuster.ApplyOOMScoreAdj(0, int(s.OOMScoreAdj)); err != nil {

2
pkg/kubelet/dockershim/libdocker/fake_client.go
View File

@ -536,7 +536,7 @@ func (f *FakeDockerClient) normalSleep(mean, stdDev, cutOffMillis int) {
return
}
cutoff := (time.Duration)(cutOffMillis) * time.Millisecond
delay := (time.Duration)(rand.NormFloat64()*float64(stdDev)+float64(mean)) * time.Millisecond
delay := (time.Duration)(f.RandGenerator.NormFloat64()*float64(stdDev)+float64(mean)) * time.Millisecond
if delay < cutoff {
delay = cutoff
}

1
staging/src/k8s.io/client-go/tools/cache/BUILD vendored
View File

@ -15,6 +15,7 @@ go_test(
"fifo_test.go",
"heap_test.go",
"index_test.go",
"main_test.go",
"mutation_detector_test.go",
"processor_listener_test.go",
"reflector_test.go",

7
staging/src/k8s.io/client-go/tools/cache/controller_test.go vendored
View File

@ -242,16 +242,15 @@ func TestHammerController(t *testing.T) {
currentNames := sets.String{}
rs := rand.NewSource(rand.Int63())
f := fuzz.New().NilChance(.5).NumElements(0, 2).RandSource(rs)
r := rand.New(rs) // Mustn't use r and f concurrently!
for i := 0; i < 100; i++ {
var name string
var isNew bool
if currentNames.Len() == 0 || r.Intn(3) == 1 {
if currentNames.Len() == 0 || rand.Intn(3) == 1 {
f.Fuzz(&name)
isNew = true
} else {
l := currentNames.List()
name = l[r.Intn(len(l))]
name = l[rand.Intn(len(l))]
}
pod := &v1.Pod{}
@ -266,7 +265,7 @@ func TestHammerController(t *testing.T) {
source.Add(pod)
continue
}
switch r.Intn(2) {
switch rand.Intn(2) {
case 0:
currentNames.Insert(name)
source.Modify(pod)

29
staging/src/k8s.io/client-go/tools/cache/main_test.go vendored Normal file
View File

@ -0,0 +1,29 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package cache
import (
"math/rand"
"os"
"testing"
"time"
)
func TestMain(m *testing.M) {
rand.Seed(time.Now().UnixNano())
os.Exit(m.Run())
}

1
staging/src/k8s.io/client-go/tools/record/BUILD
View File

@ -35,6 +35,7 @@ go_test(
srcs = [
"event_test.go",
"events_cache_test.go",
"main_test.go",
],
embed = [":go_default_library"],
deps = [

9
staging/src/k8s.io/client-go/tools/record/event.go
View File

@ -162,17 +162,14 @@ type eventBroadcasterImpl struct {
// The return value can be ignored or used to stop recording, if desired.
// TODO: make me an object with parameterizable queue length and retry interval
func (eventBroadcaster *eventBroadcasterImpl) StartRecordingToSink(sink EventSink) watch.Interface {
// The default math/rand package functions aren't thread safe, so create a
// new Rand object for each StartRecording call.
randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
eventCorrelator := NewEventCorrelatorWithOptions(eventBroadcaster.options)
return eventBroadcaster.StartEventWatcher(
func(event *v1.Event) {
recordToSink(sink, event, eventCorrelator, randGen, eventBroadcaster.sleepDuration)
recordToSink(sink, event, eventCorrelator, eventBroadcaster.sleepDuration)
})
}
func recordToSink(sink EventSink, event *v1.Event, eventCorrelator *EventCorrelator, randGen *rand.Rand, sleepDuration time.Duration) {
func recordToSink(sink EventSink, event *v1.Event, eventCorrelator *EventCorrelator, sleepDuration time.Duration) {
// Make a copy before modification, because there could be multiple listeners.
// Events are safe to copy like this.
eventCopy := *event
@ -197,7 +194,7 @@ func recordToSink(sink EventSink, event *v1.Event, eventCorrelator *EventCorrela
// Randomize the first sleep so that various clients won't all be
// synced up if the master goes down.
if tries == 1 {
time.Sleep(time.Duration(float64(sleepDuration) * randGen.Float64()))
time.Sleep(time.Duration(float64(sleepDuration) * rand.Float64()))
} else {
time.Sleep(sleepDuration)
}

7
staging/src/k8s.io/client-go/tools/record/event_test.go
View File

@ -19,7 +19,6 @@ package record
import (
"encoding/json"
"fmt"
"math/rand"
"net/http"
"strconv"
"testing"
@ -417,7 +416,6 @@ func TestWriteEventError(t *testing.T) {
clock := clock.IntervalClock{Time: time.Now(), Duration: time.Second}
eventCorrelator := NewEventCorrelator(&clock)
randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
for caseName, ent := range table {
attempts := 0
@ -431,7 +429,7 @@ func TestWriteEventError(t *testing.T) {
},
}
ev := &v1.Event{}
recordToSink(sink, ev, eventCorrelator, randGen, 0)
recordToSink(sink, ev, eventCorrelator, 0)
if attempts != ent.attemptsWanted {
t.Errorf("case %v: wanted %d, got %d attempts", caseName, ent.attemptsWanted, attempts)
}
@ -441,7 +439,6 @@ func TestWriteEventError(t *testing.T) {
func TestUpdateExpiredEvent(t *testing.T) {
clock := clock.IntervalClock{Time: time.Now(), Duration: time.Second}
eventCorrelator := NewEventCorrelator(&clock)
randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
var createdEvent *v1.Event
@ -462,7 +459,7 @@ func TestUpdateExpiredEvent(t *testing.T) {
ev := &v1.Event{}
ev.ResourceVersion = "updated-resource-version"
ev.Count = 2
recordToSink(sink, ev, eventCorrelator, randGen, 0)
recordToSink(sink, ev, eventCorrelator, 0)
if createdEvent == nil {
t.Error("Event did not get created after patch failed")

29
staging/src/k8s.io/client-go/tools/record/main_test.go Normal file
View File

@ -0,0 +1,29 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package record
import (
"math/rand"
"os"
"testing"
"time"
)
func TestMain(m *testing.M) {
rand.Seed(time.Now().UnixNano())
os.Exit(m.Run())
}

1
staging/src/k8s.io/client-go/util/workqueue/BUILD
View File

@ -11,6 +11,7 @@ go_test(
srcs = [
"default_rate_limiters_test.go",
"delaying_queue_test.go",
"main_test.go",
"metrics_test.go",
"queue_test.go",
"rate_limiting_queue_test.go",

4
staging/src/k8s.io/client-go/util/workqueue/delaying_queue_test.go
View File

@ -216,15 +216,13 @@ func TestCopyShifting(t *testing.T) {
}
func BenchmarkDelayingQueue_AddAfter(b *testing.B) {
r := rand.New(rand.NewSource(time.Now().Unix()))
fakeClock := clock.NewFakeClock(time.Now())
q := newDelayingQueue(fakeClock, "")
// Add items
for n := 0; n < b.N; n++ {
data := fmt.Sprintf("%d", n)
q.AddAfter(data, time.Duration(r.Int63n(int64(10*time.Minute))))
q.AddAfter(data, time.Duration(rand.Int63n(int64(10*time.Minute))))
}
// Exercise item removal as well

29
staging/src/k8s.io/client-go/util/workqueue/main_test.go Normal file
View File

@ -0,0 +1,29 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package workqueue
import (
"math/rand"
"os"
"testing"
"time"
)
func TestMain(m *testing.M) {
rand.Seed(time.Now().UnixNano())
os.Exit(m.Run())
}

1
staging/src/k8s.io/legacy-cloud-providers/azure/BUILD
View File

@ -97,6 +97,7 @@ go_test(
"azure_vmss_test.go",
"azure_wrap_test.go",
"azure_zones_test.go",
"main_test.go",
],
embed = [":go_default_library"],
deps = [

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_fakes.go
View File

@ -23,7 +23,6 @@ import (
"net/http"
"strings"
"sync"
"time"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
@ -486,7 +485,6 @@ func (fNSG *fakeAzureNSGClient) List(ctx context.Context, resourceGroupName stri
}
func getRandomIPPtr() *string {
rand.Seed(time.Now().UnixNano())
return to.StringPtr(fmt.Sprintf("%d.%d.%d.%d", rand.Intn(256), rand.Intn(256), rand.Intn(256), rand.Intn(256)))
}

29
staging/src/k8s.io/legacy-cloud-providers/azure/main_test.go Normal file
View File

@ -0,0 +1,29 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package azure
import (
"math/rand"
"os"
"testing"
"time"
)
func TestMain(m *testing.M) {
rand.Seed(time.Now().UnixNano())
os.Exit(m.Run())
}

7
test/e2e/e2e_test.go
View File

@ -19,8 +19,10 @@ package e2e
import (
"flag"
"fmt"
"math/rand"
"os"
"testing"
"time"
// Never, ever remove the line with "/ginkgo". Without it,
// the ginkgo test runner will not detect that this
@ -92,6 +94,11 @@ func init() {
}
func TestMain(m *testing.M) {
rand.Seed(time.Now().UnixNano())
os.Exit(m.Run())
}
func TestE2E(t *testing.T) {
RunE2ETests(t)
}

3
test/e2e/framework/util.go
View File

@ -1344,8 +1344,7 @@ func LoadClientset() (*clientset.Clientset, error) {
// need to use such a function and can instead
// use the UUID utility function.
func RandomSuffix() string {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
return strconv.Itoa(r.Int() % 10000)
return strconv.Itoa(rand.Intn(10000))
}
// ExpectEqual expects the specified two are the same, otherwise an exception raises

1
test/e2e/network/service.go
View File

@ -1171,7 +1171,6 @@ var _ = SIGDescribe("Services", func() {
}
outOfRangeNodePort := 0
rand.Seed(time.Now().UnixNano())
for {
outOfRangeNodePort = 1 + rand.Intn(65535)
if !framework.ServiceNodePortRange.Contains(outOfRangeNodePort) {

14
test/e2e/storage/pd.go
View File

@ -18,7 +18,7 @@ package storage
import (
"fmt"
mathrand "math/rand"
"math/rand"
"strings"
"time"
@ -81,8 +81,6 @@ var _ = utils.SIGDescribe("Pod Disks", func() {
gomega.Expect(len(nodes.Items)).To(gomega.BeNumerically(">=", minNodes), fmt.Sprintf("Requires at least %d nodes", minNodes))
host0Name = types.NodeName(nodes.Items[0].ObjectMeta.Name)
host1Name = types.NodeName(nodes.Items[1].ObjectMeta.Name)
mathrand.Seed(time.Now().UnixNano())
})
ginkgo.Context("schedule pods each with a PD, delete pod and verify detach [Slow]", func() {
@ -180,7 +178,7 @@ var _ = utils.SIGDescribe("Pod Disks", func() {
ginkgo.By("writing content to host0Pod on node0")
containerName = "mycontainer"
testFile = "/testpd1/tracker"
testFileContents = fmt.Sprintf("%v", mathrand.Int())
testFileContents = fmt.Sprintf("%v", rand.Int())
framework.ExpectNoError(f.WriteFileViaContainer(host0Pod.Name, containerName, testFile, testFileContents))
e2elog.Logf("wrote %q to file %q in pod %q on node %q", testFileContents, testFile, host0Pod.Name, host0Name)
ginkgo.By("verifying PD is present in node0's VolumeInUse list")
@ -280,11 +278,11 @@ var _ = utils.SIGDescribe("Pod Disks", func() {
ginkgo.By(fmt.Sprintf("writing %d file(s) via a container", numPDs))
containerName := "mycontainer"
if numContainers > 1 {
containerName = fmt.Sprintf("mycontainer%v", mathrand.Intn(numContainers)+1)
containerName = fmt.Sprintf("mycontainer%v", rand.Intn(numContainers)+1)
}
for x := 1; x <= numPDs; x++ {
testFile := fmt.Sprintf("/testpd%d/tracker%d", x, i)
testFileContents := fmt.Sprintf("%v", mathrand.Int())
testFileContents := fmt.Sprintf("%v", rand.Int())
fileAndContentToVerify[testFile] = testFileContents
framework.ExpectNoError(f.WriteFileViaContainer(host0Pod.Name, containerName, testFile, testFileContents))
e2elog.Logf("wrote %q to file %q in pod %q (container %q) on node %q", testFileContents, testFile, host0Pod.Name, containerName, host0Name)
@ -292,7 +290,7 @@ var _ = utils.SIGDescribe("Pod Disks", func() {
ginkgo.By("verifying PD contents via a container")
if numContainers > 1 {
containerName = fmt.Sprintf("mycontainer%v", mathrand.Intn(numContainers)+1)
containerName = fmt.Sprintf("mycontainer%v", rand.Intn(numContainers)+1)
}
verifyPDContentsViaContainer(f, host0Pod.Name, containerName, fileAndContentToVerify)
@ -379,7 +377,7 @@ var _ = utils.SIGDescribe("Pod Disks", func() {
ginkgo.By("writing content to host0Pod")
testFile := "/testpd1/tracker"
testFileContents := fmt.Sprintf("%v", mathrand.Int())
testFileContents := fmt.Sprintf("%v", rand.Int())
framework.ExpectNoError(f.WriteFileViaContainer(host0Pod.Name, containerName, testFile, testFileContents))
e2elog.Logf("wrote %q to file %q in pod %q on node %q", testFileContents, testFile, host0Pod.Name, host0Name)