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

Merge pull request #14593 from mesosphere/jdef-fix511-flaky-proc-test 

MESOS: fix test flake in TestProcWithExceededActionQueueDepth
pull/6/head
Brendan Burns 2015-09-29 19:29:05 -07:00
parent 665a2807ee f75a4d914a
commit fe9d8f50c1
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/mesos/pkg/proc/once.go
View File

@ -55,12 +55,22 @@ func (b *errorOnce) Report(err error) {
} }
func (b *errorOnce) Send(errIn <-chan error) ErrorOnce { func (b *errorOnce) Send(errIn <-chan error) ErrorOnce {
go b.forward(errIn) if errIn == nil {
// don't execute this in a goroutine; save resources AND the caller
// likely wants this executed ASAP because some of some operation
// ordering semantics. forward() will not block here on a nil input
// so this is safe to do.
b.forward(nil)
} else {
go b.forward(errIn)
}
return b return b
} }
func (b *errorOnce) forward(errIn <-chan error) { func (b *errorOnce) forward(errIn <-chan error) {
if errIn == nil { if errIn == nil {
// important: nil never blocks; Report(nil) is guaranteed to be a
// non-blocking operation.
b.Report(nil) b.Report(nil)
return return
} }

13
contrib/mesos/pkg/proc/proc_test.go
View File

@ -131,7 +131,7 @@ func TestProc_multiAction(t *testing.T) {
defer called.Done() defer called.Done()
log.Infof("deferred action invoked") log.Infof("deferred action invoked")
if next != idx { if next != idx {
t.Fatalf("expected index %d instead of %d", idx, next) t.Errorf("expected index %d instead of %d", idx, next)
} }
next++ next++
}) })
@ -181,7 +181,7 @@ func TestProc_doWith(t *testing.T) {
err := decorated.Do(func() { err := decorated.Do(func() {
defer close(executed) defer close(executed)
if !delegated { if !delegated {
t.Fatalf("expected delegated execution") t.Errorf("expected delegated execution")
} }
}) })
if err == nil { if err == nil {
@ -215,7 +215,7 @@ func TestProc_doWithNestedTwice(t *testing.T) {
err := decorated2.Do(func() { err := decorated2.Do(func() {
defer close(executed) defer close(executed)
if !delegated { if !delegated {
t.Fatalf("expected delegated execution") t.Errorf("expected delegated execution")
} }
}) })
if err == nil { if err == nil {
@ -254,7 +254,7 @@ func TestProc_doWithNestedErrorPropagation(t *testing.T) {
errCh := decorated2.Do(func() { errCh := decorated2.Do(func() {
defer close(executed) defer close(executed)
if !delegated { if !delegated {
t.Fatalf("expected delegated execution") t.Errorf("expected delegated execution")
} }
errOnce.Report(expectedErr) errOnce.Report(expectedErr)
}) })
@ -333,6 +333,9 @@ func runDelegationTest(t *testing.T, p Process, name string, errOnce ErrorOnce)
<-executed <-executed
t.Logf("runDelegationTest received executed signal at " + time.Now().String()) t.Logf("runDelegationTest received executed signal at " + time.Now().String())
wg.Wait()
t.Logf("runDelegationTest nested decorators finished at " + time.Now().String())
} }
func TestProc_doWithNestedX(t *testing.T) { func TestProc_doWithNestedX(t *testing.T) {
@ -367,7 +370,7 @@ func TestProc_doWithNestedXConcurrent(t *testing.T) {
go func() { go func() {
err, _ := <-errOnce.Err() err, _ := <-errOnce.Err()
if err != nil { if err != nil {
t.Fatalf("delegate %d: unexpected error: %v", i, err) t.Errorf("delegate %d: unexpected error: %v", i, err)
} }
}() }()
} }