Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

db_update.cpp: Log a lot of information if clear_expired_orders() is iterating too much, maybe useful to diagnose #485

Browse source
This commit is contained in:
theoreticalbts 2016-01-07 15:12:29 -05:00
parent c1612a434e
commit a548217e5c
1 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libraries/chain/db_update.cpp
View file

@ -276,26 +276,48 @@ void database::clear_expired_orders()
{ {
asset_id_type current_asset = settlement_index.begin()->settlement_asset_id(); asset_id_type current_asset = settlement_index.begin()->settlement_asset_id();
asset max_settlement_volume; asset max_settlement_volume;
bool extra_dump = false;
auto next_asset = [&current_asset, &settlement_index] { auto next_asset = [&current_asset, &settlement_index, &extra_dump] {
auto bound = settlement_index.upper_bound(current_asset); auto bound = settlement_index.upper_bound(current_asset);
if( bound == settlement_index.end() ) if( bound == settlement_index.end() )
{
if( extra_dump )
{
ilog( "next_asset() returning false" );
}
return false; return false;
}
if( extra_dump )
{
ilog( "next_asset returning true, bound is ${b}", ("b", *bound) );
}
current_asset = bound->settlement_asset_id(); current_asset = bound->settlement_asset_id();
return true; return true;
}; };
uint32_t count = 0;
// At each iteration, we either consume the current order and remove it, or we move to the next asset // At each iteration, we either consume the current order and remove it, or we move to the next asset
for( auto itr = settlement_index.lower_bound(current_asset); for( auto itr = settlement_index.lower_bound(current_asset);
itr != settlement_index.end(); itr != settlement_index.end();
itr = settlement_index.lower_bound(current_asset) ) itr = settlement_index.lower_bound(current_asset) )
{ {
++count;
const force_settlement_object& order = *itr; const force_settlement_object& order = *itr;
auto order_id = order.id; auto order_id = order.id;
current_asset = order.settlement_asset_id(); current_asset = order.settlement_asset_id();
const asset_object& mia_object = get(current_asset); const asset_object& mia_object = get(current_asset);
const asset_bitasset_data_object& mia = mia_object.bitasset_data(*this); const asset_bitasset_data_object& mia = mia_object.bitasset_data(*this);
extra_dump = ((count >= 1000) && (count <= 1020));
if( extra_dump )
{
wlog( "clear_expired_orders() dumping extra data for iteration ${c}", ("c", count) );
ilog( "head_block_num is ${hb} current_asset is ${a}", ("hb", head_block_num())("a", current_asset) );
}
if( mia.has_settlement() ) if( mia.has_settlement() )
{ {
ilog( "Canceling a force settlement because of black swan" ); ilog( "Canceling a force settlement because of black swan" );
@ -307,7 +329,13 @@ void database::clear_expired_orders()
if( order.settlement_date > head_block_time() ) if( order.settlement_date > head_block_time() )
{ {
if( next_asset() ) if( next_asset() )
{
if( extra_dump )
{
ilog( "next_asset() returned true when order.settlement_date > head_block_time()" );
}
continue; continue;
}
break; break;
} }
// Can we still settle in this asset? // Can we still settle in this asset?
@ -328,7 +356,13 @@ void database::clear_expired_orders()
("settled_volume", mia.force_settled_volume)("max_volume", max_settlement_volume)); ("settled_volume", mia.force_settled_volume)("max_volume", max_settlement_volume));
*/ */
if( next_asset() ) if( next_asset() )
{
if( extra_dump )
{
ilog( "next_asset() returned true when mia.force_settled_volume >= max_settlement_volume.amount" );
}
continue; continue;
}
break; break;
} }