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: Wait until in nakamoto to shutdown 2.x block downloader #5676 #5735

Merged
merged 19 commits into from
Feb 6, 2025
Merged

Fix: Wait until in nakamoto to shutdown 2.x block downloader #5676 #5735

merged 19 commits into from
Feb 6, 2025
+79 −5

Conversation

jcnelson
Copy link
Member

This fixes #5676 by requiring the p2p thread's view of the Stacks tip to be a Nakamoto tip before shutting down the epoch 2.x block download state machines.

@jcnelson jcnelson requested a review from a team as a code owner January 22, 2025 21:38
jferrant
jferrant previously approved these changes Jan 22, 2025
View reviewed changes
kantai
kantai requested changes Jan 22, 2025
View reviewed changes
Copy link
Member

@kantai kantai left a comment

Choose a reason for hiding this comment

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

This makes sense to me, but please add a unit test to cover this change.

stackslib/src/net/p2p.rs Outdated Show resolved Hide resolved
@CharlieC3
Copy link
Member

Can confirmed this has fixed a couple nodes we're syncing from genesis on testnet!

CharlieC3
CharlieC3 previously approved these changes Jan 23, 2025
View reviewed changes
Copy link
Member

@CharlieC3 CharlieC3 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

:shipit: Pending Aaron's comment.

@aldur aldur added this to the 3.1.0.0.5 milestone Jan 23, 2025
@jcnelson jcnelson dismissed stale reviews from CharlieC3 and jferrant via b060bce January 23, 2025 22:17
obycode
obycode previously approved these changes Jan 23, 2025
View reviewed changes
kantai
kantai reviewed Jan 23, 2025
View reviewed changes
Copy link
Member

@kantai kantai left a comment

Choose a reason for hiding this comment

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

I think the test checks should be updated. This also should get a changelog entry.

stackslib/src/net/mod.rs Outdated Show resolved Hide resolved
@aldur aldur added this to the 3.1.0.0.6 milestone Feb 4, 2025
@kantai kantai changed the title fix/5676 Fix: Wait until in nakamoto to shutdown 2.x block downloader #5676 Feb 4, 2025
@jcnelson jcnelson dismissed stale reviews from jferrant and obycode via 57f44d7 February 4, 2025 19:00
obycode
obycode previously requested changes Feb 4, 2025
View reviewed changes
Copy link
Contributor

@obycode obycode left a comment

Choose a reason for hiding this comment

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

Unit test is still failing.

@jcnelson
Copy link
Member Author

jcnelson commented Feb 5, 2025

Unit tests pass locally for me; checking to see if they now pass CI.

@kantai kantai mentioned this pull request Feb 5, 2025
Open
@jcnelson jcnelson requested review from kantai and obycode and removed request for kantai February 5, 2025 15:34
@jcnelson jcnelson requested a review from jferrant February 5, 2025 21:15
@kantai kantai dismissed obycode’s stale review February 6, 2025 16:40

Unit tests now pass in CI

@kantai kantai added this pull request to the merge queue Feb 6, 2025
Merged via the queue into develop with commit ef96476 Feb 6, 2025
177 of 189 checks passed
@kantai kantai deleted the fix/5676 branch February 6, 2025 17:04
@hstove hstove mentioned this pull request Feb 6, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hstove hstove hstove approved these changes

@kantai kantai kantai approved these changes

@jbencin jbencin Awaiting requested review from jbencin

@CharlieC3 CharlieC3 Awaiting requested review from CharlieC3

@obycode obycode Awaiting requested review from obycode

@jferrant jferrant Awaiting requested review from jferrant

Assignees

@jcnelson jcnelson

Labels
None yet
Projects
Stacks Core Eng
Status: Status: ✅ Done
Milestone
3.1.0.0.6
Development

Successfully merging this pull request may close these issues.

Testnet: unable to sync from genesis
7 participants
@jcnelson @CharlieC3 @obycode @hstove @kantai @jferrant @aldur