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.

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

Retry locking of child TXs in batches instead of per locked parent #2858

Merged
merged 1 commit into from
Apr 12, 2019

Conversation

codablock
Copy link

@codablock codablock commented Apr 11, 2019

Retrying immediately when a IS lock came in resulted in many repeated calls to ReadBlockFromDisk, slowing down and blocking other stuff. This PR changes retrying of locking to batched retries, invoked from the sig shares worker thread.

This PR currently includes #2857, which I'll remove later by rebasing.

@codablock codablock added this to the 14.0 milestone Apr 11, 2019
@UdjinM6
Copy link

UdjinM6 commented Apr 11, 2019

Needs rebase

@codablock
Copy link
Author

Rebased

UdjinM6
UdjinM6 previously approved these changes Apr 11, 2019
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

@codablock
Copy link
Author

Test failures seem to be unrelated. I'll re-trigger travis

This especially avoids many calls to ReadBlockFromDisk
@codablock
Copy link
Author

codablock commented Apr 12, 2019

One of the test failures was a race condition which is fixed in bitcoin#13192. Backporting this fix is quite hard atm as we're still missing some other backports, so I added a temporary fix which we can later remove when we backport the real fix.

The other test failure was in p2p-autoinstantsend.py, which I was not able to tackle down yet. It seems to happen only from time to time.

@codablock
Copy link
Author

As discussed in Slack, I'm moving unrelated Travis fixes into its own PR

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

@UdjinM6 UdjinM6 merged commit 0c54e41 into dashpay:develop Apr 12, 2019
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.

None yet

2 participants