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

fix: potential race condition between add_block and sync #4677

Merged
merged 1 commit into from
Sep 14, 2022

Conversation

SWvheerden
Copy link
Collaborator

Description

This fixes a potential race condition.

It is possible for add_block to pass the is_add_block_disabled(), start doing orphan validation (which can take quite long).
While this is happening, sync sets the add_block_disabled flag and acquires a read_lock to then do pre-processing to determine sync mode, etc. While this is busy, add_block asks for a write_lock.
Add_block gets its write_lock before sync gets its write_block because of the prioritization of RWLock.

Also moved the if db.contains(&DbKey::BlockHash(block_hash)) before the orphan validation as this is a much cheaper operation.

Copy link
Collaborator

@stringhandler stringhandler left a comment

Choose a reason for hiding this comment

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

I like this.

@stringhandler
Copy link
Collaborator

Merging, can fix the test in a follow up pr

@stringhandler stringhandler merged commit 55f2b9c into tari-project:development Sep 14, 2022
@SWvheerden SWvheerden deleted the sw_fix_rc branch September 14, 2022 08:36
sdbondi added a commit to sdbondi/tari that referenced this pull request Sep 16, 2022
* development: (72 commits)
  fix: reinsert transactions from failed block (tari-project#4675)
  fix: stray clippy error (tari-project#4685)
  fix(wallet): mark mined_height as null when pending outputs are cancelled (tari-project#4686)
  chore: updated dependancies (tari-project#4684)
  fix(p2p): remove DETACH flag usage (tari-project#4682)
  fix(comms): simplify and remove possibility of deadlock from pipelines and substream close (tari-project#4676)
  feat(ci): add default CI and FFI testing with custom dispatch (tari-project#4672)
  chore: remove broken test (tari-project#4678)
  fix: fix potential race condition between add_block and sync (tari-project#4677)
  fix deadlock (tari-project#4674)
  fix: add burn funds command to console wallet (see issue tari-project#4547) (tari-project#4655)
  v0.38.3
  fix: fee estimate (tari-project#4656)
  fix(comms/messaging): fix possible deadlock in outbound pipeline (tari-project#4657)
  fix: replace Luhn checksum with DammSum (tari-project#4639)
  fix(core/sync): handle deadline timeouts by changing peer (tari-project#4649)
  fix(ci): libtor build on Ubuntu (tari-project#4644)
  chore: fix log (tari-project#4634)
  v0.38.2
  fix(comms/rpc): detect early close in all cases (tari-project#4647)
  ...
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