Fix internal cursors not being deleted immedietly in cluster mode - [MOD-12493]#7399
Merged
Fix internal cursors not being deleted immedietly in cluster mode - [MOD-12493]#7399
Conversation
GuyAv46
changed the title
GuyAv46
changed the title
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7399 +/- ##
==========================================
+ Coverage 84.81% 84.86% +0.04%
==========================================
Files 346 347 +1
Lines 53420 53684 +264
Branches 14039 14292 +253
==========================================
+ Hits 45309 45558 +249
- Misses 7915 7930 +15
Partials 196 196
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
GuyAv46
force-pushed
the
guyav-fix_command_rewrite
branch
from
fbe64f5 to
151a77e
Compare
JoanFM
reviewed
Nov 20, 2025
Collaborator
|
Just for info, should we run a Benchmark scenario? |
Contributor
Automated performance analysis summaryThis comment was automatically generated given there is performance data available. In summary:
You can check a comparison in detail via the grafana link ## DetailsTests with No Significant Changes (5 tests)Tests with No Significant Changes
|
Contributor
Automated performance analysis summaryThis comment was automatically generated given there is performance data available. In summary:
You can check a comparison in detail via the grafana link Performance Regressions and Issues - Comparison between master and guyav-fix_command_rewrite.Time Period from 30 days ago. (environment used: oss-standalone)
Tests with No Significant Changes (6 tests)Tests with No Significant Changes
|
Contributor
Automated performance analysis summaryThis comment was automatically generated given there is performance data available. In summary:
You can check a comparison in detail via the grafana link Performance Improvements - Comparison between master and guyav-fix_command_rewrite.Time Period from 30 days ago. (environment used: oss-standalone)
Performance Regressions and Issues - Comparison between master and guyav-fix_command_rewrite.Time Period from 30 days ago. (environment used: oss-standalone)
Tests with No Significant Changes (31 tests)Tests with No Significant Changes
|
JoanFM
approved these changes
Nov 20, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Contributor
|
Successfully created backport PR for |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 21, 2025
…de - [MOD-12493] (#7455) Fix internal cursors not being deleted immedietly in cluster mode - [MOD-12493] (#7399) * refresh cache on every modification * add a failing test * fix bug * add assert to cover a future edge case * remove redundant cleanup * use helper (cherry picked from commit 54f050c) Co-authored-by: GuyAv46 <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refresh Command's Cached
sdson Every ModificationSince version 8.4, we have started reusing commands to avoid reallocating on every reuse (for example, internal cursor read, which remains constant between calls).
In some cases, a cursor del command is sent to clean leftover cursors at the shards when the user command is finished (or a user cursor was deleted).
Because the command modification was done on the command's argv (
strs) directly, if the command was already used, the argv was not parsed again. The cached command (generated when the command is sent) was triggered instead, so if the cursors were not depleted by this read instead of del, the cursor would remain orfand.This is not too bad, as we eventually will clean these cursors when they are idle for long enough, but they could cause us to reach the cursor limit per index faster, increase memory spikes, and it was not the intended behavior.
In this PR, we add a cache drop on every command modification (through the command API) and use it for the detected scenario. This will also ensure that no similar bugs will happen in the future.
Mark if applicable
Note
Invalidate MRCommand's cached sds on every argv mutation and use safe arg replacement so pending shard cursors get proper DELs; add regression test.
dropCachedCmdIfNeededand call it fromMRCommand_Free,assignStr, andMRCommand_ReplaceArgNoDupto invalidate cachedcmd->cmdafter any mutation insrc/coord/rmr/command.c.MRCommand_ReplaceArgSubstringto prevent in-place edits after cached command creation.MRCommand_SetSlotInfo) now covered centrally.getCursorCommandand iterator release logic, replace manual string edits (strcpy/lens tweaks) withMRCommand_ReplaceArgto switchREAD→DEL/PROFILE, ensuring cache is refreshed (src/coord/hybrid/dist_utils.c,src/coord/rmr/rmr.c).test_mod_12493validating internal shard cursors receive exactly oneREADthen aDEL, and are fully deleted; checksCOMMANDSTATSandcursor_stats(tests/pytests/test_issues.py).Written by Cursor Bugbot for commit da786d2. This will update automatically on new commits. Configure here.