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

Merge pull request #75393 from neolit123/revert-75305-workaround_once_mutex_issue 

Revert "Speculative workaround for #74890"
pull/564/head
Kubernetes Prow Robot 2019-03-15 18:18:57 -07:00 committed by GitHub
parent df2094b3d7 4eabc1cc16
commit f53987511d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/lifecycle/cluster_upgrade.go
View File

@ -24,7 +24,7 @@ import (
"path/filepath"
"regexp"
"strings"
"sync/atomic"
"sync"
"time"
"k8s.io/apimachinery/pkg/util/version"
@ -434,19 +434,11 @@ type chaosMonkeyAdapter struct {
func (cma *chaosMonkeyAdapter) Test(sem *chaosmonkey.Semaphore) {
start := time.Now()
// Using an atomic with a CAS is a potential workaround for #74890.
//
// This is a speculative workaround - we are really seeing if
// this is better; if not we should revert.
//
// If it is better we should file a bug against go 1.12, and
// then revert!
var onceWithoutMutex uint32
var once sync.Once
ready := func() {
if atomic.CompareAndSwapUint32(&onceWithoutMutex, 0, 1) {
once.Do(func() {
sem.Ready()
}
})
}
defer finalizeUpgradeTest(start, cma.testReport)
defer ready()