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
79 changes: 63 additions & 16 deletions cmd/utils/app/snapshots_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -2936,29 +2936,67 @@ func doIndicesCommand(cliCtx *cli.Context, dirs datadir.Dirs) error {
return nil
}
func doLS(cliCtx *cli.Context, dirs datadir.Dirs) error {
logger := log.Root()
return lsDatadir(cliCtx.Context, dirs, log.Root())
}

func lsDatadir(ctx context.Context, dirs datadir.Dirs, logger log.Logger) error {
defer logger.Info("Done")
ctx := cliCtx.Context

chainDB := dbCfg(dbcfg.ChainDB, dirs.Chaindata).MustOpen()
defer chainDB.Close()
cfg := ethconfig.NewSnapCfg(false, true, true, fromdb.ChainConfig(chainDB).ChainName)
chainDB, chainName := tryOpenChaindata(ctx, dirs, logger)
if chainDB != nil {
defer chainDB.Close()
}

res, clean, err := openSnaps(ctx, cfg, dirs, chainDB, logger)
blockSnaps, borSnaps, caplinSnaps, agg := res.BlockSnaps, res.BorSnaps, res.CaplinSnaps, res.Aggregator
if err != nil {
cfg := ethconfig.NewSnapCfg(false, true, true, chainName)

blockSnaps := freezeblocks.NewRoSnapshots(cfg, dirs.Snap, logger)
if err := blockSnaps.OpenFolder(); err != nil {
return err
}
defer clean()

defer blockSnaps.Close()
blockSnaps.Ls()

heimdall.RecordWayPoints(true) // needed to load checkpoints and milestones snapshots
borSnaps := heimdall.NewRoSnapshots(cfg, dirs.Snap, logger)
if err := borSnaps.OpenFolder(); err != nil {
return err
}
defer borSnaps.Close()
borSnaps.Ls()
caplinSnaps.LS()
agg.LS()

if agg, err := tryOpenAgg(ctx, dirs, chainDB, logger); err == nil {
defer agg.Close()
agg.LS()
} else {
logger.Info("state aggregator unavailable, skipping", "reason", err)
}

if chainName != "" {
if _, beaconConfig, _, err := clparams.GetConfigsByNetworkName(chainName); err == nil {
caplinSnaps := freezeblocks.NewCaplinSnapshots(cfg, beaconConfig, dirs, logger)
if err := caplinSnaps.OpenFolder(); err == nil {
defer caplinSnaps.Close()
caplinSnaps.LS()
}
}
}

return nil
}

func tryOpenChaindata(ctx context.Context, dirs datadir.Dirs, logger log.Logger) (kv.RwDB, string) {
if _, err := os.Stat(dirs.Chaindata); err != nil {
logger.Info("chaindata unavailable, using filesystem-only listing", "reason", err)
return nil, ""
}
db, err := dbCfg(dbcfg.ChainDB, dirs.Chaindata).Open(ctx)
if err != nil {
logger.Info("chaindata unavailable, using filesystem-only listing", "reason", err)
return nil, ""
}
return db, fromdb.ChainConfig(db).ChainName
}

type OpenSnapsResult struct {
BlockSnaps *freezeblocks.RoSnapshots
BorSnaps *heimdall.RoSnapshots
Expand Down Expand Up @@ -3585,18 +3623,27 @@ func dbCfg(label kv.Label, path string) mdbx.MdbxOpts {
Accede(true) // integration tool: open db without creation and without blocking erigon
}
func openAgg(ctx context.Context, dirs datadir.Dirs, chainDB kv.RwDB, logger log.Logger) *state.Aggregator {
erigonDBSettings, err := state.ResolveErigonDBSettings(dirs, logger, false)
agg, err := tryOpenAgg(ctx, dirs, chainDB, logger)
if err != nil {
panic(err)
}
return agg
}

func tryOpenAgg(ctx context.Context, dirs datadir.Dirs, chainDB kv.RwDB, logger log.Logger) (*state.Aggregator, error) {
erigonDBSettings, err := state.ResolveErigonDBSettings(dirs, logger, false)
if err != nil {
return nil, err
}
agg, err := state.New(dirs).SanityOldNaming().Logger(logger).WithErigonDBSettings(erigonDBSettings).Open(ctx, chainDB)
if err != nil {
panic(err)
return nil, err
}
if err = agg.OpenFolder(); err != nil {
panic(err)
agg.Close()
return nil, err
}
return agg
return agg, nil
}

// ── du (disk usage) helpers ─────────────────────────────────────────────
Expand Down
7 changes: 7 additions & 0 deletions cmd/utils/app/snapshots_cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ package app

import (
"bytes"
"context"
"encoding/json"
"os"
"path/filepath"
"strings"
"testing"

"github.com/erigontech/erigon/common/log/v3"
"github.com/erigontech/erigon/db/datadir"
"github.com/erigontech/erigon/db/kv"
"github.com/erigontech/erigon/db/state"
Expand All @@ -38,6 +40,11 @@ type bundle struct {

type RootNum = kv.RootNum

func TestSegLS_NoChaindata(t *testing.T) {
dirs := datadir.New(t.TempDir())
require.NoError(t, lsDatadir(context.Background(), dirs, log.New()))
}

func Test_DeleteLatestStateSnaps(t *testing.T) {
dirs := datadir.New(t.TempDir())
b := bundle{}
Expand Down
Loading