zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revise the checkpoint verifier metrics (#1195) 

* update continuous and processing.next metrics correctly
* remove duplicate metrics
* rename ambiguous metrics
This commit is contained in:
teor 2020-10-22 13:06:26 +10:00 committed by GitHub
parent d745d2b47c
commit 6dc95b1d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zebra-consensus/src/checkpoint.rs
View File

@ -203,7 +203,8 @@ where
if height >= checkpoint_list.max_height() {
(None, Progress::FinalCheckpoint)
} else {
metrics::gauge!("checkpoint.previous.height", height.0 as i64);
metrics::gauge!("checkpoint.verified.height", height.0 as i64);
metrics::gauge!("checkpoint.processing.next.height", height.0 as i64);
(Some(hash), Progress::InitialTip(height))
}
}
@ -256,7 +257,7 @@ where
/// If verification has finished, returns `FinishedVerifying`.
fn target_checkpoint_height(&self) -> Target<block::Height> {
// Find the height we want to start searching at
let mut pending_height = match self.previous_checkpoint_height() {
let start_height = match self.previous_checkpoint_height() {
// Check if we have the genesis block as a special case, to simplify the loop
BeforeGenesis if !self.queued.contains_key(&block::Height(0)) => {
tracing::trace!("Waiting for genesis block");
@ -280,6 +281,7 @@ where
//
// But at the moment, this implementation is slightly faster, because
// it stops after the first gap.
let mut pending_height = start_height;
for (&height, _) in self.queued.range((Excluded(pending_height), Unbounded)) {
// If the queued blocks are continuous.
if height == block::Height(pending_height.0 + 1) {
@ -291,10 +293,13 @@ where
next_height = ?height,
?gap,
"Waiting for more checkpoint blocks");
metrics::gauge!("checkpoint.contiguous.height", pending_height.0 as i64);
break;
}
}
metrics::gauge!(
"checkpoint.queued.continuous.height",
pending_height.0 as i64
);
// Now find the start of the checkpoint range
let start = self.current_start_bound().expect(
@ -313,8 +318,13 @@ where
);
if let Some(block::Height(target_checkpoint)) = target_checkpoint {
metrics::gauge!("checkpoint.target.height", target_checkpoint as i64);
metrics::gauge!(
"checkpoint.processing.next.height",
target_checkpoint as i64
);
} else {
// Use the start height if there is no potential next checkpoint
metrics::gauge!("checkpoint.processing.next.height", start_height.0 as i64);
metrics::counter!("checkpoint.waiting.count", 1);
}
@ -387,10 +397,10 @@ where
// Ignore heights that aren't checkpoint heights
if verified_height == self.checkpoint_list.max_height() {
metrics::gauge!("checkpoint.previous.height", verified_height.0 as i64);
metrics::gauge!("checkpoint.verified.height", verified_height.0 as i64);
self.verifier_progress = FinalCheckpoint;
} else if self.checkpoint_list.contains(verified_height) {
metrics::gauge!("checkpoint.previous.height", verified_height.0 as i64);
metrics::gauge!("checkpoint.verified.height", verified_height.0 as i64);
self.verifier_progress = PreviousCheckpoint(verified_height);
// We're done with the initial tip hash now
self.initial_tip_hash = None;
@ -472,6 +482,15 @@ where
qblocks.reserve_exact(1);
qblocks.push(new_qblock);
metrics::gauge!(
"checkpoint.queued.max.height",
self.queued
.keys()
.next_back()
.expect("queued has at least one entry")
.0 as i64
);
let is_checkpoint = self.checkpoint_list.contains(height);
tracing::trace!(?height, ?hash, ?is_checkpoint, "Queued block");
@ -670,10 +689,6 @@ where
let block_count = rev_valid_blocks.len();
tracing::info!(?block_count, ?current_range, "verified checkpoint range");
metrics::gauge!(
"checkpoint.verified.block.height",
target_checkpoint_height.0 as _
);
metrics::counter!("checkpoint.verified.block.count", block_count as _);
// All the blocks we've kept are valid, so let's verify them