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

feat: fix deadlock in splitstore-mpool interaction #10840

Merged
merged 3 commits into from
May 10, 2023
Merged

Conversation

arajasek
Copy link
Contributor

@arajasek arajasek commented May 5, 2023

Related Issues

Fixes #9846.

This deadlock was being caused by attempting to access the warmupepoch variable, which was behind the splitstore.mx lock. We can just access this variable atomically.

Proposed Changes

Additional Info

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

@arajasek arajasek requested a review from a team as a code owner May 5, 2023 17:52
@arajasek arajasek changed the title feat: fix deadlock in splitstore- feat: fix deadlock in splitstore-mpool interaction May 5, 2023
@arajasek arajasek mentioned this pull request May 8, 2023
7 tasks
Copy link
Contributor

@magik6k magik6k left a comment

Choose a reason for hiding this comment

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

1 comment, other than that looks good

@@ -164,7 +164,7 @@ type SplitStore struct {
path string

mx sync.Mutex
warmupEpoch abi.ChainEpoch // protected by mx
warmupEpoch int64 // atomically accessed
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't tell if this int is properly aligned, probably use the atomic.Int64 type, which is way safer/harder to mess up.

Copy link
Contributor

@ZenGround0 ZenGround0 left a comment

Choose a reason for hiding this comment

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

Can also remove lock around warmupEpoch here

Maybe mx should now be renamed protectorsLk since its only protecting protectors now afaict.

@arajasek arajasek force-pushed the asr/splitstore-warm branch from a73e520 to 1cf36d8 Compare May 10, 2023 18:23
@arajasek arajasek enabled auto-merge May 10, 2023 18:23
@arajasek arajasek force-pushed the asr/splitstore-warm branch from 1cf36d8 to 52e7546 Compare May 10, 2023 18:46
@arajasek arajasek merged commit 298b2b4 into master May 10, 2023
@arajasek arajasek deleted the asr/splitstore-warm branch May 10, 2023 18:57
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.

bug: splitstore: deadlock during compaction (setup?)
3 participants