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

Patch crossbeam-epoch to avoid overhead #26555

Merged
merged 1 commit into from
Aug 9, 2022

Conversation

ryoqun
Copy link
Member

@ryoqun ryoqun commented Jul 11, 2022

Problem

fixes #22603

our rayon usage might be peculiar enough to warrant patching...:

crossbeam-rs/crossbeam#852 (comment)

Summary of Changes

Fixes #

@ryoqun ryoqun requested a review from carllin July 11, 2022 13:42
Cargo.toml Outdated Show resolved Hide resolved
@@ -968,8 +968,7 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.5"
Copy link
Member Author

@ryoqun ryoqun Jul 12, 2022

Choose a reason for hiding this comment

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

$ cat /home/ryoqun/.cargo/registry/src/github.com-1ecc6299db9ec823/crossbeam-epoch-0.9.5/.cargo_vcs_info.json 
{
  "git": {
    "sha1": "6d4cdd4daf9a897deef6cde9569f2fbf12c29bc5"
  }
}

...

ryoqun@ubuqun:~/work/crossbeam/crossbeam-epoch$ git diff --patch-with-stat  --no-index . /home/ryoqun/.cargo/registry/src/github.com-1ecc6299db9ec823/crossbeam-epoch-0.9.5/
...

Copy link
Member Author

@ryoqun ryoqun Jul 12, 2022

Choose a reason for hiding this comment

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

you can verify that there is barely minimum modifications by comparing this published commit rev with the parent commit rev of my patch commit: https://github.com/solana-labs/solana/pull/26555/files#r918444566

Cargo.toml Outdated
@@ -91,5 +91,6 @@ exclude = [
"programs/bpf",
]

# This prevents a Travis CI error when building for Windows.
resolver = "2"
# for details, see https://github.com/ryoqun/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
Copy link
Member Author

@ryoqun ryoqun Jul 12, 2022

Choose a reason for hiding this comment

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

for convenience: anza-xyz/crossbeam@fd279d7

@bw-solana
Copy link
Contributor

I've run a validator on MNB for multiple days w/o any issues (w/ this change on top of v1.10.32)

bw-solana
bw-solana previously approved these changes Jul 26, 2022
@mergify mergify bot dismissed bw-solana’s stale review August 4, 2022 04:35

Pull request has been modified.

@ryoqun ryoqun force-pushed the reduced-collection-frequency branch from b2fb4e5 to 58aa506 Compare August 4, 2022 05:06
@ryoqun
Copy link
Member Author

ryoqun commented Aug 4, 2022

a few hygiene are done:

  • forked crossbeam to solana-labs and pushed my patch there (maybe cosmetic)
  • squashed on the current tip of master instead of merge commit. (my preference).

bw-solana
bw-solana previously approved these changes Aug 8, 2022
@mergify mergify bot dismissed bw-solana’s stale review August 9, 2022 09:00

Pull request has been modified.

@ryoqun ryoqun force-pushed the reduced-collection-frequency branch from 96322d7 to 17369f3 Compare August 9, 2022 09:05
@ryoqun ryoqun merged commit ad3e10f into solana-labs:master Aug 9, 2022
xiangzhu70 pushed a commit to xiangzhu70/solana that referenced this pull request Aug 17, 2022
mergify bot pushed a commit that referenced this pull request Aug 17, 2022
willhickey pushed a commit that referenced this pull request Aug 17, 2022
mergify bot added a commit that referenced this pull request Aug 17, 2022
Patch crossbeam-epoch to avoid overhead (#26555)

(cherry picked from commit ad3e10f)

Co-authored-by: Ryo Onodera <[email protected]>
ryoqun added a commit that referenced this pull request Aug 23, 2022
ryoqun added a commit that referenced this pull request Aug 23, 2022
…27327)

Revert "Patch crossbeam-epoch to avoid overhead (backport #26555) (#27197)"

This reverts commit e48d8a9.
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.

getBlock spike triggers permanent catchup difficulty by rayon/crossbeam bug
3 participants