Skip to content

K
k3s
Unverified Commit 4eabc1cc authored by Lubomir I. Ivanov's avatar Lubomir I. Ivanov Committed by GitHub
Browse files
Options

Revert "Speculative workaround for #74890"

parent d5a3db00
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
test/e2e/lifecycle/cluster_upgrade.go
View file @ 4eabc1cc
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings" "strings"
"sync/atomic" "sync"
"time" "time"
"k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/version"
...@@ -434,19 +434,11 @@ type chaosMonkeyAdapter struct { ...@@ -434,19 +434,11 @@ type chaosMonkeyAdapter struct {
func (cma *chaosMonkeyAdapter) Test(sem *chaosmonkey.Semaphore) { func (cma *chaosMonkeyAdapter) Test(sem *chaosmonkey.Semaphore) {
start := time.Now() start := time.Now()
var once sync.Once
// 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
ready := func() { ready := func() {
if atomic.CompareAndSwapUint32(&onceWithoutMutex, 0, 1) { once.Do(func() {
sem.Ready() sem.Ready()
} })
} }
defer finalizeUpgradeTest(start, cma.testReport) defer finalizeUpgradeTest(start, cma.testReport)
defer ready() defer ready()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment