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

1850 historic node reset db #1854

Merged
merged 20 commits into from
Apr 8, 2024
Merged

1850 historic node reset db #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5ba97a5
1850_db_add_periodic_restart
kladkogex Mar 18, 2024
91d9165
1850_db_add_periodic_restart
kladkogex Mar 18, 2024
4229153
1850_db_add_periodic_restart
kladkogex Mar 18, 2024
63c8e43
1850_db_add_periodic_restart
kladkogex Mar 18, 2024
7e91ae8
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
5cc6b60
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
9374ed2
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
edfa9db
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
8478f3b
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
fc2e751
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
bde8355
1850_db_add_periodic_restart
kladkogex Mar 20, 2024
267e474
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
f85b452
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
80bd1da
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
429070d
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
f590865
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
3ef1bab
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
66f9eda
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
162a825
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
e1cd679
1850_db_add_periodic_restart fix build
kladkogex Mar 21, 2024
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
170 changes: 85 additions & 85 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,56 +161,56 @@ jobs:
- name: Print ccache stats after full build
run : |
ccache --show-stats
# first run with verbosity 1. If test fails, rerun with verbosity 4
# we specifically run each test for easier log review
- name: Testeth verbosity 1
run : |
mkdir -p /tmp/tests/
sudo rm -rf /tmp/tests/*
#first run with verbosity 1. If test fails, rerun with verbosity 4
cd build/test
export NO_NTP_CHECK=1
export NO_ULIMIT_CHECK=1
# we specifically run each test for easier log review
./testeth -t BlockchainTests -- --express && touch /tmp/tests/BlockchainTestsPassed
./testeth -t TransitionTests -- --express && touch /tmp/tests/TransitionTestsPassed
./testeth -t TransactionTests -- --express && touch /tmp/tests/TransactionTestsPassed
./testeth -t VMTests -- --express && touch /tmp/tests/VMTestsPassed
./testeth -t LevelDBTests -- --express && touch /tmp/tests/LevelDBTestsPassed
./testeth -t CoreLibTests -- --express && touch /tmp/tests/CoreLibTestsPassed
./testeth -t RlpTests -- --express && touch /tmp/tests/RlpTestsPassed
./testeth -t SharedSpaceTests -- --express && touch /tmp/tests/SharedSpaceTestsPassed
./testeth -t EthashTests -- --express && touch /tmp/tests/EthashTestsPassed
./testeth -t SealEngineTests -- --express && touch /tmp/tests/SealEngineTestsPassed
./testeth -t DifficultyTests -- --express && touch /tmp/tests/DifficultyTestsPassed
./testeth -t BlockSuite -- --express && touch /tmp/tests/BlockSuitePassed
./testeth -t BlockChainMainNetworkSuite -- --express && touch /tmp/tests/BlockChainMainNetworkSuitePassed
./testeth -t BlockChainFrontierSuite -- --express && touch /tmp/tests/BlockChainFrontierSuitePassed
./testeth -t BlockQueueSuite -- --express && touch /tmp/tests/BlockQueueSuitePassed
./testeth -t ClientBase -- --express && touch /tmp/tests/ClientBasePassed
./testeth -t EstimateGas -- --express && touch /tmp/tests/EstimateGasPassed
./testeth -t getHistoricNodesData -- --express && touch /tmp/tests/getHistoricNodesDataPassed
./testeth -t ExtVmSuite -- --express && touch /tmp/tests/ExtVmSuitePassed
./testeth -t GasPricer -- --express && touch /tmp/tests/GasPricerPassed
./testeth -t BasicTests -- --express && touch /tmp/tests/BasicTestsPassed
./testeth -t InstanceMonitorSuite -- --express && touch /tmp/tests/InstanceMonitorSuitePassed
./testeth -t PrecompiledTests -- --express && touch /tmp/tests/PrecompiledTestsPassed
./testeth -t SkaleHostSuite -- --express && touch /tmp/tests/SkaleHostSuitePassed
./testeth -t StateUnitTests -- --express && touch /tmp/tests/StateUnitTestsPassed
./testeth -t libethereum -- --express && touch /tmp/tests/libethereumPassed
./testeth -t TransactionQueueSuite -- --express && touch /tmp/tests/TransactionQueueSuitePassed
./testeth -t LegacyVMSuite -- --express && touch /tmp/tests/LegacyVMSuitePassed
./testeth -t SkaleInterpreterSuite -- --express && touch /tmp/tests/SkaleInterpreterSuitePassed
./testeth -t SnapshotSigningTestSuite -- --express && touch /tmp/tests/SnapshotSigningTestSuitePassed
./testeth -t SkUtils -- --express && touch /tmp/tests/SkUtilsPassed
./testeth -t BlockChainTestSuite -- --express && touch /tmp/tests/BlockChainTestSuitePassed
./testeth -t TestHelperSuite -- --express && touch /tmp/tests/TestHelperSuitePassed
./testeth -t LevelDBHashBase -- --express && touch /tmp/tests/LevelDBHashBasePassed
./testeth -t memDB -- --express && touch /tmp/tests/memDBPassed
./testeth -t OverlayDBTests -- --express && touch /tmp/tests/OverlayDBTestsPassed
./testeth -t AccountHolderTest -- --express && touch /tmp/tests/AccountHolderTestPassed
./testeth -t ClientTests -- --express && touch /tmp/tests/ClientTestsPassed
./testeth -t JsonRpcSuite -- --express && touch /tmp/tests/JsonRpcSuitePassed
./testeth -t SingleConsensusTests -- --express && touch /tmp/tests/SingleConsensusTestsPassed
./testeth -t ConsensusTests -- --express && touch /tmp/tests/ConsensusTestsPassed
export NO_ULIMIT_CHECK=1
function run_test() { ./testeth --report_level=detailed -t "$1" -- --express && touch "/tmp/tests/${1}Passed"; }
run_test TransitionTests
run_test TransactionTests
run_test VMTests
run_test LevelDBTests
run_test CoreLibTests
run_test RlpTests
run_test SharedSpaceTests
run_test EthashTests
run_test SealEngineTests
run_test DifficultyTests
run_test BlockSuite
run_test BlockChainMainNetworkSuite
run_test BlockChainFrontierSuite
run_test BlockQueueSuite
run_test ClientBase
run_test EstimateGas
run_test getHistoricNodesData
run_test ExtVmSuite
run_test GasPricer
run_test BasicTests
run_test InstanceMonitorSuite
run_test PrecompiledTests
run_test SkaleHostSuite
run_test StateUnitTests
run_test libethereum
run_test TransactionQueueSuite
run_test LegacyVMSuite
run_test SkaleInterpreterSuite
run_test SnapshotSigningTestSuite
run_test SkUtils
run_test BlockChainTestSuite
run_test TestHelperSuite
run_test LevelDBHashBase
run_test memDB
run_test OverlayDBTests
run_test AccountHolderTest
run_test ClientTests
run_test JsonRpcSuite
run_test SingleConsensusTests
run_test ConsensusTests
sudo ./testeth -t BtrfsTestSuite -- --all && touch /tmp/tests/BtrfsTestSuitePassed
sudo ./testeth -t HashSnapshotTestSuite -- --all && touch /tmp/tests/HashSnapshotTestSuitePassed
sudo ./testeth -t ClientSnapshotsSuite -- --all && touch /tmp/tests/ClientSnapshotsSuitePassed
Expand All @@ -221,47 +221,47 @@ jobs:
cd build/test
export NO_NTP_CHECK=1
export NO_ULIMIT_CHECK=1
ls /tmp/tests/BlockchainTestsPassed || ./testeth -t BlockchainTests -- --express --verbosity 4
ls /tmp/tests/TransitionTestsPassed || ./testeth -t TransitionTests -- --express --verbosity 4
ls /tmp/tests/TransactionTestsPassed || ./testeth -t TransactionTests -- --express --verbosity 4
ls /tmp/tests/VMTestsPassed || ./testeth -t VMTests -- --express --verbosity 4
ls /tmp/tests/LevelDBTestsPassed || ./testeth -t LevelDBTests -- --express --verbosity 4
ls /tmp/tests/CoreLibTestsPassed || ./testeth -t CoreLibTests -- --express --verbosity 4
ls /tmp/tests/RlpTestsPassed || ./testeth -t RlpTests -- --express --verbosity 4
ls /tmp/tests/SharedSpaceTestsPassed || ./testeth -t SharedSpaceTests -- --express --verbosity 4
ls /tmp/tests/EthashTestsPassed || ./testeth -t EthashTests -- --express --verbosity 4
ls /tmp/tests/SealEngineTestsPassed || ./testeth -t SealEngineTests -- --express --verbosity 4
ls /tmp/tests/DifficultyTestsPassed || ./testeth -t DifficultyTests -- --express --verbosity 4
ls /tmp/tests/BlockSuitePassed || ./testeth -t BlockSuite -- --express --verbosity 4
ls /tmp/tests/BlockChainMainNetworkSuitePassed || ./testeth -t BlockChainMainNetworkSuite -- --express --verbosity 4
ls /tmp/tests/BlockChainFrontierSuitePassed || ./testeth -t BlockChainFrontierSuite -- --express --verbosity 4
ls /tmp/tests/BlockQueueSuitePassed || ./testeth -t BlockQueueSuite -- --express --verbosity 4
ls /tmp/tests/ClientBasePassed || ./testeth -t ClientBase -- --express --verbosity 4
ls /tmp/tests/EstimateGasPassed || ./testeth -t EstimateGas -- --express --verbosity 4
ls /tmp/tests/getHistoricNodesDataPassed || ./testeth -t getHistoricNodesData -- --express --verbosity 4
ls /tmp/tests/ExtVmSuitePassed || ./testeth -t ExtVmSuite -- --express --verbosity 4
ls /tmp/tests/GasPricerPassed || ./testeth -t GasPricer -- --express --verbosity 4
ls /tmp/tests/BasicTestsPassed || ./testeth -t BasicTests -- --express --verbosity 4
ls /tmp/tests/InstanceMonitorSuitePassed || ./testeth -t InstanceMonitorSuite -- --express --verbosity 4
ls /tmp/tests/PrecompiledTestsPassed || ./testeth -t PrecompiledTests -- --express --verbosity 4
ls /tmp/tests/SkaleHostSuitePassed || ./testeth -t SkaleHostSuite -- --express --verbosity 4
ls /tmp/tests/StateUnitTestsPassed || ./testeth -t StateUnitTests -- --express --verbosity 4
ls /tmp/tests/libethereumPassed || ./testeth -t libethereum -- --express --verbosity 4
ls /tmp/tests/TransactionQueueSuitePassed || ./testeth -t TransactionQueueSuite -- --express --verbosity 4
ls /tmp/tests/LegacyVMSuitePassed || ./testeth -t LegacyVMSuite -- --express --verbosity 4
ls /tmp/tests/SkaleInterpreterSuitePassed || ./testeth -t SkaleInterpreterSuite -- --express --verbosity 4
ls /tmp/tests/SnapshotSigningTestSuitePassed || ./testeth -t SnapshotSigningTestSuite -- --express --verbosity 4
ls /tmp/tests/SkUtilsPassed || ./testeth -t SkUtils -- --express --verbosity 4
ls /tmp/tests/BlockChainTestSuitePassed || ./testeth -t BlockChainTestSuite -- --express --verbosity 4
ls /tmp/tests/TestHelperSuitePassed || ./testeth -t TestHelperSuite -- --express --verbosity 4
ls /tmp/tests/LevelDBHashBasePassed || ./testeth -t LevelDBHashBase -- --express --verbosity 4
ls /tmp/tests/memDBPassed || ./testeth -t memDB -- --express --verbosity 4
ls /tmp/tests/OverlayDBTestsPassed || ./testeth -t OverlayDBTests -- --express --verbosity 4
ls /tmp/tests/AccountHolderTestPassed || ./testeth -t AccountHolderTest -- --express --verbosity 4
ls /tmp/tests/ClientTestsPassed || ./testeth -t ClientTests -- --express --verbosity 4
ls /tmp/tests/JsonRpcSuitePassed || ./testeth -t JsonRpcSuite -- --express --verbosity 4
ls /tmp/tests/SingleConsensusTestsPassed || ./testeth -t SingleConsensusTests -- --express --verbosity 4
ls /tmp/tests/ConsensusTestsPassed || ./testeth -t ConsensusTests -- --express --verbosity 4
function rerun_test() { ls "/tmp/tests/${1}Passed" 2>/dev/null || ./testeth --report_level=detailed -t "$1" -- --express --verbosity 4; }
rerun_test TransitionTests
rerun_test TransactionTests
rerun_test VMTests
rerun_test LevelDBTests
rerun_test CoreLibTests
rerun_test RlpTests
rerun_test SharedSpaceTests
rerun_test EthashTests
rerun_test SealEngineTests
rerun_test DifficultyTests
rerun_test BlockSuite
rerun_test BlockChainMainNetworkSuite
rerun_test BlockChainFrontierSuite
rerun_test BlockQueueSuite
rerun_test ClientBase
rerun_test EstimateGas
rerun_test getHistoricNodesData
rerun_test ExtVmSuite
rerun_test GasPricer
rerun_test BasicTests
rerun_test InstanceMonitorSuite
rerun_test PrecompiledTests
rerun_test SkaleHostSuite
rerun_test StateUnitTests
rerun_test libethereum
rerun_test TransactionQueueSuite
rerun_test LegacyVMSuite
rerun_test SkaleInterpreterSuite
rerun_test SnapshotSigningTestSuite
rerun_test SkUtils
rerun_test BlockChainTestSuite
rerun_test TestHelperSuite
rerun_test LevelDBHashBase
rerun_test memDB
rerun_test OverlayDBTests
rerun_test AccountHolderTest
rerun_test ClientTests
rerun_test JsonRpcSuite
rerun_test SingleConsensusTests
rerun_test ConsensusTests
ls /tmp/tests/BtrfsTestSuitePassed || sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t BtrfsTestSuite -- --all --verbosity 4
ls /tmp/tests/HashSnapshotTestSuitePassed || sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t HashSnapshotTestSuite -- --all --verbosity 4
ls /tmp/tests/ClientSnapshotsSuitePassed || sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t ClientSnapshotsSuite -- --all --verbosity 4
Expand Down
21 changes: 16 additions & 5 deletions libdevcore/DBFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
#include "DBFactory.h"
#include "FileSystem.h"
#include "LevelDB.h"
#include "MemoryDB.h"
#include "libethcore/Exceptions.h"

namespace dev {
namespace db {
namespace dev::db {
namespace fs = boost::filesystem;
namespace po = boost::program_options;

Expand Down Expand Up @@ -132,6 +130,18 @@ std::unique_ptr< DatabaseFace > DBFactory::create( DatabaseKind _kind, fs::path
switch ( _kind ) {
case DatabaseKind::LevelDB:
return std::unique_ptr< DatabaseFace >( new LevelDB( _path ) );
default:
assert( false );
return {};
}
}

std::unique_ptr< DatabaseFace > DBFactory::createHistoric(
DatabaseKind _kind, fs::path const& _path ) {
switch ( _kind ) {
case DatabaseKind::LevelDB:
return std::unique_ptr< DatabaseFace >( new LevelDB( _path, LevelDB::defaultReadOptions(),
LevelDB::defaultWriteOptions(), LevelDB::defaultDBOptions(), s_reopenPeriodMs ) );
break;
default:
assert( false );
Expand All @@ -140,5 +150,6 @@ std::unique_ptr< DatabaseFace > DBFactory::create( DatabaseKind _kind, fs::path
}


} // namespace db
} // namespace dev
std::atomic< int64_t > DBFactory::s_reopenPeriodMs = -1;

} // namespace dev::db
12 changes: 8 additions & 4 deletions libdevcore/DBFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include <boost/filesystem.hpp>
#include <boost/program_options/options_description.hpp>

namespace dev {
namespace db {
namespace dev::db {

enum class DatabaseKind { LevelDB };

/// Provide a set of program options related to databases
Expand All @@ -52,8 +52,12 @@ class DBFactory {
static std::unique_ptr< DatabaseFace > create( DatabaseKind _kind );
static std::unique_ptr< DatabaseFace > create(
DatabaseKind _kind, boost::filesystem::path const& _path );
static std::unique_ptr< DatabaseFace > createHistoric(
DatabaseKind _kind, boost::filesystem::path const& _path );

static void setReopenPeriodMs( int64_t _reopenPeriodMs ) { s_reopenPeriodMs = _reopenPeriodMs; }

private:
static std::atomic< int64_t > s_reopenPeriodMs;
};
} // namespace db
} // namespace dev
} // namespace dev::db
Loading
Loading