gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update reported tx count to exclude errors (#4201)

Browse Source
This commit is contained in:
Sagar Dhawan
2019-05-13 13:23:52 -07:00
committed by GitHub
parent e2830f5b0e
commit 5e91f8f59d
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
book/src/performance-metrics.md
View File

@@ -11,7 +11,7 @@ it on the dashboard.
## TPS ## TPS
The leader node's banking stage maintains a count of transactions that it processed. The leader node's banking stage maintains a count of transactions that it recorded.
The dashboard displays the count averaged over 2 second period in the TPS time series The dashboard displays the count averaged over 2 second period in the TPS time series
graph. The dashboard also shows per second mean, maximum and total TPS as a running graph. The dashboard also shows per second mean, maximum and total TPS as a running
counter. counter.

4
ci/testnet-automation.sh
View File

@@ -52,14 +52,14 @@ launchTestnet() {
declare q_mean_tps=' declare q_mean_tps='
SELECT round(mean("sum_count")) AS "mean_tps" FROM ( SELECT round(mean("sum_count")) AS "mean_tps" FROM (
SELECT sum("count") AS "sum_count" SELECT sum("count") AS "sum_count"
FROM "testnet-automation"."autogen"."banking_stage-process_transactions" FROM "testnet-automation"."autogen"."banking_stage-record_transactions"
WHERE time > now() - 300s GROUP BY time(1s) WHERE time > now() - 300s GROUP BY time(1s)
)' )'
declare q_max_tps=' declare q_max_tps='
SELECT round(max("sum_count")) AS "max_tps" FROM ( SELECT round(max("sum_count")) AS "max_tps" FROM (
SELECT sum("count") AS "sum_count" SELECT sum("count") AS "sum_count"
FROM "testnet-automation"."autogen"."banking_stage-process_transactions" FROM "testnet-automation"."autogen"."banking_stage-record_transactions"
WHERE time > now() - 300s GROUP BY time(1s) WHERE time > now() - 300s GROUP BY time(1s)
)' )'

10
core/src/bank_forks.rs
View File

@@ -114,13 +114,23 @@ impl BankForks {
.banks .banks
.get(&root) .get(&root)
.expect("root bank didn't exist in bank_forks"); .expect("root bank didn't exist in bank_forks");
let root_tx_count = root_bank
.parents()
.last()
.map(|bank| bank.transaction_count())
.unwrap_or(0);
root_bank.squash(); root_bank.squash();
let new_tx_count = root_bank.transaction_count();
self.prune_non_root(root); self.prune_non_root(root);
inc_new_counter_info!( inc_new_counter_info!(
"bank-forks_set_root_ms", "bank-forks_set_root_ms",
timing::duration_as_ms(&set_root_start.elapsed()) as usize timing::duration_as_ms(&set_root_start.elapsed()) as usize
); );
inc_new_counter_info!(
"bank-forks_set_root_tx_count",
(new_tx_count - root_tx_count) as usize
);
} }
pub fn root(&self) -> u64 { pub fn root(&self) -> u64 {

4
core/src/banking_stage.rs
View File

@@ -357,6 +357,10 @@ impl BankingStage {
debug!("processed: {} ", processed_transactions.len()); debug!("processed: {} ", processed_transactions.len());
// unlock all the accounts with errors which are filtered by the above `filter_map` // unlock all the accounts with errors which are filtered by the above `filter_map`
if !processed_transactions.is_empty() { if !processed_transactions.is_empty() {
inc_new_counter_info!(
"banking_stage-record_transactions",
processed_transactions.len()
);
let hash = hash_transactions(&processed_transactions); let hash = hash_transactions(&processed_transactions);
// record and unlock will unlock all the successful transactions // record and unlock will unlock all the successful transactions
poh.lock() poh.lock()

8
metrics/testnet-monitor.json
View File

@@ -502,7 +502,7 @@
"hide": false, "hide": false,
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT ROUND(MEAN(\"sum\")) FROM ( SELECT sum(\"count\") FROM \"$testnet\".\"autogen\".\"banking_stage-process_transactions\" WHERE $timeFilter GROUP BY time(1s) )\n\n", "query": "SELECT ROUND(MEAN(\"sum\")) FROM ( SELECT sum(\"count\") FROM \"$testnet\".\"autogen\".\"banking_stage-record_transactions\" WHERE $timeFilter GROUP BY time(1s) )\n\n",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -614,7 +614,7 @@
"hide": false, "hide": false,
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT MAX(\"sum\") FROM ( SELECT sum(\"count\") FROM \"$testnet\".\"autogen\".\"banking_stage-process_transactions\" WHERE $timeFilter GROUP BY time(1s) )\n\n", "query": "SELECT MAX(\"sum\") FROM ( SELECT sum(\"count\") FROM \"$testnet\".\"autogen\".\"banking_stage-record_transactions\" WHERE $timeFilter GROUP BY time(1s) )\n\n",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -726,7 +726,7 @@
"hide": false, "hide": false,
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT sum(\"count\") AS \"transactions\" FROM \"$testnet\".\"autogen\".\"banking_stage-process_transactions\" WHERE $timeFilter \n\n", "query": "SELECT sum(\"count\") AS \"transactions\" FROM \"$testnet\".\"autogen\".\"banking_stage-record_transactions\" WHERE $timeFilter \n\n",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -1556,7 +1556,7 @@
], ],
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT sum(\"count\") / 2 AS \"transactions\" FROM \"$testnet\".\"autogen\".\"banking_stage-process_transactions\" WHERE $timeFilter GROUP BY time(2s) FILL(0)\n", "query": "SELECT sum(\"count\") / 2 AS \"transactions\" FROM \"$testnet\".\"autogen\".\"banking_stage-record_transactions\" WHERE $timeFilter GROUP BY time(2s) FILL(0)\n",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",