Skip to content

Node Sync Fixes #169

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
andrewnguyen22 merged 4 commits into from
May 4, 2025
Merged

Node Sync Fixes #169

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7247ba2
On creation add timestamp to block request
ezeike May 3, 2025
8d32919
Moved request timeout check until after queue processing
ezeike May 3, 2025
1e3e2f6
Added lock around HandlePeerBlock
ezeike May 3, 2025
5aed17b
Update consensus.go
andrewnguyen22 May 4, 2025
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
13 changes: 10 additions & 3 deletions controller/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ func (c *Controller) Sync() {
for _, peer := range peers {
syncingPeers = append(syncingPeers, lib.BytesToString(peer.Address.PublicKey))
}
// Remove requests that have timed out
c.applyTimeouts(queue)
// Calculate the height to stop at when updating queue
stopHeight := min(fsmHeight+blockSyncQueueSize, maxHeight)
// Send block requests for any missing heights in the queue
Expand Down Expand Up @@ -141,6 +139,8 @@ func (c *Controller) Sync() {
maxHeight, minVDFIterations = m, v
c.log.Debugf("Updated chain %d with max height: %d and iterations %d", c.Config.ChainId, maxHeight, minVDFIterations)
}
// Remove any block requests that have timed out
c.applyTimeouts(queue)
}
}
// Syncing complete
Expand Down Expand Up @@ -168,8 +168,14 @@ func (c *Controller) processQueue(startHeight, stopHeight uint64, queue map[uint
blockMsg := req.blockMessage
// start timing the HandlePeerBlock call
start := time.Now()
// lock the controller
c.Lock()
// process the block message received from the peer
if _, err := c.HandlePeerBlock(blockMsg, true); err != nil {
_, err := c.HandlePeerBlock(blockMsg, true)
// unlock controller
c.Unlock()
// check error from HandlePeerBlock
if err != nil {
h := blockMsg.BlockAndCertificate.Header.Height
// log this unexpected behavior
c.log.Warnf("Syncing peer block height %d invalid:\n%s", h, err.Error())
Expand Down Expand Up @@ -229,6 +235,7 @@ func (c *Controller) sendBlockRequests(start, stop uint64, queue map[uint64]bloc

// Add new request to queue
queue[height] = blockSyncRequest{
timestamp: time.Now(),
height: height,
peerPublicKey: peerPublicKey,
}
Expand Down
Loading