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

move all variables in sampleAndWaterMarkHistograms::innerSet

Browse Source 
to tiptoe around https://github.com/golang/go/issues/43570 for #97685
This commit is contained in:
Mike Spreitzer 2021-01-08 13:32:38 -05:00
parent b959f01c5a
commit 611184aa59
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics/sample_and_watermark.go
View File

@ -160,17 +160,14 @@ func (saw *sampleAndWaterMarkHistograms) SetX1(x1 float64) {
} }
func (saw *sampleAndWaterMarkHistograms) innerSet(updateXOrX1 func()) { func (saw *sampleAndWaterMarkHistograms) innerSet(updateXOrX1 func()) {
var when time.Time when, whenInt, acc, wellOrdered := func() (time.Time, int64, sampleAndWaterMarkAccumulator, bool) {
var whenInt int64
var acc sampleAndWaterMarkAccumulator
var wellOrdered bool
func() {
saw.Lock() saw.Lock()
defer saw.Unlock() defer saw.Unlock()
when = saw.clock.Now() // Moved these variables here to tiptoe around https://github.com/golang/go/issues/43570 for #97685
whenInt = saw.quantize(when) when := saw.clock.Now()
acc = saw.sampleAndWaterMarkAccumulator whenInt := saw.quantize(when)
wellOrdered = !when.Before(acc.lastSet) acc := saw.sampleAndWaterMarkAccumulator
wellOrdered := !when.Before(acc.lastSet)
updateXOrX1() updateXOrX1()
saw.relX = saw.x / saw.x1 saw.relX = saw.x / saw.x1
if wellOrdered { if wellOrdered {
@ -195,6 +192,7 @@ func (saw *sampleAndWaterMarkHistograms) innerSet(updateXOrX1 func()) {
} else if saw.relX > saw.hiRelX { } else if saw.relX > saw.hiRelX {
saw.hiRelX = saw.relX saw.hiRelX = saw.relX
} }
return when, whenInt, acc, wellOrdered
}() }()
if !wellOrdered { if !wellOrdered {
lastSetS := acc.lastSet.String() lastSetS := acc.lastSet.String()