Skip to content
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

Jump to bottom

fix: the unknown block sync timeout #6031

Merged
merged 5 commits into from
Oct 13, 2023
Merged

fix: the unknown block sync timeout #6031

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9979982
Fix the unknown block sync timeout
nazarhussain Oct 11, 2023
7003e6c
Remove unused variable
nazarhussain Oct 11, 2023
39a0c5b
Recompute the sync check initiate condition
nazarhussain Oct 11, 2023
20828d4
Move the range sync delay fix when we only have range sync enabled
nazarhussain Oct 12, 2023
1f36e8d
chore: rename variable
twoeths Oct 13, 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
21 changes: 18 additions & 3 deletions packages/beacon-node/src/sync/sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Logger} from "@lodestar/utils";
import {Logger, retry} from "@lodestar/utils";
import {SLOTS_PER_EPOCH} from "@lodestar/params";
import {Slot} from "@lodestar/types";
import {INetwork, NetworkEvent, NetworkEventData} from "../network/index.js";
Expand Down Expand Up @@ -63,8 +63,23 @@ export class BeaconSync implements IBeaconSync {
this.logger.debug("RangeSync disabled.");
}

// TODO: It's okay to start this on initial sync?
this.chain.clock.on(ClockEvent.epoch, this.onClockEpoch);
// In case node is started with `rangeSync` disabled and `unknownBlockSync` is enabled.
// If the epoch boundary happens right away the `onClockEpoch` will check for the `syncDiff` and if
// it's more than 2 epoch will disable the disabling the `unknownBlockSync` as well.
// This will result into node hanging on the head slot and not syncing any blocks.
// This was the scenario in the test case `Unknown block sync` in `packages/cli/test/sim/multi_fork.test.ts`
// So we are adding a particular delay to ensure that the `unknownBlockSync` is enabled.
const syncStartSlot = this.chain.clock.currentSlot;
// Having one epoch time for the node to connect to peers and start a syncing process
const epochCheckFotSyncSlot = syncStartSlot + SLOTS_PER_EPOCH;
const initiateEpochCheckForSync = (): void => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think one epoch would be enough time margin for a node to connect to peers and do the syncing before we start checking the sync progress. But this time could be changed based on node behavior.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the comment and solution look great, I just don't feel right having this fix in prod code because onClockEpoch is designed to witness the genesis event as well.

Could you move this code to the above if/else code block for test code only? something like:

if (!opts.disableRangeSync) {
      // prod code
      ...
     this.chain.clock.on(ClockEvent.epoch, this.onClockEpoch);
} else {
   // test code, this is needed for Unknown block sync sim test
   ...
   // TODO: fix sim test here
}

if (epochCheckFotSyncSlot >= this.chain.clock.currentSlot) {
this.logger.info("Initiating epoch check for sync progress");
this.chain.clock.off(ClockEvent.slot, initiateEpochCheckForSync);
this.chain.clock.on(ClockEvent.epoch, this.onClockEpoch);
}
};
this.chain.clock.on(ClockEvent.slot, initiateEpochCheckForSync);

if (metrics) {
metrics.syncStatus.addCollect(() => this.scrapeMetrics(metrics));
Expand Down
Loading