pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 01:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup (#2267)

Browse Source 
* session_info: fix authorities docstring

* overseer: more consistent metrics naming

* session_info: mention ordering

* use correct bucket sizes

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>

Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
This commit is contained in:
Andronik Ordian
2021-01-14 11:41:19 +01:00
committed by GitHub
parent 32d4670b0d
commit deff43fd30
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/overseer/src/lib.rs
+31 -23
View File
@@ -1046,9 +1046,9 @@ struct MetricsInner {
activated_heads_total: prometheus::Counter<prometheus::U64>, activated_heads_total: prometheus::Counter<prometheus::U64>,
deactivated_heads_total: prometheus::Counter<prometheus::U64>, deactivated_heads_total: prometheus::Counter<prometheus::U64>,
messages_relayed_total: prometheus::Counter<prometheus::U64>, messages_relayed_total: prometheus::Counter<prometheus::U64>,
message_relay_timing: prometheus::Histogram, message_relay_timings: prometheus::Histogram,
channel_fill_level_to_overseer: prometheus::Histogram, to_overseer_channel_queue_sizes: prometheus::Histogram,
channel_fill_level_from_overseer: prometheus::Histogram, from_overseer_channel_queue_sizes: prometheus::Histogram,
} }
#[derive(Default, Clone)] #[derive(Default, Clone)]
@@ -1075,12 +1075,12 @@ impl Metrics {
/// Provide a timer for the duration between receiving a message and passing it to `route_message` /// Provide a timer for the duration between receiving a message and passing it to `route_message`
fn time_message_hold(&self) -> MaybeTimer { fn time_message_hold(&self) -> MaybeTimer {
self.0.as_ref().map(|metrics| metrics.message_relay_timing.start_timer()) self.0.as_ref().map(|metrics| metrics.message_relay_timings.start_timer())
} }
fn channel_fill_level_snapshot(&self, from_overseer: usize, to_overseer: usize) { fn channel_fill_level_snapshot(&self, from_overseer: usize, to_overseer: usize) {
self.0.as_ref().map(|metrics| metrics.channel_fill_level_to_overseer.observe(to_overseer as f64)); self.0.as_ref().map(|metrics| metrics.to_overseer_channel_queue_sizes.observe(to_overseer as f64));
self.0.as_ref().map(|metrics| metrics.channel_fill_level_from_overseer.observe(from_overseer as f64)); self.0.as_ref().map(|metrics| metrics.from_overseer_channel_queue_sizes.observe(from_overseer as f64));
} }
} }
@@ -1108,11 +1108,11 @@ impl metrics::Metrics for Metrics {
)?, )?,
registry, registry,
)?, )?,
message_relay_timing: prometheus::register( message_relay_timings: prometheus::register(
prometheus::Histogram::with_opts( prometheus::Histogram::with_opts(
prometheus::HistogramOpts { prometheus::HistogramOpts {
common_opts: prometheus::Opts::new( common_opts: prometheus::Opts::new(
"overseer_messages_relay_timing", "parachain_overseer_messages_relay_timings",
"Time spent holding a message in the overseer before passing it to `route_message`", "Time spent holding a message in the overseer before passing it to `route_message`",
), ),
// guessing at the desired resolution, but we know that messages will time // guessing at the desired resolution, but we know that messages will time
@@ -1130,26 +1130,34 @@ impl metrics::Metrics for Metrics {
)?, )?,
registry, registry,
)?, )?,
channel_fill_level_from_overseer: prometheus::register( from_overseer_channel_queue_sizes: prometheus::register(
prometheus::Histogram::with_opts( prometheus::Histogram::with_opts(
prometheus::HistogramOpts { prometheus::HistogramOpts {
common_opts: prometheus::Opts::new( common_opts: prometheus::Opts::new(
"overseer_channel_fill_level_from_overseer", "parachain_from_overseer_channel_queue_sizes",
"Number of elements sitting in the channel waiting to be processed.", "Number of elements sitting in the channel waiting to be processed.",
), ),
buckets: prometheus::exponential_buckets(0.00001_f64, 2_f64, (CHANNEL_CAPACITY as f64).log2().ceil() as usize).expect("inputs are within documented range; qed"), buckets: prometheus::exponential_buckets(
1_f64,
2_f64,
(CHANNEL_CAPACITY as f64).log2().ceil() as usize,
).expect("inputs are within documented range; qed"),
} }
)?, )?,
registry, registry,
)?, )?,
channel_fill_level_to_overseer: prometheus::register( to_overseer_channel_queue_sizes: prometheus::register(
prometheus::Histogram::with_opts( prometheus::Histogram::with_opts(
prometheus::HistogramOpts { prometheus::HistogramOpts {
common_opts: prometheus::Opts::new( common_opts: prometheus::Opts::new(
"overseer_channel_fill_level_to_overseer", "parachain_to_overseer_channel_queue_sizes",
"Number of elements sitting in the channel waiting to be processed.", "Number of elements sitting in the channel waiting to be processed.",
), ),
buckets: prometheus::exponential_buckets(0.00001_f64, 2_f64, (CHANNEL_CAPACITY as f64).log2().ceil() as usize).expect("inputs are within documented range; qed"), buckets: prometheus::exponential_buckets(
1_f64,
2_f64,
(CHANNEL_CAPACITY as f64).log2().ceil() as usize,
).expect("inputs are within documented range; qed"),
} }
)?, )?,
registry, registry,
@@ -2052,15 +2060,15 @@ mod tests {
fn extract_metrics(registry: &prometheus::Registry) -> HashMap<&'static str, u64> { fn extract_metrics(registry: &prometheus::Registry) -> HashMap<&'static str, u64> {
let gather = registry.gather(); let gather = registry.gather();
assert_eq!(gather[0].get_name(), "overseer_channel_fill_level_from_overseer"); assert_eq!(gather[0].get_name(), "parachain_activated_heads_total");
assert_eq!(gather[1].get_name(), "overseer_channel_fill_level_to_overseer"); assert_eq!(gather[1].get_name(), "parachain_deactivated_heads_total");
assert_eq!(gather[2].get_name(), "overseer_messages_relay_timing"); assert_eq!(gather[2].get_name(), "parachain_from_overseer_channel_queue_sizes");
assert_eq!(gather[3].get_name(), "parachain_activated_heads_total"); assert_eq!(gather[3].get_name(), "parachain_messages_relayed_total");
assert_eq!(gather[4].get_name(), "parachain_deactivated_heads_total"); assert_eq!(gather[4].get_name(), "parachain_overseer_messages_relay_timings");
assert_eq!(gather[5].get_name(), "parachain_messages_relayed_total"); assert_eq!(gather[5].get_name(), "parachain_to_overseer_channel_queue_sizes");
let activated = gather[3].get_metric()[0].get_counter().get_value() as u64; let activated = gather[0].get_metric()[0].get_counter().get_value() as u64;
let deactivated = gather[4].get_metric()[0].get_counter().get_value() as u64; let deactivated = gather[1].get_metric()[0].get_counter().get_value() as u64;
let relayed = gather[5].get_metric()[0].get_counter().get_value() as u64; let relayed = gather[3].get_metric()[0].get_counter().get_value() as u64;
let mut result = HashMap::new(); let mut result = HashMap::new();
result.insert("activated", activated); result.insert("activated", activated);
result.insert("deactivated", deactivated); result.insert("deactivated", deactivated);
polkadot/runtime/parachains/src/session_info.rs
+1 -1
View File
@@ -65,7 +65,7 @@ decl_module! {
/// An abstraction for the authority discovery pallet /// An abstraction for the authority discovery pallet
/// to help with mock testing. /// to help with mock testing.
pub trait AuthorityDiscoveryConfig { pub trait AuthorityDiscoveryConfig {
/// Retrieve authority identifiers of the current and next authority set. /// Retrieve authority identifiers of the current authority set in canonical ordering.
fn authorities() -> Vec<AuthorityDiscoveryId>; fn authorities() -> Vec<AuthorityDiscoveryId>;
} }