703c33bdc7
## Issue Addressed Closes #1557 ## Proposed Changes Modify the pruning algorithm so that it mutates the head-tracker _before_ committing the database transaction to disk, and _only if_ all the heads to be removed are still present in the head-tracker (i.e. no concurrent mutations). In the process of writing and testing this I also had to make a few other changes: * Use internal mutability for all `BeaconChainHarness` functions (namely the RNG and the graffiti), in order to enable parallel calls (see testing section below). * Disable logging in harness tests unless the `test_logger` feature is turned on And chose to make some clean-ups: * Delete the `NullMigrator` * Remove type-based configuration for the migrator in favour of runtime config (simpler, less duplicated code) * Use the non-blocking migrator unless the blocking migrator is required. In the store tests we need the blocking migrator because some tests make asserts about the state of the DB after the migration has run. * Rename `validators_keypairs` -> `validator_keypairs` in the `BeaconChainHarness` ## Testing To confirm that the fix worked, I wrote a test using [Hiatus](https://crates.io/crates/hiatus), which can be found here: https://github.com/michaelsproul/lighthouse/tree/hiatus-issue-1557 That test can't be merged because it inserts random breakpoints everywhere, but if you check out that branch you can run the test with: ``` $ cd beacon_node/beacon_chain $ cargo test --release --test parallel_tests --features test_logger ``` It should pass, and the log output should show: ``` WARN Pruning deferred because of a concurrent mutation, message: this is expected only very rarely! ``` ## Additional Info This is a backwards-compatible change with no impact on consensus.
64 lines
2.0 KiB
TOML
64 lines
2.0 KiB
TOML
[package]
|
|
name = "beacon_chain"
|
|
version = "0.2.0"
|
|
authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>"]
|
|
edition = "2018"
|
|
|
|
[features]
|
|
default = ["participation_metrics"]
|
|
write_ssz_files = [] # Writes debugging .ssz files to /tmp during block processing.
|
|
participation_metrics = [] # Exposes validator participation metrics to Prometheus.
|
|
test_logger = [] # Print log output to stderr when running tests instead of dropping it
|
|
|
|
[dev-dependencies]
|
|
int_to_bytes = { path = "../../consensus/int_to_bytes" }
|
|
maplit = "1.0.2"
|
|
environment = { path = "../../lighthouse/environment" }
|
|
|
|
[dependencies]
|
|
eth2_config = { path = "../../common/eth2_config" }
|
|
merkle_proof = { path = "../../consensus/merkle_proof" }
|
|
store = { path = "../store" }
|
|
parking_lot = "0.11.0"
|
|
lazy_static = "1.4.0"
|
|
smallvec = "1.4.2"
|
|
lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
|
|
log = "0.4.11"
|
|
operation_pool = { path = "../operation_pool" }
|
|
rayon = "1.4.1"
|
|
serde = "1.0.116"
|
|
serde_derive = "1.0.116"
|
|
serde_yaml = "0.8.13"
|
|
serde_json = "1.0.58"
|
|
slog = { version = "2.5.2", features = ["max_level_trace"] }
|
|
sloggers = "1.0.1"
|
|
slot_clock = { path = "../../common/slot_clock" }
|
|
eth2_hashing = "0.1.0"
|
|
eth2_ssz = "0.1.2"
|
|
eth2_ssz_types = { path = "../../consensus/ssz_types" }
|
|
eth2_ssz_derive = "0.1.0"
|
|
state_processing = { path = "../../consensus/state_processing" }
|
|
tree_hash = "0.1.1"
|
|
types = { path = "../../consensus/types" }
|
|
tokio = "0.2.22"
|
|
eth1 = { path = "../eth1" }
|
|
websocket_server = { path = "../websocket_server" }
|
|
futures = "0.3.5"
|
|
genesis = { path = "../genesis" }
|
|
integer-sqrt = "0.1.5"
|
|
rand = "0.7.3"
|
|
rand_core = "0.5.1"
|
|
proto_array = { path = "../../consensus/proto_array" }
|
|
lru = "0.6.0"
|
|
tempfile = "3.1.0"
|
|
bitvec = "0.19.3"
|
|
bls = { path = "../../crypto/bls" }
|
|
safe_arith = { path = "../../consensus/safe_arith" }
|
|
fork_choice = { path = "../../consensus/fork_choice" }
|
|
task_executor = { path = "../../common/task_executor" }
|
|
bus = "2.2.3"
|
|
derivative = "2.1.1"
|
|
itertools = "0.9.0"
|
|
regex = "1.3.9"
|
|
exit-future = "0.2.0"
|