Skip to content

fix: backport GlobalStats hang/race fixes to 3.0-dev#24143

Merged
mergify[bot] merged 3 commits intomatrixorigin:3.0-devfrom
ck89119:tmp/cherry-pick-24094-to-3.0-dev-v2
Apr 15, 2026
Merged

fix: backport GlobalStats hang/race fixes to 3.0-dev#24143
mergify[bot] merged 3 commits intomatrixorigin:3.0-devfrom
ck89119:tmp/cherry-pick-24094-to-3.0-dev-v2

Conversation

@ck89119
Copy link
Copy Markdown
Contributor

@ck89119 ck89119 commented Apr 15, 2026

What type of PR is this?

  • API-change
  • BUG
  • Improvement
  • Documentation
  • Feature
  • Test and CI
  • Code Refactoring

Which issue(s) this PR fixes:

issue #24094

What this PR does / why we need it:

Backport three GlobalStats fixes from main to 3.0-dev for IVF hang/race cases:

  1. Break lock inversion between gs.mu and table subscription lock in GlobalStats.Get.
  2. Prevent stale remote stats cache write-back after unsubscribe.
  3. Address review races by adding wakeup broadcast on remote cache path and stabilizing related concurrency tests.

Backported commits:

Validation:

  • go test ./pkg/vm/engine/disttae -run Test(GlobalStatsGetDoesNotHoldMuWhileSubscribing|CacheRemoteInfoIfSubscribedBroadcastsWaiters|GlobalStatsGetDoesNotCacheRemoteInfoAfterUnsubscribe|RemoveTid|CleanMemoryTableWithTable)$ -count=1

@matrix-meow matrix-meow added the size/M Denotes a PR that changes [100,499] lines label Apr 15, 2026
@mergify mergify Bot added kind/bug Something isn't working kind/test-ci labels Apr 15, 2026
@mergify mergify Bot added the queued label Apr 15, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Apr 15, 2026 •
edited
Loading

Merge Queue Status

  • ✅ Entered queue — 2026-04-15 13:22 UTC · Rule: release-3.0
  • ✅ Checks skipped · PR is already up-to-date
  • ✅ Merged — 2026-04-15 13:23 UTC · at 91174fd04f61f97d523f99cf9e5cd9b8a23f7bde

This pull request spent 25 seconds in the queue, including 3 seconds running CI.

Required conditions to merge
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Utils CI (3.0) / Coverage
    • check-neutral = Matrixone Utils CI (3.0) / Coverage
    • check-skipped = Matrixone Utils CI (3.0) / Coverage
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone CI (3.0) / SCA Test on Ubuntu/x86
    • check-neutral = Matrixone CI (3.0) / SCA Test on Ubuntu/x86
    • check-skipped = Matrixone CI (3.0) / SCA Test on Ubuntu/x86
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone CI (3.0) / UT Test on Ubuntu/x86
    • check-neutral = Matrixone CI (3.0) / UT Test on Ubuntu/x86
    • check-skipped = Matrixone CI (3.0) / UT Test on Ubuntu/x86
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Compose CI (3.0) / multi cn e2e bvt test docker compose(Optimistic/PUSH)
    • check-neutral = Matrixone Compose CI (3.0) / multi cn e2e bvt test docker compose(Optimistic/PUSH)
    • check-skipped = Matrixone Compose CI (3.0) / multi cn e2e bvt test docker compose(Optimistic/PUSH)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Compose CI (3.0) / multi cn e2e bvt test docker compose(PESSIMISTIC)
    • check-neutral = Matrixone Compose CI (3.0) / multi cn e2e bvt test docker compose(PESSIMISTIC)
    • check-skipped = Matrixone Compose CI (3.0) / multi cn e2e bvt test docker compose(PESSIMISTIC)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Standlone CI (3.0) / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
    • check-neutral = Matrixone Standlone CI (3.0) / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
    • check-skipped = Matrixone Standlone CI (3.0) / Multi-CN e2e BVT Test on Linux/x64(LAUNCH, PROXY)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Standlone CI (3.0) / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
    • check-neutral = Matrixone Standlone CI (3.0) / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
    • check-skipped = Matrixone Standlone CI (3.0) / e2e BVT Test on Linux/x64(LAUNCH, PESSIMISTIC)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Standlone CI (3.0) / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
    • check-neutral = Matrixone Standlone CI (3.0) / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
    • check-skipped = Matrixone Standlone CI (3.0) / e2e BVT Test on Linux/x64(LAUNCH,Optimistic)
  • any of [🛡 GitHub branch protection]:
    • check-success = Matrixone Upgrade CI (3.0) / Compatibility Test With Target on Linux/x64(LAUNCH)
    • check-neutral = Matrixone Upgrade CI (3.0) / Compatibility Test With Target on Linux/x64(LAUNCH)
    • check-skipped = Matrixone Upgrade CI (3.0) / Compatibility Test With Target on Linux/x64(LAUNCH)

@mergify mergify Bot merged commit 3172870 into matrixorigin:3.0-dev Apr 15, 2026
24 of 25 checks passed
@mergify mergify Bot removed the queued label Apr 15, 2026
@ck89119 ck89119 deleted the tmp/cherry-pick-24094-to-3.0-dev-v2 branch April 15, 2026 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@XuPeng-SH XuPeng-SH XuPeng-SH approved these changes

@gouhongshen gouhongshen Awaiting requested review from gouhongshen gouhongshen is a code owner

Assignees

No one assigned

Labels

kind/bug Something isn't working kind/test-ci size/M Denotes a PR that changes [100,499] lines

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ck89119 @XuPeng-SH @matrix-meow