Skip to content

P2P: Reduce duplicate trx debug log output #1885

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

Open
heifner wants to merge 2 commits into
base: main
Choose a base branch
from
Open

P2P: Reduce duplicate trx debug log output #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2402936
Change to_string() to generate a single line error string. Remove unu…
heifner Jan 12, 2026
6c7ea4f
Reduce output on duplicate trxs
heifner Jan 12, 2026
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
16 changes: 7 additions & 9 deletions libraries/libfc/include/fc/exception/exception.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
* @brief Defines exception's used by fc
*/
#include <fc/log/logger.hpp>
#include <exception>
#include <functional>
#include <unordered_map>
#include <boost/core/typeinfo.hpp>
#include <boost/interprocess/exceptions.hpp>
#include <exception>
#include <functional>

namespace fc
{
Expand Down Expand Up @@ -94,15 +93,14 @@ namespace fc

/**
* Generates a detailed string including file, line, method,
* and other information that is generally only useful for
* developers.
* and other information. Includes newlines.
*/
std::string to_detail_string( log_level ll = log_level::all )const;
std::string to_detail_string()const;

/**
* Generates a user-friendly error report.
* Generates an error string with no newline
*/
std::string to_string( log_level ll = log_level::info )const;
std::string to_string()const;

/**
* Generates a user-friendly error report.
Expand Down Expand Up @@ -279,7 +277,7 @@ namespace fc
const char* expr
);

extern bool enable_record_assert_trip;
extern const bool enable_record_assert_trip;
} // namespace fc

#if __APPLE__
Expand Down
87 changes: 23 additions & 64 deletions libraries/libfc/src/exception.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <fc/exception/exception.hpp>
#include <boost/exception/all.hpp>
#include <fc/log/logger.hpp>
#include <fc/io/json.hpp>

#include <iostream>
#include <boost/exception/diagnostic_information.hpp>

namespace fc
{
Expand Down Expand Up @@ -119,83 +119,45 @@ namespace fc
my->_elog.emplace_back( std::move(m) );
}

/**
* Generates a detailed string including file, line, method,
* and other information that is generally only useful for
* developers.
*/
std::string exception::to_detail_string( log_level ll )const
std::string exception::to_detail_string()const
{
const auto deadline = fc::time_point::now() + format_time_limit;
std::stringstream ss;
std::string r;
try {
try {
ss << variant( my->_code ).as_string();
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_detail_string.";
}
ss << " " << my->_name << ": " << my->_what << "\n";
r += std::to_string( my->_code );
r += " " + my->_name + ": " + my->_what + "\n";
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) {
try {
ss << itr->get_message() << "\n"; //fc::format_string( itr->get_format(), itr->get_data() ) <<"\n";
ss << " " << json::to_string( itr->get_data(), deadline ) << "\n";
ss << " " << itr->get_context().to_string() << "\n";
r += itr->get_message() += "\n";
r += " " + json::to_string( itr->get_data(), deadline ) + "\n";
r += " " + itr->get_context().to_string() + "\n";
} catch( std::bad_alloc& ) {
throw;
} catch( const fc::timeout_exception& e) {
ss << "<- timeout exception in to_detail_string: " << e.what() << "\n";
r += "<- timeout exception in to_detail_string: " + e.my->_what + "\n";
break;
} catch( ... ) {
ss << "<- exception in to_detail_string.\n";
r += "<- exception in to_detail_string.\n";
}
}
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_detail_string.\n";
r += "<- exception in to_detail_string.\n";
}
return ss.str();
return r;
}

/**
* Generates a user-friendly error report.
*/
std::string exception::to_string( log_level ll )const
std::string exception::to_string()const
{
const auto deadline = fc::time_point::now() + format_time_limit;
std::stringstream ss;
try {
ss << my->_what;
try {
ss << " (" << variant( my->_code ).as_string() << ")\n";
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_string.\n";
}
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) {
try {
FC_CHECK_DEADLINE(deadline);
ss << fc::format_string( itr->get_format(), itr->get_data(), true) << "\n";
// ss << " " << itr->get_context().to_string() <<"\n";
} catch( std::bad_alloc& ) {
throw;
} catch( const fc::timeout_exception& e) {
ss << "<- timeout exception in to_string: " << e.what();
break;
} catch( ... ) {
ss << "<- exception in to_string.\n";
}
}
return ss.str();
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_string.\n";
std::string r;
r += my->_what;
r += " (" + std::to_string( my->_code ) + ") ";
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) {
r += fc::format_string( itr->get_format(), itr->get_data(), true);
break;
}
return ss.str();
return r;
}

/**
Expand Down Expand Up @@ -266,15 +228,12 @@ namespace fc
("source_lineno", lineno)
("expr", expr)
;
/* TODO: restore this later
std::cout
std::cerr
<< "FC_ASSERT triggered: "
<< fc::json::to_string( assert_trip_info ) << "\n";
*/
return;
<< fc::json::to_string( assert_trip_info, fc::time_point::maximum() ) << "\n";
}

bool enable_record_assert_trip = false;
const bool enable_record_assert_trip = false;

std_exception_wrapper::std_exception_wrapper( log_message&& m, std::exception_ptr e,
const std::string& name_value,
Expand Down
11 changes: 8 additions & 3 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4034,15 +4034,19 @@ namespace eosio {
trx_in_progress_size += trx_size;
my_impl->chain_plug->accept_transaction( trx,
[weak = weak_from_this(), trx_size](const next_function_variant<transaction_trace_ptr>& result) mutable {
auto log_failed = [&](const fc::exception& e) {
fc_dlog( p2p_trx_log, "bad packed_transaction : ${m}",
("m", e.code() == tx_duplicate::code_value ? e.to_string() : e.what()) );
};
// next (this lambda) called from application thread
if (std::holds_alternative<fc::exception_ptr>(result)) {
fc_dlog( p2p_trx_log, "bad packed_transaction : ${m}", ("m", std::get<fc::exception_ptr>(result)->what()) );
log_failed(*std::get<fc::exception_ptr>(result));
} else {
const transaction_trace_ptr& trace = std::get<transaction_trace_ptr>(result);
if( !trace->except ) {
fc_dlog( p2p_trx_log, "chain accepted transaction, bcast ${id}", ("id", trace->id) );
} else {
fc_ilog( p2p_trx_log, "bad packed_transaction : ${m}", ("m", trace->except->what()));
log_failed(*trace->except);
}
}
connection_ptr conn = weak.lock();
Expand Down Expand Up @@ -4324,7 +4328,8 @@ namespace eosio {
boost::asio::post( thread_pool.get_executor(), [this, results]() {
const auto& id = results.second->id();
if (results.first) {
fc_dlog( p2p_trx_log, "signaled NACK, trx-id = ${id} : ${why}", ("id", id)( "why", results.first->to_detail_string() ) );
fc_dlog( p2p_trx_log, "signaled NACK, trx-id = ${id} : ${why}",
("id", id)("why", results.first->code() == tx_duplicate::code_value ? results.first->to_string() : results.first->to_detail_string()) );
dispatcher.rejected_transaction(results.second);
} else {
fc_dlog( p2p_trx_log, "signaled ACK, trx-id = ${id}", ("id", id) );
Expand Down
Loading