Cleanup math/rand package usage

This commit is contained in:
Mikhail Mazurskiy 2018-11-17 16:45:36 +11:00
parent 01f6e684b2
commit 4ce1fb7d40
No known key found for this signature in database
GPG Key ID: 93551ECC96E2F568
14 changed files with 83 additions and 35 deletions

View File

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

View File

@ -536,7 +536,7 @@ func (f *FakeDockerClient) normalSleep(mean, stdDev, cutOffMillis int) {
return return
} }
cutoff := (time.Duration)(cutOffMillis) * time.Millisecond 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 { if delay < cutoff {
delay = cutoff delay = cutoff
} }

View File

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

View File

@ -162,17 +162,14 @@ type eventBroadcasterImpl struct {
// The return value can be ignored or used to stop recording, if desired. // 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 // TODO: make me an object with parameterizable queue length and retry interval
func (eventBroadcaster *eventBroadcasterImpl) StartRecordingToSink(sink EventSink) watch.Interface { 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) eventCorrelator := NewEventCorrelatorWithOptions(eventBroadcaster.options)
return eventBroadcaster.StartEventWatcher( return eventBroadcaster.StartEventWatcher(
func(event *v1.Event) { 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. // Make a copy before modification, because there could be multiple listeners.
// Events are safe to copy like this. // Events are safe to copy like this.
eventCopy := *event 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 // Randomize the first sleep so that various clients won't all be
// synced up if the master goes down. // synced up if the master goes down.
if tries == 1 { if tries == 1 {
time.Sleep(time.Duration(float64(sleepDuration) * randGen.Float64())) time.Sleep(time.Duration(float64(sleepDuration) * rand.Float64()))
} else { } else {
time.Sleep(sleepDuration) time.Sleep(sleepDuration)
} }

View File

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

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())
}

View File

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

View File

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

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())
}

View File

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

View File

@ -19,8 +19,10 @@ package e2e
import ( import (
"flag" "flag"
"fmt" "fmt"
"math/rand"
"os" "os"
"testing" "testing"
"time"
// Never, ever remove the line with "/ginkgo". Without it, // Never, ever remove the line with "/ginkgo". Without it,
// the ginkgo test runner will not detect that this // 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) { func TestE2E(t *testing.T) {
RunE2ETests(t) RunE2ETests(t)
} }

View File

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

View File

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

View File

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