Skip to content

[2.10] [MOD-11011] Fix deadlock while RDB loading and RM_Yield (#6763)#6785

Merged
JoanFM merged 7 commits into2.10from
backport-6763-to-2.10
Sep 7, 2025
Merged

[2.10] [MOD-11011] Fix deadlock while RDB loading and RM_Yield (#6763)#6785
JoanFM merged 7 commits into2.10from
backport-6763-to-2.10

Conversation

@JoanFM
Copy link
Copy Markdown
Collaborator

@JoanFM JoanFM commented Sep 5, 2025

No description provided.

* add test file trying to reproduce lock

* test RDB update

* try the test changes

* only keep test changes

* remove some logs

* fix: Yield to Redis before acquiring Write Lock

* proper Lock initialization on RDB load

* proper initialization

* remove test file

* remove comment from code

* add numOps instead of reducing Yield frequency

* move lock init

* add DEBUG command to improve testing

* fix failing tests

* remove added tests by mistake

(cherry picked from commit 4710f44)
@JoanFM JoanFM force-pushed the backport-6763-to-2.10 branch 2 times, most recently from 8aa5a2c to b82b783 Compare September 5, 2025 11:36
@JoanFM JoanFM force-pushed the backport-6763-to-2.10 branch from b82b783 to 5f0f9b4 Compare September 5, 2025 11:54
@codecov
Copy link
Copy Markdown

codecov bot commented Sep 5, 2025

Codecov Report

❌ Patch coverage is 89.18919% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.29%. Comparing base (1e4a7a1) to head (5f0f9b4).
⚠️ Report is 1 commits behind head on 2.10.

Files with missing lines Patch % Lines
src/debug_commands.c 81.81% 2 Missing ⚠️
src/info/indexes_info.c 50.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             2.10    #6785      +/-   ##
==========================================
- Coverage   89.33%   89.29%   -0.05%     
==========================================
  Files         207      207              
  Lines       36142    36165      +23     
==========================================
+ Hits        32289    32292       +3     
- Misses       3853     3873      +20     
Flag Coverage Δ
flow 83.81% <89.18%> (-0.17%) ⬇️
unit 42.72% <40.54%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@JoanFM JoanFM added this pull request to the merge queue Sep 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 7, 2025
@JoanFM JoanFM added this pull request to the merge queue Sep 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 7, 2025
@JoanFM JoanFM added this pull request to the merge queue Sep 7, 2025
Merged via the queue into 2.10 with commit b38f839 Sep 7, 2025
11 checks passed
@JoanFM JoanFM deleted the backport-6763-to-2.10 branch September 7, 2025 17:53
nafraf added a commit that referenced this pull request Sep 27, 2025
nafraf added a commit that referenced this pull request Sep 27, 2025
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.

2 participants