Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

net_plugin: shutdown segfault fix - 2.0 #10961

Merged
merged 2 commits into from
Dec 15, 2021
Merged

net_plugin: shutdown segfault fix - 2.0 #10961

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2f63f7
Avoid accessing connection data during operation_aborted since it can…
heifner Dec 14, 2021
383244f
Add comment and cleanup if
heifner Dec 14, 2021
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
9 changes: 2 additions & 7 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,8 +1351,7 @@ namespace eosio {
void connection::sync_timeout( boost::system::error_code ec ) {
if( !ec ) {
my_impl->sync_master->sync_reassign_fetch( shared_from_this(), benign_other );
} else if( ec == boost::asio::error::operation_aborted ) {
} else {
} else if( ec != boost::asio::error::operation_aborted ) { // don't log on operation_aborted, called on destroy
fc_elog( logger, "setting timer for sync request got error ${ec}", ("ec", ec.message()) );
}
}
Expand All @@ -1375,11 +1374,7 @@ namespace eosio {
void connection::fetch_timeout( boost::system::error_code ec ) {
if( !ec ) {
my_impl->dispatcher->retry_fetch( shared_from_this() );
} else if( ec == boost::asio::error::operation_aborted ) {
if( !connected() ) {
fc_dlog( logger, "fetch timeout was cancelled due to dead connection" );
}
} else {
} else if( ec != boost::asio::error::operation_aborted ) { // don't log on operation_aborted, called on destroy
fc_elog( logger, "setting timer for fetch request got error ${ec}", ("ec", ec.message() ) );
}
}
Expand Down