Skip to content

Commit

Permalink
Merge pull request #1685 from AntelopeIO/GH-1662-ph
Browse files Browse the repository at this point in the history 
PH: Add a longer running read-only trx for tests
  • Loading branch information
@heifner
heifner authored Sep 27, 2023
2 parents 89b697d + 4d3f090 commit cecfcf4
Show file tree
Hide file tree
Showing 11 changed files with 234 additions and 3 deletions.
1 change: 0 additions & 1 deletion programs/nodeos/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ if( UNIX AND NOT APPLE )
endif()

configure_file(config.hpp.in config.hpp ESCAPE_QUOTES)
configure_file(logging.json ${CMAKE_BINARY_DIR}/tests/TestHarness/logging-template.json)

target_include_directories(${NODE_EXECUTABLE_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

Expand Down
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,15 @@ set_property(TEST gelf_test PROPERTY LABELS nonparallelizable_tests)

add_test(NAME performance_test_bp COMMAND tests/PerformanceHarnessScenarioRunner.py findMax testBpOpMode --max-tps-to-test 50 --test-iteration-min-step 10 --test-iteration-duration-sec 10 --final-iterations-duration-sec 10 --calc-chain-threads lmax overrideBasicTestConfig -v --tps-limit-per-generator 25 --chain-state-db-size-mb 200 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_api COMMAND tests/PerformanceHarnessScenarioRunner.py findMax testApiOpMode --max-tps-to-test 50 --test-iteration-min-step 10 --test-iteration-duration-sec 10 --final-iterations-duration-sec 10 --calc-chain-threads lmax overrideBasicTestConfig -v --tps-limit-per-generator 25 --chain-state-db-size-mb 200 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_read_only_trxs COMMAND tests/PerformanceHarnessScenarioRunner.py findMax testApiOpMode --max-tps-to-test 50 --test-iteration-min-step 10 --test-iteration-duration-sec 10 --final-iterations-duration-sec 10 overrideBasicTestConfig -v --tps-limit-per-generator 25 --api-nodes-read-only-threads 2 --read-only-write-window-time-us 1000 --read-only-read-window-time-us 165000 --account-name "payloadless" --abi-file payloadless.abi --wasm-file payloadless.wasm --contract-dir unittests/test-contracts/payloadless --user-trx-data-file tests/PerformanceHarness/readOnlyTrxData.json --chain-state-db-size-mb 200 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_read_only_trxs COMMAND tests/PerformanceHarnessScenarioRunner.py findMax testApiOpMode --max-tps-to-test 50 --test-iteration-min-step 10 --test-iteration-duration-sec 10 --final-iterations-duration-sec 10 overrideBasicTestConfig -v --tps-limit-per-generator 25 --api-nodes-read-only-threads 2 --read-only-write-window-time-us 1000 --read-only-read-window-time-us 165000 --account-name "payloadless" --abi-file payloadless.abi --wasm-file payloadless.wasm --contract-dir unittests/test-contracts/payloadless --user-trx-data-file tests/PerformanceHarness/readOnlySlowTrxData.json --chain-state-db-size-mb 200 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_cpu_trx_spec COMMAND tests/PerformanceHarnessScenarioRunner.py findMax testBpOpMode --max-tps-to-test 50 --test-iteration-min-step 10 --test-iteration-duration-sec 10 --final-iterations-duration-sec 10 overrideBasicTestConfig -v --tps-limit-per-generator 25 --chain-state-db-size-mb 200 --account-name "c" --abi-file eosmechanics.abi --wasm-file eosmechanics.wasm --contract-dir unittests/contracts/eosio.mechanics --user-trx-data-file tests/PerformanceHarness/cpuTrxData.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_p2p COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --producer-nodes 1 --validation-nodes 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_http COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --endpoint-mode http --producer-nodes 1 --validation-nodes 1 --api-nodes 1 --target-tps 10 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_transfer_trx_spec COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --producer-nodes 1 --validation-nodes 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 --user-trx-data-file tests/PerformanceHarness/userTrxDataTransfer.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_new_acct_trx_spec COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --producer-nodes 1 --validation-nodes 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 --user-trx-data-file tests/PerformanceHarness/userTrxDataNewAccount.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_cpu_trx_spec COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --producer-nodes 1 --validation-nodes 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 --account-name "c" --abi-file eosmechanics.abi --wasm-file eosmechanics.wasm --contract-dir unittests/contracts/eosio.mechanics --user-trx-data-file tests/PerformanceHarness/cpuTrxData.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_ram_trx_spec COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --producer-nodes 1 --validation-nodes 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 --account-name "r" --abi-file eosmechanics.abi --wasm-file eosmechanics.wasm --contract-dir unittests/contracts/eosio.mechanics --user-trx-data-file tests/PerformanceHarness/ramTrxData.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_read_only_trxs COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --endpoint-mode http --producer-nodes 1 --validation-nodes 1 --api-nodes 1 --api-nodes-read-only-threads 2 --read-only-write-window-time-us 1000 --read-only-read-window-time-us 165000 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 --account-name "payloadless" --abi-file payloadless.abi --wasm-file payloadless.wasm --contract-dir unittests/test-contracts/payloadless --user-trx-data-file tests/PerformanceHarness/readOnlyTrxData.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME performance_test_basic_read_only_trxs COMMAND tests/PerformanceHarnessScenarioRunner.py singleTest -v --endpoint-mode http --producer-nodes 1 --validation-nodes 1 --api-nodes 1 --api-nodes-read-only-threads 2 --read-only-write-window-time-us 1000 --read-only-read-window-time-us 165000 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --chain-state-db-size-mb 200 --account-name "payloadless" --abi-file payloadless.abi --wasm-file payloadless.wasm --contract-dir unittests/test-contracts/payloadless --user-trx-data-file tests/PerformanceHarness/readOnlySlowTrxData.json ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST performance_test_bp PROPERTY LABELS long_running_tests)
set_property(TEST performance_test_api PROPERTY LABELS long_running_tests)
set_property(TEST performance_test_read_only_trxs PROPERTY LABELS long_running_tests)
Expand Down
1 change: 1 addition & 0 deletions tests/PerformanceHarness/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ configure_file(genesis.json . COPYONLY)
configure_file(cpuTrxData.json . COPYONLY)
configure_file(ramTrxData.json . COPYONLY)
configure_file(readOnlyTrxData.json . COPYONLY)
configure_file(readOnlySlowTrxData.json . COPYONLY)
configure_file(userTrxDataTransfer.json . COPYONLY)
configure_file(userTrxDataNewAccount.json . COPYONLY)

Expand Down
14 changes: 14 additions & 0 deletions tests/PerformanceHarness/readOnlySlowTrxData.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"initAccounts": ["payloadless"],
"abiFile": "unittests/test-contracts/payloadless/payloadless.abi",
"apiEndpoint": "/v1/chain/send_read_only_transaction",
"actions": [
{
"actionName": "doitslow",
"actionData": {
},
"actionAuthAcct": "payloadless",
"authorization": {}
}
]
}
1 change: 1 addition & 0 deletions tests/TestHarness/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ configure_file(logging.py . COPYONLY)
configure_file(depresolver.py . COPYONLY)
configure_file(launcher.py . COPYONLY)
configure_file(accounts.py . COPYONLY)
configure_file(logging-template.json . COPYONLY)
150 changes: 150 additions & 0 deletions tests/TestHarness/logging-template.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
{
"includes": [],
"appenders": [{
"name": "stderr",
"type": "console",
"args": {
"format": " : ] ",
"stream": "std_error",
"level_colors": [{
"level": "debug",
"color": "green"
},{
"level": "warn",
"color": "brown"
},{
"level": "error",
"color": "red"
}
],
"flush": true
},
"enabled": true
},{
"name": "stdout",
"type": "console",
"args": {
"stream": "std_out",
"level_colors": [{
"level": "debug",
"color": "green"
},{
"level": "warn",
"color": "brown"
},{
"level": "error",
"color": "red"
}
],
"flush": true
},
"enabled": true
}
],
"loggers": [{
"name": "default",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "net_plugin_impl",
"level": "info",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "http_plugin",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "producer_plugin",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transaction_success_tracing",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transaction_failure_tracing",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "trace_api",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transaction_trace_success",
"level": "info",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transaction_trace_failure",
"level": "info",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transient_trx_success_tracing",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transient_trx_failure_tracing",
"level": "debug",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "state_history",
"level": "info",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
},{
"name": "transaction",
"level": "info",
"enabled": true,
"additivity": false,
"appenders": [
"stderr"
]
}
]
}
8 changes: 8 additions & 0 deletions tests/read_only_trx_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ def sendTransaction(account, action, data, auth=[], opts=None):
def sendReadOnlyPayloadless():
return sendTransaction('payloadless', action='doit', data={}, auth=[], opts='--read')

def sendReadOnlySlowPayloadless():
return sendTransaction('payloadless', action='doitslow', data={}, auth=[], opts='--read')

# Send read-only trxs from mutltiple threads to bump load
def sendReadOnlyTrxOnThread(startId, numTrxs):
Print("start sendReadOnlyTrxOnThread")
Expand All @@ -219,6 +222,11 @@ def sendReadOnlyTrxOnThread(startId, numTrxs):
results = sendReadOnlyPayloadless()
assert(results[0])
assert(results[1]['processed']['action_traces'][0]['console'] == "Im a payloadless action")

results = sendReadOnlySlowPayloadless()
assert(results[0])
assert(results[1]['processed']['action_traces'][0]['console'] == "Im a payloadless slow action")
assert(int(results[1]['processed']['elapsed']) > 100)
except Exception as e:
Print("Exception in sendReadOnlyTrxOnThread: ", e)
errorInThread = True
Expand Down
10 changes: 10 additions & 0 deletions unittests/test-contracts/payloadless/payloadless.abi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@
"name": "doit",
"base": "",
"fields": []
},
{
"name": "doitslow",
"base": "",
"fields": []
}
],
"actions": [
{
"name": "doit",
"type": "doit",
"ricardian_contract": ""
},
{
"name": "doitslow",
"type": "doitslow",
"ricardian_contract": ""
}
],
"tables": [],
Expand Down
45 changes: 45 additions & 0 deletions unittests/test-contracts/payloadless/payloadless.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,48 @@ using namespace eosio;
void payloadless::doit() {
print("Im a payloadless action");
}

