Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Collator protocol followup #1741

Merged
5 commits merged into from
Sep 28, 2020
Merged

Collator protocol followup #1741

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fff2ff7
Metrics
montekki Sep 21, 2020
b3f28b9
Dont punish late collations
montekki Sep 21, 2020
07ce6d6
Fix metrics
montekki Sep 21, 2020
f26fe38
Update node/network/collator-protocol/src/lib.rs
montekki Sep 23, 2020
3f24f4f
Change on_request arg to Result
montekki Sep 23, 2020
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
Prev Previous commit
Change on_request arg to Result
  • Loading branch information
@montekki
montekki committed Sep 23, 2020
commit 3f24f4f2829ece7103aaadf117c6419cc7ca9937
13 changes: 6 additions & 7 deletions node/network/collator-protocol/src/validator_side.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ const BENEFIT_NOTIFY_GOOD: Rep = Rep::new(50, "A collator was noted good by anot
pub(super) struct Metrics(Option<MetricsInner>);

impl Metrics {
fn on_request(&self, succeeded: bool) {
fn on_request(&self, succeeded: std::result::Result<(), ()>) {
if let Some(metrics) = &self.0 {
if succeeded {
metrics.collation_requests.with_label_values(&["succeeded"]).inc();
} else {
metrics.collation_requests.with_label_values(&["failed"]).inc();
match succeeded {
Ok(()) => metrics.collation_requests.with_label_values(&["succeeded"]).inc(),
Err(()) => metrics.collation_requests.with_label_values(&["failed"]).inc(),
}
}
}
Expand Down Expand Up @@ -341,7 +340,7 @@ where
let _ = per_request.received.send(());
if let Some(collator_id) = state.known_collators.get(&origin) {
let _ = per_request.result.send((receipt.clone(), pov.clone()));
state.metrics.on_request(true);
state.metrics.on_request(Ok(()));

state.collations
.entry((relay_parent, para_id))
Expand Down Expand Up @@ -552,7 +551,7 @@ async fn request_timed_out<Context>(
where
Context: SubsystemContext<Message = CollatorProtocolMessage>
{
state.metrics.on_request(false);
state.metrics.on_request(Err(()));

// We have to go backwards in the map, again.
if let Some(key) = find_val_in_map(&state.requested_collations, &id) {
Expand Down