From 09630fc38f9c603d77b7adb9859f6ee1ac139289 Mon Sep 17 00:00:00 2001
From: Chris Sosnin <48099298+slumber@users.noreply.github.com>
Date: Tue, 12 Sep 2023 17:15:36 +0300
Subject: [PATCH] lookahead collator: only build on top of scheduled relay
parents (#1429)
Partially addresses #1400
---------
Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
---
.../consensus/aura/src/collators/lookahead.rs | 55 ++++++++++++++++++-
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/cumulus/client/consensus/aura/src/collators/lookahead.rs b/cumulus/client/consensus/aura/src/collators/lookahead.rs
index b1a7cde55c2..57cd646fbcd 100644
--- a/cumulus/client/consensus/aura/src/collators/lookahead.rs
+++ b/cumulus/client/consensus/aura/src/collators/lookahead.rs
@@ -45,11 +45,13 @@ use cumulus_primitives_core::{
use cumulus_relay_chain_interface::RelayChainInterface;
use polkadot_node_primitives::SubmitCollationParams;
-use polkadot_node_subsystem::messages::CollationGenerationMessage;
+use polkadot_node_subsystem::messages::{
+ CollationGenerationMessage, RuntimeApiMessage, RuntimeApiRequest,
+};
use polkadot_overseer::Handle as OverseerHandle;
use polkadot_primitives::{CollatorPair, Id as ParaId, OccupiedCoreAssumption};
-use futures::prelude::*;
+use futures::{channel::oneshot, prelude::*};
use sc_client_api::{backend::AuxStore, BlockBackend, BlockOf};
use sc_consensus::BlockImport;
use sc_consensus_aura::standalone as aura_internal;
@@ -181,6 +183,17 @@ where
while let Some(relay_parent_header) = import_notifications.next().await {
let relay_parent = relay_parent_header.hash();
+ if !is_para_scheduled(relay_parent, params.para_id, &mut params.overseer_handle).await {
+ tracing::trace!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ ?params.para_id,
+ "Para is not scheduled on any core, skipping import notification",
+ );
+
+ continue
+ }
+
let max_pov_size = match params
.relay_client
.persisted_validation_data(
@@ -444,3 +457,41 @@ async fn max_ancestry_lookback(
},
}
}
+
+// Checks if there exists a scheduled core for the para at the provided relay parent.
+//
+// Falls back to `false` in case of an error.
+async fn is_para_scheduled(
+ relay_parent: PHash,
+ para_id: ParaId,
+ overseer_handle: &mut OverseerHandle,
+) -> bool {
+ let (tx, rx) = oneshot::channel();
+ let request = RuntimeApiRequest::AvailabilityCores(tx);
+ overseer_handle
+ .send_msg(RuntimeApiMessage::Request(relay_parent, request), "LookaheadCollator")
+ .await;
+
+ let cores = match rx.await {
+ Ok(Ok(cores)) => cores,
+ Ok(Err(error)) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?error,
+ ?relay_parent,
+ "Failed to query availability cores runtime API",
+ );
+ return false
+ },
+ Err(oneshot::Canceled) => {
+ tracing::error!(
+ target: crate::LOG_TARGET,
+ ?relay_parent,
+ "Sender for availability cores runtime request dropped",
+ );
+ return false
+ },
+ };
+
+ cores.iter().any(|core| core.para_id() == Some(para_id))
+}
--
GitLab