Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some confirmed block observer callbacks being missed #2723

Merged
merged 10 commits into from
Apr 23, 2020
Merged

Some confirmed block observer callbacks being missed #2723

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b53231
Observer callbacks being missed
wezrule Apr 16, 2020
e5a59a7
Merge branch 'develop' into observer_stats_fix
wezrule Apr 20, 2020
66c431a
Small optimization to potentially save read disk io
wezrule Apr 21, 2020
ec07867
Also reset variables after cementinting all
wezrule Apr 21, 2020
41aef23
(Unrelated) Remove old comment
wezrule Apr 21, 2020
82fd4d8
Add check for election_winner_details in case of duplicate elections …
wezrule Apr 22, 2020
8884dcc
Merge with develop
wezrule Apr 22, 2020
2bacda3
Only check for inconsistency between blocks_confirmed and observer st…
wezrule Apr 22, 2020
0dd77c0
Revert test changes which can go back to using confirmation_height_pr…
wezrule Apr 22, 2020
6e27b29
Update observer (Gui comment)
wezrule Apr 23, 2020
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
6 changes: 5 additions & 1 deletion nano/node/confirmation_height_bounded.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,11 @@ bool nano::confirmation_height_bounded::cement_blocks (nano::write_guard & scope
scoped_write_guard_a.release ();
notify_observers_callback (cemented_blocks);
}
debug_assert (ledger.stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed) == ledger.stats.count (nano::stat::type::observer, nano::stat::detail::all, nano::stat::dir::out));
// Tests should check this already at the end, but not all blocks may have elections (e.g from manual calls to confirmation_height_processor::add), this should catch any inconsistencies on live/beta though
if (!network_params.network.is_test_network ())
guilhermelawless marked this conversation as resolved.
Show resolved Hide resolved
{
debug_assert (ledger.stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed) == ledger.stats.count (nano::stat::type::observer, nano::stat::detail::all, nano::stat::dir::out));
}

debug_assert (pending_writes.empty ());
debug_assert (pending_writes_size == 0);
Expand Down
6 changes: 5 additions & 1 deletion nano/node/confirmation_height_unbounded.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,11 @@ bool nano::confirmation_height_unbounded::cement_blocks (nano::write_guard & sco
scoped_write_guard_a.release ();
notify_observers_callback (cemented_blocks);

debug_assert (ledger.stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed) == ledger.stats.count (nano::stat::type::observer, nano::stat::detail::all, nano::stat::dir::out));
// Tests should check this already at the end, but not all blocks may have elections (e.g from manual calls to confirmation_height_processor::add), this should catch any inconsistencies on live/beta though
if (!network_params.network.is_test_network ())
{
debug_assert (ledger.stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed) == ledger.stats.count (nano::stat::type::observer, nano::stat::detail::all, nano::stat::dir::out));
}
debug_assert (pending_writes.empty ());
return false;
}
Expand Down
1 change: 1 addition & 0 deletions nano/node/confirmation_height_unbounded.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class confirmation_height_unbounded final
void collect_unconfirmed_receive_and_sources_for_account (uint64_t, uint64_t, nano::block_hash const &, nano::account const &, nano::read_transaction const &, std::vector<receive_source_pair> &, std::vector<nano::block_hash> &);
void prepare_iterated_blocks_for_cementing (preparation_data &);

nano::network_params network_params;
nano::ledger & ledger;
nano::write_database_queue & write_database_queue;
std::chrono::milliseconds batch_separate_pending_min_time;
Expand Down