commit

Author: JkLondon

cmd/etui/app/app.go

@@ -3,6 +3,9 @@ package app
 import (
 	"context"
 	"fmt"
+	"os"
+	"path/filepath"
+	"runtime/debug"
 	"time"
 
 	"github.com/gdamore/tcell/v2"
@@ -54,10 +57,10 @@ func (a *App) Run(parent context.Context, infoCh <-chan *commands.StagesInfo, er
 		AddItem(footer, 2, 1, false)
 
 	// Start background goroutines
-	go a.fillStagesInfo(ctx, nodeView, infoCh)
-	go a.runClock(ctx, nodeView.Clock)
-	go a.handleErrors(ctx, errCh, footer)
-	go a.pollDownloader(ctx, nodeView.Downloader, errCh)
+	go a.safeGo("fillStagesInfo", errCh, func() { a.fillStagesInfo(ctx, nodeView, infoCh) })
+	go a.safeGo("runClock", errCh, func() { a.runClock(ctx, nodeView.Clock) })
+	go a.handleErrors(ctx, errCh, footer) // not wrapped — it drains errCh itself
+	go a.safeGo("pollDownloader", errCh, func() { a.pollDownloader(ctx, nodeView.Downloader, errCh) })
 
 	// Page navigation
 	currentPage, pagesCount := 0, 2
@@ -85,6 +88,33 @@ func (a *App) Run(parent context.Context, infoCh <-chan *commands.StagesInfo, er
 	return nil
 }
 
+// safeGo wraps a function with panic recovery, logging the stack to etui-crash.log
+// and sending the error to errCh for display in the TUI footer.
+func (a *App) safeGo(name string, errCh chan error, fn func()) {
+	defer func() {
+		if r := recover(); r != nil {
+			msg := fmt.Sprintf("panic in %s: %v\n%s", name, r, debug.Stack())
+			a.writeCrashLog(msg)
+			select {
+			case errCh <- fmt.Errorf("panic in %s: %v (see etui-crash.log)", name, r):
+			default:
+			}
+		}
+	}()
+	fn()
+}
+
+func (a *App) writeCrashLog(msg string) {
+	logPath := filepath.Join(a.datadir, "etui-crash.log")
+	entry := fmt.Sprintf("[%s] %s\n\n", time.Now().Format(time.RFC3339), msg)
+	f, err := os.OpenFile(logPath, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
+	if err != nil {
+		return
+	}
+	defer f.Close()
+	f.WriteString(entry)
+}
+
 // fillStagesInfo reads StagesInfo from the channel and updates the node-info view.
 func (a *App) fillStagesInfo(ctx context.Context, view *widgets.NodeInfoView, infoCh <-chan *commands.StagesInfo) {
 	for {

cmd/etui/cmd/stages.go

@@ -1,16 +1,17 @@
 package cmd
 
 import (
-	"errors"
 	"fmt"
+	"os"
+	"path/filepath"
+	"runtime/debug"
 	"time"
 
 	"github.com/spf13/cobra"
 
 	"github.com/erigontech/erigon/cmd/etui/app"
 	"github.com/erigontech/erigon/cmd/integration/commands"
 	log "github.com/erigontech/erigon/common/log/v3"
-	"github.com/erigontech/erigon/db/state"
 )
 
 var (
@@ -32,28 +33,26 @@ var infoCmd = &cobra.Command{
 			defer close(infoCh)
 			defer func() {
 				if r := recover(); r != nil {
-					println("recovered from panic: ", r)
+					msg := fmt.Sprintf("panic in InfoAllStages: %v\n%s", r, debug.Stack())
+					writeCrashLog(datadirCli, msg)
+					select {
+					case errCh <- fmt.Errorf("panic: %v (see etui-crash.log)", r):
+					default:
+					}
 				}
 			}()
-			backoff := 5 * time.Second
+			const retryInterval = 5 * time.Second
 			for {
 				err := commands.InfoAllStages(cmd.Context(), logger, datadirCli, infoCh)
 				if err == nil {
 					return
 				}
-				// Salt files missing means OtterSync is still downloading — retry
-				if !errors.Is(err, state.ErrCannotStartWithoutSaltFiles) {
-					select {
-					case errCh <- err:
-					default:
-					}
-					return
-				}
-				// Don't report to errCh — the downloader widget already shows progress.
+				// All errors are transient for etui: DB locked, salt files
+				// missing, chaindata not yet created, etc. Always retry.
 				select {
 				case <-cmd.Context().Done():
 					return
-				case <-time.After(backoff):
+				case <-time.After(retryInterval):
 				}
 			}
 		}()
@@ -65,3 +64,15 @@ var infoCmd = &cobra.Command{
 func init() {
 	infoCmd.Flags().StringVar(&datadirCli, "datadir", "", "Directory containing versioned files")
 }
+
+// writeCrashLog appends a panic message with stack trace to etui-crash.log in the datadir.
+func writeCrashLog(datadir, msg string) {
+	logPath := filepath.Join(datadir, "etui-crash.log")
+	entry := fmt.Sprintf("[%s] %s\n\n", time.Now().Format(time.RFC3339), msg)
+	f, err := os.OpenFile(logPath, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
+	if err != nil {
+		return
+	}
+	defer f.Close()
+	f.WriteString(entry)
+}

cmd/integration/commands/root.go

@@ -99,7 +99,10 @@ func openDB(opts kv2.MdbxOpts, applyMigrations bool, chain string, logger log.Lo
 		panic(opts.GetLabel())
 	}
 
-	rawDB := opts.MustOpen()
+	rawDB, err := opts.Open(context.Background())
+	if err != nil {
+		return nil, fmt.Errorf("open chaindata: %w", err)
+	}
 	if applyMigrations {
 		dirs := datadir.New(datadirCli)
 		migrationsDB, err := migrations.OpenMigrationsDB(dirs.Migrations, logger)

cmd/integration/commands/stages_info.go

@@ -278,7 +278,8 @@ func InfoAllStages(ctx context.Context, logger log.Logger, dataDirPath string, i
 
 	opts := kv2.New(dbcfg.ChainDB, logger).
 		Path(chainDataPath).
-		Accede(true) // open read-only, don't create
+		Accede(true).
+		Readonly(true) // open read-only so etui can coexist with running erigon
 
 	db, err := openDB(opts, false, "", logger)
 	if err != nil {