Skip to content

Process gossip block immediately #5263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twoeths merged 4 commits into from
Mar 28, 2023
Merged

Process gossip block immediately #5263

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5088c07
Process gossip block immediately
twoeths Mar 13, 2023
07453fa
Process beacon_block_and_blobs_sidecar gossip object immediately
twoeths Mar 13, 2023
9ad4857
New WorkOpts type
twoeths Mar 13, 2023
b1a2726
Check canAceptWork once per executeWork()
twoeths Mar 14, 2023
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
46 changes: 28 additions & 18 deletions packages/beacon-node/src/network/processor/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,28 @@ export type NetworkProcessorOpts = GossipHandlerOpts & {
maxGossipTopicConcurrency?: number;
};

const executeGossipWorkOrderObj: Record<GossipType, true> = {
[GossipType.beacon_block]: true,
[GossipType.beacon_block_and_blobs_sidecar]: true,
[GossipType.beacon_aggregate_and_proof]: true,
[GossipType.beacon_attestation]: true,
[GossipType.voluntary_exit]: true,
[GossipType.proposer_slashing]: true,
[GossipType.attester_slashing]: true,
[GossipType.sync_committee_contribution_and_proof]: true,
[GossipType.sync_committee]: true,
[GossipType.light_client_finality_update]: true,
[GossipType.light_client_optimistic_update]: true,
[GossipType.bls_to_execution_change]: true,
type WorkOpts = {
bypassQueue?: boolean;
};

/**
* True if we want to process gossip object immediately, false if we check for bls and regen
* in order to process the gossip object.
*/
const executeGossipWorkOrderObj: Record<GossipType, WorkOpts> = {
// gossip block verify signatures on main thread, hence we want to bypass the bls check
[GossipType.beacon_block]: {bypassQueue: true},
[GossipType.beacon_block_and_blobs_sidecar]: {bypassQueue: true},
[GossipType.beacon_aggregate_and_proof]: {},
[GossipType.beacon_attestation]: {},
[GossipType.voluntary_exit]: {},
[GossipType.proposer_slashing]: {},
[GossipType.attester_slashing]: {},
[GossipType.sync_committee_contribution_and_proof]: {},
[GossipType.sync_committee]: {},
[GossipType.light_client_finality_update]: {},
[GossipType.light_client_optimistic_update]: {},
[GossipType.bls_to_execution_change]: {},
};
const executeGossipWorkOrder = Object.keys(executeGossipWorkOrderObj) as (keyof typeof executeGossipWorkOrderObj)[];

Expand Down Expand Up @@ -124,12 +133,13 @@ export class NetworkProcessor {

job_loop: while (jobsSubmitted < MAX_JOBS_SUBMITTED_PER_TICK) {
// Check canAcceptWork before calling queue.next() since it consumes the items
if (!this.chain.blsThreadPoolCanAcceptWork() || !this.chain.regenCanAcceptWork()) {
this.metrics?.networkProcessor.canNotAcceptWork.inc();
break;
}

const canAcceptWork = this.chain.blsThreadPoolCanAcceptWork() && this.chain.regenCanAcceptWork();
for (const topic of executeGossipWorkOrder) {
// beacon block is guaranteed to be processed immedately
if (!canAcceptWork && !executeGossipWorkOrderObj[topic]?.bypassQueue) {
this.metrics?.networkProcessor.canNotAcceptWork.inc();
break job_loop;
}
if (
this.opts.maxGossipTopicConcurrency !== undefined &&
this.gossipTopicConcurrency[topic] > this.opts.maxGossipTopicConcurrency
Expand Down