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

Fix sigverify metrics (#7393) (#7405)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-12-10 12:10:23 -08:00
committed by Grimes
parent a6e6ec63f1
commit 57d91c9da0
3 changed files with 158 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/sigverify_stage.rs
View File

@ -11,7 +11,7 @@ use crate::sigverify;
use crate::streamer::{self, PacketReceiver}; use crate::streamer::{self, PacketReceiver};
use crossbeam_channel::Sender as CrossbeamSender; use crossbeam_channel::Sender as CrossbeamSender;
use solana_measure::measure::Measure; use solana_measure::measure::Measure;
use solana_metrics::{datapoint_debug, inc_new_counter_info}; use solana_metrics::datapoint_debug;
use solana_perf::perf_libs; use solana_perf::perf_libs;
use solana_sdk::timing; use solana_sdk::timing;
use std::sync::mpsc::{Receiver, RecvTimeoutError}; use std::sync::mpsc::{Receiver, RecvTimeoutError};
@ -65,7 +65,6 @@ impl SigVerifyStage {
RECV_BATCH_MAX_CPU RECV_BATCH_MAX_CPU
}, },
)?; )?;
inc_new_counter_info!("sigverify_stage-packets_received", len);
let mut verify_batch_time = Measure::start("sigverify_batch_time"); let mut verify_batch_time = Measure::start("sigverify_batch_time");
let batch_len = batch.len(); let batch_len = batch.len();
@ -77,7 +76,6 @@ impl SigVerifyStage {
); );
let verified_batch = verifier.verify_batch(batch); let verified_batch = verifier.verify_batch(batch);
inc_new_counter_info!("sigverify_stage-verified_packets_send", len);
for v in verified_batch { for v in verified_batch {
if sendr.send(vec![v]).is_err() { if sendr.send(vec![v]).is_err() {
@ -87,10 +85,6 @@ impl SigVerifyStage {
verify_batch_time.stop(); verify_batch_time.stop();
inc_new_counter_info!(
"sigverify_stage-time_ms",
(verify_batch_time.as_ms() + recv_time) as usize
);
debug!( debug!(
"@{:?} verifier: done. batches: {} total verify time: {:?} id: {} verified: {} v/s {}", "@{:?} verifier: done. batches: {} total verify time: {:?} id: {} verified: {} v/s {}",
timing::timestamp(), timing::timestamp(),
@ -103,9 +97,10 @@ impl SigVerifyStage {
datapoint_debug!( datapoint_debug!(
"sigverify_stage-total_verify_time", "sigverify_stage-total_verify_time",
("batch_len", batch_len, i64), ("num_batches", batch_len, i64),
("len", len, i64), ("num_packets", len, i64),
("total_time_ms", verify_batch_time.as_ms(), i64) ("verify_time_ms", verify_batch_time.as_ms(), i64),
("recv_time", recv_time, i64),
); );
Ok(()) Ok(())

7
core/src/streamer.rs
View File

@ -41,7 +41,9 @@ fn recv_loop(
} }
recv_count += len; recv_count += len;
call_count += 1; call_count += 1;
channel.send(msgs)?; if len > 0 {
channel.send(msgs)?;
}
break; break;
} }
} }
@ -55,9 +57,9 @@ fn recv_loop(
); );
recv_count = 0; recv_count = 0;
call_count = 0; call_count = 0;
now = Instant::now();
num_max_received = 0; num_max_received = 0;
} }
now = Instant::now();
} }
} }
@ -100,7 +102,6 @@ pub fn recv_batch(recvr: &PacketReceiver, max_batch: usize) -> Result<(Vec<Packe
trace!("got more msgs"); trace!("got more msgs");
len += more.packets.len(); len += more.packets.len();
batch.push(more); batch.push(more);
if len > max_batch { if len > max_batch {
break; break;
} }

219
metrics/scripts/grafana-provisioning/dashboards/testnet-monitor.json
View File

@ -4538,7 +4538,7 @@
"x": 0, "x": 0,
"y": 50 "y": 50
}, },
"id": 68, "id": 38,
"links": [], "links": [],
"pageSize": null, "pageSize": null,
"scroll": true, "scroll": true,
@ -4621,7 +4621,7 @@
"x": 0, "x": 0,
"y": 55 "y": 55
}, },
"id": 38, "id": 39,
"panels": [], "panels": [],
"title": "Bench Exchange", "title": "Bench Exchange",
"type": "row" "type": "row"
@ -4639,7 +4639,7 @@
"x": 0, "x": 0,
"y": 56 "y": 56
}, },
"id": 39, "id": 40,
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@ -4790,7 +4790,7 @@
"x": 12, "x": 12,
"y": 56 "y": 56
}, },
"id": 40, "id": 41,
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@ -4973,7 +4973,7 @@
"x": 0, "x": 0,
"y": 61 "y": 61
}, },
"id": 41, "id": 42,
"panels": [], "panels": [],
"title": "Validator Streamer", "title": "Validator Streamer",
"type": "row" "type": "row"
@ -4991,7 +4991,7 @@
"x": 0, "x": 0,
"y": 62 "y": 62
}, },
"id": 42, "id": 43,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -5093,45 +5093,6 @@
], ],
"tags": [] "tags": []
}, },
{
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"measurement": "cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"clone_and_seed\") AS \"clone_and_seed\" FROM \"$testnet\".\"autogen\".\"broadcast-bank-stats\" WHERE host_id::tag =~ /$hostid/ AND $timeFilter GROUP BY time($__interval)",
"rawQuery": true,
"refId": "C",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"count"
],
"type": "field"
},
{
"params": [],
"type": "sum"
}
]
],
"tags": []
},
{ {
"groupBy": [ "groupBy": [
{ {
@ -5248,6 +5209,45 @@
] ]
], ],
"tags": [] "tags": []
},
{
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"measurement": "cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"insertion_time\") AS \"insertion_time\" FROM \"$testnet\".\"autogen\".\"broadcast-bank-stats\" WHERE host_id::tag =~ /$hostid/ AND $timeFilter GROUP BY time($__interval)",
"rawQuery": true,
"refId": "D",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"count"
],
"type": "field"
},
{
"params": [],
"type": "sum"
}
]
],
"tags": []
} }
], ],
"thresholds": [], "thresholds": [],
@ -5310,7 +5310,7 @@
"x": 8, "x": 8,
"y": 62 "y": 62
}, },
"id": 43, "id": 44,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -5668,7 +5668,7 @@
"x": 16, "x": 16,
"y": 62 "y": 62
}, },
"id": 44, "id": 45,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -5980,7 +5980,7 @@
"x": 0, "x": 0,
"y": 68 "y": 68
}, },
"id": 45, "id": 46,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -6636,7 +6636,7 @@
"x": 16, "x": 16,
"y": 68 "y": 68
}, },
"id": 47, "id": 48,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -6757,7 +6757,7 @@
"x": 16, "x": 16,
"y": 73 "y": 73
}, },
"id": 48, "id": 49,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -6913,7 +6913,7 @@
"x": 0, "x": 0,
"y": 74 "y": 74
}, },
"id": 49, "id": 50,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -7069,7 +7069,7 @@
"x": 8, "x": 8,
"y": 74 "y": 74
}, },
"id": 50, "id": 51,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -7184,7 +7184,7 @@
"x": 16, "x": 16,
"y": 78 "y": 78
}, },
"id": 51, "id": 52,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -7388,7 +7388,7 @@
"x": 0, "x": 0,
"y": 79 "y": 79
}, },
"id": 52, "id": 53,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -7690,7 +7690,7 @@
"x": 8, "x": 8,
"y": 79 "y": 79
}, },
"id": 53, "id": 54,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -7838,7 +7838,7 @@
"x": 0, "x": 0,
"y": 84 "y": 84
}, },
"id": 54, "id": 55,
"panels": [], "panels": [],
"title": "Tower Consensus", "title": "Tower Consensus",
"type": "row" "type": "row"
@ -7861,7 +7861,7 @@
"x": 0, "x": 0,
"y": 85 "y": 85
}, },
"id": 55, "id": 56,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -8021,7 +8021,7 @@
"x": 8, "x": 8,
"y": 85 "y": 85
}, },
"id": 56, "id": 57,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -8181,7 +8181,7 @@
"x": 16, "x": 16,
"y": 85 "y": 85
}, },
"id": 57, "id": 58,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -8366,7 +8366,7 @@
"x": 0, "x": 0,
"y": 90 "y": 90
}, },
"id": 58, "id": 59,
"panels": [], "panels": [],
"repeat": null, "repeat": null,
"title": "IP Network", "title": "IP Network",
@ -8385,7 +8385,7 @@
"x": 0, "x": 0,
"y": 91 "y": 91
}, },
"id": 59, "id": 60,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -8618,7 +8618,7 @@
"x": 12, "x": 12,
"y": 91 "y": 91
}, },
"id": 60, "id": 61,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -8771,7 +8771,7 @@
"x": 0, "x": 0,
"y": 96 "y": 96
}, },
"id": 61, "id": 62,
"panels": [], "panels": [],
"title": "Signature Verification", "title": "Signature Verification",
"type": "row" "type": "row"
@ -8789,7 +8789,7 @@
"x": 0, "x": 0,
"y": 97 "y": 97
}, },
"id": 62, "id": 63,
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@ -8830,7 +8830,83 @@
"measurement": "cluster_info-vote-count", "measurement": "cluster_info-vote-count",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "autogen", "policy": "autogen",
"query": "SELECT max(\"total_time_ms\") AS \"max\" FROM \"$testnet\".\"autogen\".\"sigverify_stage-total_verify_time\" WHERE $timeFilter GROUP BY time($__interval) FILL(0)\n\n", "query": "SELECT mean(\"num_packets\") AS \"num_packets\" FROM \"$testnet\".\"autogen\".\"sigverify_stage-total_verify_time\" WHERE $timeFilter GROUP BY time(500ms) FILL(0)\n\n",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"count"
],
"type": "field"
},
{
"params": [],
"type": "sum"
}
]
],
"tags": []
},
{
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"verify_time_ms\") AS \"verify_time\" FROM \"$testnet\".\"autogen\".\"sigverify_stage-total_verify_time\" WHERE $timeFilter GROUP BY time(500ms) FILL(0)\n\n",
"rawQuery": true,
"refId": "C",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"count"
],
"type": "field"
},
{
"params": [],
"type": "sum"
}
]
],
"tags": []
},
{
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "cluster_info-vote-count",
"orderByTime": "ASC",
"policy": "autogen",
"query": "SELECT mean(\"recv_time\") AS \"recv_time\" FROM \"$testnet\".\"autogen\".\"sigverify_stage-total_verify_time\" WHERE $timeFilter GROUP BY time(500ms) FILL(0)\n\n",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@ -8910,7 +8986,7 @@
"x": 12, "x": 12,
"y": 97 "y": 97
}, },
"id": 63, "id": 64,
"legend": { "legend": {
"alignAsTable": false, "alignAsTable": false,
"avg": false, "avg": false,
@ -9059,7 +9135,7 @@
"x": 0, "x": 0,
"y": 102 "y": 102
}, },
"id": 64, "id": 65,
"panels": [], "panels": [],
"title": "Snapshots", "title": "Snapshots",
"type": "row" "type": "row"
@ -9077,7 +9153,7 @@
"x": 0, "x": 0,
"y": 103 "y": 103
}, },
"id": 65, "id": 66,
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@ -9269,7 +9345,7 @@
"x": 8, "x": 8,
"y": 103 "y": 103
}, },
"id": 66, "id": 67,
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@ -9461,7 +9537,7 @@
"x": 16, "x": 16,
"y": 103 "y": 103
}, },
"id": 67, "id": 68,
"legend": { "legend": {
"avg": false, "avg": false,
"current": false, "current": false,
@ -9650,7 +9726,7 @@
"x": 0, "x": 0,
"y": 109 "y": 109
}, },
"id": 74, "id": 69,
"panels": [], "panels": [],
"title": "Resources", "title": "Resources",
"type": "row" "type": "row"
@ -9905,6 +9981,7 @@
{ {
"allValue": ".*", "allValue": ".*",
"current": { "current": {
"selected": false,
"text": "testnet", "text": "testnet",
"value": "testnet" "value": "testnet"
}, },