From 23b46fa6e60551c4010be5ef302ee583c7d64010 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Fri, 20 Sep 2024 22:03:54 +0700 Subject: [PATCH] Remove `--sync.loop.prune.limit` flag (#12051) --- eth/ethconfig/config.go | 2 -- turbo/app/snapshots_cmd.go | 4 ---- turbo/cli/default_flags.go | 1 - turbo/cli/flags.go | 10 ---------- 4 files changed, 17 deletions(-) diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index f5dc0c86f40..fca80e7df87 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -78,7 +78,6 @@ var Defaults = Config{ BodyCacheLimit: 256 * 1024 * 1024, BodyDownloadTimeoutSeconds: 2, //LoopBlockLimit: 100_000, - PruneLimit: 100, ParallelStateFlushing: true, }, Ethash: ethashcfg.Config{ @@ -270,7 +269,6 @@ type Sync struct { BodyCacheLimit datasize.ByteSize BodyDownloadTimeoutSeconds int // TODO: change to duration - PruneLimit int //the maximum records to delete from the DB during pruning BreakAfterStage string LoopBlockLimit uint ParallelStateFlushing bool diff --git a/turbo/app/snapshots_cmd.go b/turbo/app/snapshots_cmd.go index 7d19c77ec5a..52086f86410 100644 --- a/turbo/app/snapshots_cmd.go +++ b/turbo/app/snapshots_cmd.go @@ -171,10 +171,6 @@ var snapshotCommand = cli.Command{ ctx.Set(erigoncli.FrozenBlockLimitFlag.Name, "1500000") } - if !ctx.IsSet(erigoncli.SyncLoopPruneLimitFlag.Name) { - ctx.Set(erigoncli.SyncLoopPruneLimitFlag.Name, "100000") - } - return nil }, }, diff --git a/turbo/cli/default_flags.go b/turbo/cli/default_flags.go index f4f8dfcafbf..c2b835013e4 100644 --- a/turbo/cli/default_flags.go +++ b/turbo/cli/default_flags.go @@ -227,6 +227,5 @@ var DefaultFlags = []cli.Flag{ &utils.TxPoolGossipDisableFlag, &SyncLoopBlockLimitFlag, &SyncLoopBreakAfterFlag, - &SyncLoopPruneLimitFlag, &SyncParallelStateFlushing, } diff --git a/turbo/cli/flags.go b/turbo/cli/flags.go index 4c7822b1776..bd250300f0a 100644 --- a/turbo/cli/flags.go +++ b/turbo/cli/flags.go @@ -138,12 +138,6 @@ var ( Value: "", } - SyncLoopPruneLimitFlag = cli.UintFlag{ - Name: "sync.loop.prune.limit", - Usage: "Sets the maximum number of block to prune per loop iteration", - Value: 100, - } - SyncLoopBreakAfterFlag = cli.StringFlag{ Name: "sync.loop.break.after", Usage: "Sets the last stage of the sync loop to run", @@ -349,10 +343,6 @@ func ApplyFlagsForEthConfig(ctx *cli.Context, cfg *ethconfig.Config, logger log. cfg.Sync.LoopThrottle = syncLoopThrottle } - if limit := ctx.Uint(SyncLoopPruneLimitFlag.Name); limit > 0 { - cfg.Sync.PruneLimit = int(limit) - } - if stage := ctx.String(SyncLoopBreakAfterFlag.Name); len(stage) > 0 { cfg.Sync.BreakAfterStage = stage }