这是indexloc提供的服务，不要输入任何密码
Skip to content

Don't run log replay asynchronously #1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Don't run log replay asynchronously #1054

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e60e813
Don't run log replay asynchronously
Apr 14, 2022
a41ae18
Merge branch 'main' into gsoltis/sync_log_replay
Apr 14, 2022
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
28 changes: 11 additions & 17 deletions cli/internal/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"path/filepath"
"sort"
"strings"
"sync"
"text/tabwriter"
"time"

Expand Down Expand Up @@ -690,8 +689,6 @@ func (c *RunCommand) executeTasks(g *completeGraph, rs *runSpec, engine *core.Sc
c.Ui.Error(err.Error())
}

ec.logReplayWaitGroup.Wait()

if err := runState.Close(c.Ui, rs.Opts.profile); err != nil {
c.Ui.Error(fmt.Sprintf("Error with profiler: %s", err.Error()))
return 1
Expand Down Expand Up @@ -778,8 +775,7 @@ func (c *RunCommand) executeDryRun(engine *core.Scheduler, g *completeGraph, tas
}

// Replay logs will try to replay logs back to the stdout
func replayLogs(logger hclog.Logger, output cli.Ui, runOptions *RunOptions, logFileName, hash string, wg *sync.WaitGroup) {
defer wg.Done()
func replayLogs(logger hclog.Logger, output cli.Ui, runOptions *RunOptions, logFileName, hash string) {
logger.Debug("start replaying logs")
f, err := os.Open(filepath.Join(runOptions.cwd, logFileName))
if err != nil {
Expand Down Expand Up @@ -821,16 +817,15 @@ func getTargetsFromArguments(arguments []string, configJson *fs.TurboConfigJSON)
}

type execContext struct {
colorCache *ColorCache
runState *RunState
rs *runSpec
logReplayWaitGroup sync.WaitGroup
ui cli.Ui
turboCache cache.Cache
logger hclog.Logger
backend *api.LanguageBackend
processes *process.Manager
taskHashes *Tracker
colorCache *ColorCache
runState *RunState
rs *runSpec
ui cli.Ui
turboCache cache.Cache
logger hclog.Logger
backend *api.LanguageBackend
processes *process.Manager
taskHashes *Tracker
}

func (e *execContext) logError(log hclog.Logger, prefix string, err error) {
Expand Down Expand Up @@ -895,8 +890,7 @@ func (e *execContext) exec(pt *packageTask, deps dag.Set) error {
targetUi.Output(fmt.Sprintf("cache hit, suppressing output %s", ui.Dim(hash)))
case FullLogs:
if e.rs.Opts.stream && fs.FileExists(filepath.Join(e.rs.Opts.cwd, logFileName)) {
e.logReplayWaitGroup.Add(1)
go replayLogs(targetLogger, e.ui, e.rs.Opts, logFileName, hash, &e.logReplayWaitGroup)
replayLogs(targetLogger, e.ui, e.rs.Opts, logFileName, hash)
}
default:
// NoLogs, do not output anything
Expand Down