core/rawdb: integrate eradb backend for RPC #31604

s1na · 2025-04-10T13:42:36Z

Implements #31279

MariusVanDerWijden · 2025-04-17T20:12:31Z

cmd/geth/chaincmd.go

@@ -237,7 +237,7 @@ func initGenesis(ctx *cli.Context) error {
 		overrides.OverrideVerkle = &v
 	}

-	chaindb, err := stack.OpenDatabaseWithFreezer("chaindata", 0, 0, ctx.String(utils.AncientFlag.Name), "", false)
+	chaindb, err := stack.OpenDatabaseWithFreezer("chaindata", 0, 0, ctx.String(utils.AncientFlag.Name), "", false, "")


We should probably make this a config struct

core/rawdb/freezer.go

rjl493456442 · 2025-04-18T09:22:28Z

Twist the era path resolution a bit:

use ancient/chain/era if era is not explicitly specified;
use ancient/chain/relative-path if era is specified;
use itself if the specified path is an absolute path

rjl493456442 · 2025-04-18T09:23:34Z

core/rawdb/chain_freezer.go

+		return f.eradb.GetRawReceipts(number)
+	}
+	return nil, errUnknownTable
+}


TODO (sina and gary)

We should support AncientRange as well

Created a ticket for it for a future PR

s1na · 2025-05-14T12:42:41Z

common/lru/basiclru.go

+}
+
+// Add3 adds a value to the cache. If an item was evicted to store the new one, it returns the evicted item.
+func (c *BasicLRU[K, V]) Add3(key K, value V) (ek K, ev V, evicted bool) {


Can we at least use Add2 for name? :))

tests/testdata

lightclient · 2025-05-28T21:02:17Z

cmd/utils/flags.go

+		Name:     "datadir.era",
+		Usage:    "Root directory for era1 history (default = inside ancient/chain)",
+		Category: flags.EthCategory,
+	}


Should we also check Era flag isn't used with --datadir="" since it will silently disregard the era directory?

lightclient

Overall this looks really great. I was able to prune my mainnet node, download the era files with the downloader, then pass the workload tests.

--

One question is this PR is trying to load Era files from ancient/chain/era, but the downloaded stores them in ancient/era. Which is best?

I also pushed one small commit to remove some old uses of the non-pass through accessors on ancients.

lightclient · 2025-05-29T16:16:36Z

cmd/utils/flags.go

@@ -111,6 +111,11 @@ var (
 		Usage:    "Root directory for ancient data (default = inside chaindata)",
 		Category: flags.EthCategory,
 	}
