Skip to content

Conversation

@codablock
Copy link

@codablock codablock commented Apr 18, 2020

Merge bitcoin#13522: [tests] Fix p2p_sendheaders race

75848bc [tests] Fix p2p_sendheaders race (John Newbery)

Pull request description:

p2p_sendheaders has a race in part 1.3.

part 1.2 sends a block to the node over the 'test_node' connection, but
doesn't wait for an inv to be received on the 'inv_node' connection. If
we get to part 1.3 before that inv has been received, then the
subsequent call to check_last_inv_announcement could fail.

Tree-SHA512: ba9baffb3a9c0d379259190c737a7a4ad2e1133005a5b026af4f6b67a2978e24db39289551ad29134151879593ef5472be7e569a3557c0740fb51f5c56263d9a

@codablock codablock added this to the 16 milestone Apr 18, 2020
@PastaPastaPasta
Copy link
Member

What bitcoin PR is this from?

75848bc [tests] Fix p2p_sendheaders race (John Newbery)

Pull request description:

  p2p_sendheaders has a race in part 1.3.

  part 1.2 sends a block to the node over the 'test_node' connection, but
  doesn't wait for an inv to be received on the 'inv_node' connection. If
  we get to part 1.3 before that inv has been received, then the
  subsequent call to check_last_inv_announcement could fail.

Tree-SHA512: ba9baffb3a9c0d379259190c737a7a4ad2e1133005a5b026af4f6b67a2978e24db39289551ad29134151879593ef5472be7e569a3557c0740fb51f5c56263d9a
@codablock codablock force-pushed the pr_fix_sendheaders branch from 9d72569 to af97ea2 Compare April 18, 2020 23:22
@codablock codablock changed the title [tests] Fix p2p_sendheaders race Backport #13522: [tests] Fix p2p_sendheaders race Apr 18, 2020
@codablock
Copy link
Author

@PastaPastaPasta sorry, I accidentally cherry-picked the single commit instead of the merge commit. Updated everything and force-pushed.

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK commit matches upstream merge

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants