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

Fix #436 object_database created outside of witness data directory

Browse source
This commit is contained in:
cifer 2018-02-25 12:14:01 +08:00 committed by gladcow
parent 0bdbd64c00
commit 0bcf6d4d65
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/chain/db_management.cpp
View file

@ -119,7 +119,9 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo
void database::wipe(const fc::path& data_dir, bool include_blocks)
{
ilog("Wiping database", ("include_blocks", include_blocks));
close();
if (_opened) {
close();
}
object_database::wipe(data_dir);
if( include_blocks )
fc::remove_all( data_dir / "database" );
@ -148,6 +150,7 @@ void database::open(
("last_block->id", last_block->id())("head_block_num",head_block_num()) );
}
}
_opened = true;
}
FC_CAPTURE_LOG_AND_RETHROW( (data_dir) )
}
@ -198,6 +201,8 @@ void database::close(bool rewind)
_block_id_to_block.close();
_fork_db.reset();
_opened = false;
}
void database::force_slow_replays()

8
libraries/chain/include/graphene/chain/database.hpp
View file

@ -561,6 +561,14 @@ namespace graphene { namespace chain {
node_property_object _node_property_object;
fc::hash_ctr_rng<secret_hash_type, 20> _random_number_generator;
bool _slow_replays = false;
/**
* Whether database is successfully opened or not.
*
* The database is considered open when there's no exception
* or assertion fail during database::open() method.
*/
bool _opened = false;
};
namespace detail