+	EraFlag = &flags.DirectoryFlag{
+		Name:     "datadir.era",


Also, do you think in the future this flag will also work for full era or e2hs files? If not, maybe we should be more specific with the name as "era1"? Otherwise Era is good.

lightclient · 2025-05-29T16:18:42Z

cmd/utils/flags.go

@@ -111,6 +111,11 @@ var (
 		Usage:    "Root directory for ancient data (default = inside chaindata)",
 		Category: flags.EthCategory,
 	}
+	EraFlag = &flags.DirectoryFlag{
+		Name:     "datadir.era",
+		Usage:    "Root directory for era1 history (default = inside ancient/chain)",


Suggested change

Usage: "Root directory for era1 history (default = inside ancient/chain)",

Usage: "Root directory for era1 history (default = inside ancient)",

It looks like the root directory actually ends up being ancient when you run geth download-era, is this okay or should we actually fix it put the era files in ancient/chain/era ?

lightclient · 2025-05-29T20:59:01Z

core/rawdb/eradb/eradb.go

+	entry.err = err
+}
+
+func (db *Store) openEraFile(epoch uint64) (*era.Era, error) {


lightclient · 2025-05-29T20:59:08Z

core/rawdb/eradb/eradb.go

+	}
+}
+
+func (entry *fileCacheEntry) derefAndClose(epoch uint64) (closed bool) {


It's best to avoid callbacks, especially in the locked variant of the LRU, since it can lead to weird bugs.

This changes the file cache to avoid some issues around file closing. With the new logic, a file will never be closed while it is still in use on any goroutine accessing the era store. To do this, we maintain a reference counter for each file. The new cache also explicitly tracks files which are being opened. This ensures that 'replacing' a file in the cache cannot happen.

This removes the use of atomic reference counters in favor of using a scheme where all changes to reference counters are done while holding the Store mutex. Store.Close now synchronizes with all running accesses and waits until all files have been closed before returning.

We don't use it anywhere.

This adds a new constructor for the database+freezer that takes named parameters via a struct. Calls to NewDatabaseWithFreezer are replaced across the codebase.

This implements a backing store for chain history based on era1 files. The new store is integrated with the freezer. Queries for blocks and receipts below the current freezer tail are handled by the era store. --------- Co-authored-by: Gary Rong <[email protected]> Co-authored-by: Felix Lange <[email protected]> Co-authored-by: lightclient <[email protected]> Signed-off-by: jsvisa <[email protected]>

fjl added this to the 1.15.9 milestone Apr 15, 2025

rjl493456442 self-assigned this Apr 15, 2025

s1na marked this pull request as ready for review April 17, 2025 08:28

s1na requested review from fjl, lightclient and rjl493456442 as code owners April 17, 2025 08:28

s1na changed the title ~~WIP: integrate eradb backend for RPC~~ core/rawdb: integrate eradb backend for RPC Apr 17, 2025

MariusVanDerWijden reviewed Apr 17, 2025

View reviewed changes

rjl493456442 reviewed Apr 18, 2025

View reviewed changes

core/rawdb/freezer.go Outdated Show resolved Hide resolved

rjl493456442 reviewed Apr 18, 2025

View reviewed changes

rjl493456442 previously approved these changes Apr 18, 2025

View reviewed changes

s1na mentioned this pull request Apr 18, 2025

Support AncientRange for the eradb #31670

Open

MariusVanDerWijden modified the milestones: 1.15.9, 1.15.10 Apr 23, 2025

fjl modified the milestones: 1.15.10, 1.15.11 Apr 25, 2025

fjl modified the milestones: 1.15.11, 1.15.12 May 5, 2025

fjl dismissed rjl493456442’s stale review via 11f9027 May 12, 2025 17:23

s1na commented May 14, 2025

View reviewed changes

fjl force-pushed the eradb branch from 58d673a to 518accc Compare May 23, 2025 22:20

fjl unassigned rjl493456442 May 27, 2025

lightclient self-assigned this May 27, 2025

MariusVanDerWijden reviewed May 28, 2025

View reviewed changes

tests/testdata Outdated Show resolved Hide resolved

lightclient reviewed May 28, 2025

View reviewed changes

lightclient reviewed May 29, 2025

View reviewed changes

s1na added 3 commits May 29, 2025 15:28

core/rawdb: scaffold era database

228e410

use glob instead of scanning

583837b

import errors

a474c1c

s1na and others added 26 commits May 29, 2025 15:28

fix lint

ff11e10

core/rawdb: move erdb integration into chain freezer

d65c465

core/rawdb, node: fix era path resolution

6a5e0b4

core/rawdb/eradb: slim down the testdata

7711484

eth/ethconfig: fix config gen

2e99333

common/lru: remove callbacks

f65f948

It's best to avoid callbacks, especially in the locked variant of the LRU, since it can lead to weird bugs.

core/rawdb: remove close error

609aa43

core/rawdb/eradb: rename EraDatabase -> Store

0b91cfe

core/rawdb/eradb: do not create era store on startup

1c64c74

common/lru: shorten return names

b04157f

core/rawdb/eradb: remove a comment

d31daab

core/rawdb: move type

c84e977

core/rawdb/eradb: remove symlink check

4bdf296

fixes

477bbf1

core/rawdb/eradb: convert block receipts on access

52464bf

core/rawdb, ethdb: remove HasAncient

cc914b4

We don't use it anywhere.

core/rawdb: un-embed freezer instance in chainFreezer

9b1b2f6

core/rawdb: add Open function and OpenOptions struct

7b23760

This adds a new constructor for the database+freezer that takes named parameters via a struct. Calls to NewDatabaseWithFreezer are replaced across the codebase.

node: new function OpenDatabaseWithOptions

f8653e4

core/rawdb: remove unused method has()

0c1f71d

node: force opening freezer

436aac3

node, core/rawdb: fix ancients, era resolve

7c130b7

tests/testdata: revert

102bd99

core/rawdb: use help functions on ancients

809f2e1

lightclient force-pushed the eradb branch from 46d290e to 809f2e1 Compare May 29, 2025 21:29

core/rawdb/eradb: add godoc comment on derefAndClose

0874d70

fjl merged commit a7d9b52 into ethereum:master Jun 3, 2025
3 of 4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

core/rawdb: integrate eradb backend for RPC #31604

core/rawdb: integrate eradb backend for RPC #31604

s1na commented Apr 10, 2025

Uh oh!

MariusVanDerWijden Apr 17, 2025

Uh oh!

Uh oh!

rjl493456442 commented Apr 18, 2025

Uh oh!

rjl493456442 Apr 18, 2025

Uh oh!

s1na Apr 18, 2025

Uh oh!

s1na May 14, 2025

Uh oh!

Uh oh!

lightclient May 28, 2025

Uh oh!

lightclient left a comment •

edited

Loading

Uh oh!

lightclient May 29, 2025

Uh oh!

lightclient May 29, 2025

Uh oh!

lightclient May 29, 2025

Uh oh!

lightclient May 29, 2025

Uh oh!

Uh oh!

Uh oh!

	Usage: "Root directory for era1 history (default = inside ancient/chain)",
	Usage: "Root directory for era1 history (default = inside ancient)",

core/rawdb: integrate eradb backend for RPC #31604

core/rawdb: integrate eradb backend for RPC #31604

Conversation

s1na commented Apr 10, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rjl493456442 commented Apr 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lightclient left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lightclient left a comment •

edited

Loading