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

[3.2] Do not log or subjective bill for duplicate trxs #270

Merged
merged 1 commit into from
Oct 3, 2022
Merged

[3.2] Do not log or subjective bill for duplicate trxs #270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 7 deletions plugins/producer_plugin/producer_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,6 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
if( chain.is_known_unexpired_transaction( id )) {
auto except_ptr = std::static_pointer_cast<fc::exception>( std::make_shared<tx_duplicate>(
FC_LOG_MESSAGE( error, "duplicate transaction ${id}", ("id", id))));
log_trx_results( trx, except_ptr );
next( std::move(except_ptr) );
return true;
}
Expand Down Expand Up @@ -2040,14 +2039,14 @@ producer_plugin_impl::push_transaction( const fc::time_point& block_deadline,
pr.trx_exhausted = true;
} else {
pr.failed = true;
fc_dlog( _trx_failed_trace_log, "Subjective bill for failed ${a}: ${b} elapsed ${t}us, time ${r}us",
("a",first_auth)("b",sub_bill)("t",trace->elapsed)("r", end - start));
if (!disable_subjective_billing)
_subjective_billing.subjective_bill_failure( first_auth, trace->elapsed, fc::time_point::now() );

log_trx_results( trx, trace, start );
auto failure_code = trace->except->code();
if( failure_code != tx_duplicate::code_value ) {
fc_dlog( _trx_failed_trace_log, "Subjective bill for failed ${a}: ${b} elapsed ${t}us, time ${r}us",
("a",first_auth)("b",sub_bill)("t",trace->elapsed)("r", end - start));
if (!disable_subjective_billing)
_subjective_billing.subjective_bill_failure( first_auth, trace->elapsed, fc::time_point::now() );

log_trx_results( trx, trace, start );
// this failed our configured maximum transaction time, we don't want to replay it
fc_dlog( _trx_failed_trace_log, "Failed ${c} trx, auth: ${a}, prev billed: ${p}us, ran: ${r}us, id: ${id}",
("c", failure_code)("a", first_auth)("p", prev_billed_cpu_time_us)
Expand Down