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

Use correct finalizer_policy for logging #105

Merged
merged 3 commits into from
May 2, 2024
Merged

Use correct finalizer_policy for logging #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed809dd
GH-103 Use correct finalizer_policy
heifner May 2, 2024
529582b
GH-101 Use explicit block id instead of assuming head
heifner May 2, 2024
061a6d4
Merge branch 'main' into GH-103-log-assert
heifner May 2, 2024
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
13 changes: 13 additions & 0 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,14 @@ struct controller_impl {
);
}

finalizer_policy_ptr active_finalizer_policy(block_num_type block_num)const {
block_state_ptr bsp = fetch_bsp_on_head_branch_by_num(block_num);
if (bsp) {
return bsp->active_finalizer_policy;
}
return nullptr;
}

block_state_ptr fetch_bsp(const block_id_type& id) const {
return fork_db.apply<block_state_ptr>(
overloaded{
Expand Down Expand Up @@ -5364,6 +5372,11 @@ finalizer_policy_ptr controller::head_active_finalizer_policy()const {
});
}

finalizer_policy_ptr controller::active_finalizer_policy(block_num_type block_num) const {
return my->active_finalizer_policy(block_num);
}


bool controller::light_validation_allowed() const {
return my->light_validation_allowed();
}
Expand Down
2 changes: 2 additions & 0 deletions libraries/chain/include/eosio/chain/controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ namespace eosio::chain {

// returns nullptr pre-savanna
finalizer_policy_ptr head_active_finalizer_policy()const;
// returns nullptr pre-savanna, thread-safe, block_num according to forkdb head
finalizer_policy_ptr active_finalizer_policy(block_num_type block_num)const;

void set_if_irreversible_block_id(const block_id_type& id);
uint32_t if_irreversible_block_num() const;
Expand Down
4 changes: 2 additions & 2 deletions plugins/producer_plugin/producer_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,8 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
}
if (vote_logger.is_enabled(fc::log_level::info) || _update_vote_block_metrics) {
if (block->contains_extension(quorum_certificate_extension::extension_id())) {
if (const auto& active_finalizers = chain.head_active_finalizer_policy()) {
const auto& qc_ext = block->extract_extension<quorum_certificate_extension>();
const auto& qc_ext = block->extract_extension<quorum_certificate_extension>();
if (const auto& active_finalizers = chain.active_finalizer_policy(qc_ext.qc.block_num)) {
greg7mdp marked this conversation as resolved.
Show resolved Hide resolved
const auto& qc = qc_ext.qc.data;
log_missing_votes(block, id, active_finalizers, qc);
update_vote_block_metrics(block->block_num(), active_finalizers, qc);
Expand Down
Loading