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.
49 lines
1.5 KiB
Rust
49 lines
1.5 KiB
Rust
#![recursion_limit = "128"] // For lazy-static
|
|
pub mod attestation_verification;
|
|
mod beacon_chain;
|
|
mod beacon_fork_choice_store;
|
|
mod beacon_snapshot;
|
|
mod block_verification;
|
|
pub mod builder;
|
|
pub mod chain_config;
|
|
mod errors;
|
|
pub mod eth1_chain;
|
|
pub mod events;
|
|
mod head_tracker;
|
|
mod metrics;
|
|
pub mod migrate;
|
|
mod naive_aggregation_pool;
|
|
mod observed_attestations;
|
|
mod observed_attesters;
|
|
mod observed_block_producers;
|
|
pub mod observed_operations;
|
|
mod persisted_beacon_chain;
|
|
mod persisted_fork_choice;
|
|
mod shuffling_cache;
|
|
mod snapshot_cache;
|
|
pub mod test_utils;
|
|
mod timeout_rw_lock;
|
|
mod validator_pubkey_cache;
|
|
|
|
pub use self::beacon_chain::{
|
|
AttestationProcessingOutcome, BeaconChain, BeaconChainTypes, ChainSegmentResult,
|
|
ForkChoiceError, StateSkipConfig,
|
|
};
|
|
pub use self::beacon_snapshot::BeaconSnapshot;
|
|
pub use self::chain_config::ChainConfig;
|
|
pub use self::errors::{BeaconChainError, BlockProductionError};
|
|
pub use attestation_verification::Error as AttestationError;
|
|
pub use beacon_fork_choice_store::{BeaconForkChoiceStore, Error as ForkChoiceStoreError};
|
|
pub use block_verification::{BlockError, GossipVerifiedBlock};
|
|
pub use eth1_chain::{Eth1Chain, Eth1ChainBackend};
|
|
pub use events::EventHandler;
|
|
pub use metrics::scrape_for_metrics;
|
|
pub use parking_lot;
|
|
pub use slot_clock;
|
|
pub use state_processing::per_block_processing::errors::{
|
|
AttestationValidationError, AttesterSlashingValidationError, DepositValidationError,
|
|
ExitValidationError, ProposerSlashingValidationError,
|
|
};
|
|
pub use store;
|
|
pub use types;
|