Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/cmd/roachtest/roachtestutil/task/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ func (t *group) GoWithCancel(fn Func, opts ...Option) context.CancelFunc {
t.ctxGroup.Go(func() error {
l, err := opt.L(opt.Name)
if err != nil {
return err
t.manager.logger.Errorf("WARN: defaulting to root logger after failing to create logger for task %q: %v", opt.Name, err)
l = t.manager.logger
}
err = internalFunc(l)
event := Event{
Expand Down
34 changes: 34 additions & 0 deletions pkg/cmd/roachtest/roachtestutil/task/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package task

import (
"bytes"
"context"
"io"
"sync"
Expand Down Expand Up @@ -38,6 +39,39 @@ func TestPanicHandler(t *testing.T) {
m.Terminate(nilLogger())
}

func TestLoggerFallback(t *testing.T) {
defer leaktest.AfterTest(t)()

stdoutBuf := &bytes.Buffer{}
stderrBuf := &bytes.Buffer{}
loggerConf := logger.Config{
Stdout: stdoutBuf,
Stderr: stderrBuf,
}
rootLogger, err := loggerConf.NewLogger("" /* path */)
if err != nil {
panic(err)
}

ctx := context.Background()
m := NewManager(ctx, rootLogger)

brokenLoggerSupplierFunc := func(name string) (*logger.Logger, error) {
return nil, errors.New("logger error")
}

m.Go(func(ctx context.Context, l *logger.Logger) error {
l.Printf("this should be logged to the root logger")
return nil
}, LoggerFunc(brokenLoggerSupplierFunc), Name("def"))

e := <-m.CompletedEvents()
require.Equal(t, "def", e.Name)
require.Contains(t, stderrBuf.String(), "logger error")
require.Contains(t, stdoutBuf.String(), "this should be logged to the root logger")
m.Terminate(nilLogger())
}

func TestErrorHandler(t *testing.T) {
defer leaktest.AfterTest(t)()
ctx := context.Background()
Expand Down