Skip to content

fix(tm2): prevent a race between store queries and commits - #6014

Open
notJoon wants to merge 1 commit into
gnolang:masterfrom
notJoon:fix-query-commit-id-race
Open

fix(tm2): prevent a race between store queries and commits#6014
notJoon wants to merge 1 commit into
gnolang:masterfrom
notJoon:fix-query-commit-id-race

Conversation

@notJoon

@notJoon notJoon commented Jul 28, 2026

Copy link
Copy Markdown
Member

Description

Concurrent ABCI query connections can execute .store queries while the consensus connection commits a block.

When a query omit its height, BaseApp obtains the latest height through:
Query -> handleQueryStore -> LastBlockHeight -> LastCommitID

At the same time, root multi.multiStore.Commit updated lastCommitID without synchronization. This caused a data race between the query and commit paths.

This issue was discovered while reviewing #6013, but is independent of the changes for #6011 so handled separately and the fix similar to #5431.

Changes

multistore.lastCommitID is now published through an atomic.Pointer.

Both LoadVersion and Commit atomically publish a complete commit ID, while all reads go through LastCommitID. This keeps the synchronization at the shared state owner and preserves concurrent query execution without locking queries for the duration of a commit.

The regression test runs a latest height .store query concurrently with multiple commits and is intended to be executed with the race detector.

@github-actions github-actions Bot added the 📦 🌐 tendermint v2 Issues or PRs tm2 related label Jul 28, 2026
@Gno2D2 Gno2D2 added the review/triage-pending PRs opened by external contributors that are waiting for the 1st review label Jul 28, 2026
@Gno2D2

Gno2D2 commented Jul 28, 2026

Copy link
Copy Markdown
Collaborator

🛠 PR Checks Summary

🔴 Pending initial approval by a review team member, or review from tech-staff

Manual Checks (for Reviewers):
  • IGNORE the bot requirements for this PR (force green CI check)
Read More

🤖 This bot helps streamline PR reviews by verifying automated checks and providing guidance for contributors and reviewers.

✅ Automated Checks (for Contributors):

🟢 Maintainers must be able to edit this pull request (more info)
🔴 Pending initial approval by a review team member, or review from tech-staff

☑️ Contributor Actions:
  1. Fix any issues flagged by automated checks.
  2. Follow the Contributor Checklist to ensure your PR is ready for review.
    • Add new tests, or document why they are unnecessary.
    • Provide clear examples/screenshots, if necessary.
    • Update documentation, if required.
    • Ensure no breaking changes, or include BREAKING CHANGE notes.
    • Link related issues/PRs, where applicable.
☑️ Reviewer Actions:
  1. Complete manual checks for the PR, including the guidelines and additional checks if applicable.
📚 Resources:
Debug
Automated Checks
Maintainers must be able to edit this pull request (more info)

If

🟢 Condition met
└── 🟢 And
    ├── 🟢 The base branch matches this pattern: ^master$
    └── 🟢 The pull request was created from a fork (head branch repo: notJoon/gno-core)

Then

🟢 Requirement satisfied
└── 🟢 Maintainer can modify this pull request

Pending initial approval by a review team member, or review from tech-staff

If

🟢 Condition met
└── 🟢 And
    ├── 🟢 The base branch matches this pattern: ^master$
    └── 🟢 Not (🔴 Pull request author is a member of the team: tech-staff)

Then

🔴 Requirement not satisfied
└── 🔴 If
    ├── 🔴 Condition
    │   └── 🔴 Or
    │       ├── 🔴 At least one of these user(s) reviewed the pull request: [aronpark1007 davd-gzl jefft0 notJoon omarsy MikaelVallenet] (with state "APPROVED")
    │       ├── 🔴 At least 1 user(s) of the team tech-staff reviewed pull request
    │       └── 🔴 This pull request is a draft
    └── 🔴 Else
        └── 🔴 And
            ├── 🟢 This label is applied to pull request: review/triage-pending
            └── 🔴 On no pull request

Manual Checks
**IGNORE** the bot requirements for this PR (force green CI check)

If

🟢 Condition met
└── 🟢 On every pull request

Can be checked by

  • Any user with comment edit permission

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

Labels

📦 🌐 tendermint v2 Issues or PRs tm2 related review/triage-pending PRs opened by external contributors that are waiting for the 1st review

Projects

Development

Successfully merging this pull request may close these issues.

2 participants