constexpr size_t cpu_prime_max = 15375u;

bool is_prime(int p) {
if (p == 2) {
return true;
} else if (p <= 1 || p % 2 == 0) {
return false;
}

bool prime = true;
const int to = sqrt(p);
for (int i = 3; i <= to; i += 2) {
if (p % i == 0) {
prime = false;
break;
}
}
return prime;
}

bool is_mersenne_prime(int p) {
if (p == 2) return true;

const long long unsigned m_p = (1LLU << p) - 1;
long long unsigned s = 4;
int i;
for (i = 3; i <= p; i++) {
s = (s * s - 2) % m_p;
}
return bool(s == 0);
}


void payloadless::doitslow() {
print("Im a payloadless slow action");

for (size_t p = 2; p <= cpu_prime_max; p += 1) {
if (is_prime(p) && is_mersenne_prime(p)) {
// We need to keep an eye on this to make sure it doesn't get optimized out. So far so good.
//eosio::print_f(" %u", p);
}
}
}

3 changes: 3 additions & 0 deletions unittests/test-contracts/payloadless/payloadless.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ class [[eosio::contract]] payloadless : public eosio::contract {

[[eosio::action]]
void doit();

[[eosio::action]]
void doitslow();
};
Binary file modified unittests/test-contracts/payloadless/payloadless.wasm
View file
Binary file not shown.

0 comments on commit cecfcf4

Please sign in to comment.