fix: replication error message and scan command yield #4665
+6
−13
Conversation
This file contains 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
kostasrim
commented
Feb 26, 2025
src/server/generic_family.cc
Outdated
| journal::JournalFlushGuard journal_flush_guard(op_args.shard->journal()); | ||
| cur = prime_table->Traverse( | ||
| cur, [&](PrimeIterator it) { cnt += ScanCb(op_args, it, scan_opts, vec); }); | ||
| break; |
There was a problem hiding this comment.
This should be fine. We can still over spin a little bit, because the called of OpScan does not return unless:
677 // Break after kMaxScanTimeMs.
678 uint64_t time_now_ms = GetCurrentTimeMs();
679 if (time_now_ms > db_cntx.time_now_ms + kMaxScanTimeMs) {
680 break;
681 }
or when the limit is reached. Basically, our worse latency is now the timeout (as opposed to OpScan potentially iterate the whole db table which would be unbounded time depending on the shard size)
adiholden
reviewed
Feb 26, 2025
src/server/generic_family.cc
Outdated
| journal::JournalFlushGuard journal_flush_guard(op_args.shard->journal()); | ||
| cur = prime_table->Traverse( | ||
| cur, [&](PrimeIterator it) { cnt += ScanCb(op_args, it, scan_opts, vec); }); | ||
| break; |
There was a problem hiding this comment.
I believe this can be inside the while condition
There was a problem hiding this comment.
You are right. I did not want to make the expression big so I opted in for an if statement 🤷
One sec will address this.
adiholden
approved these changes
Feb 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I accidentally changed the error message in 8512f72#diff-8174e8eae32841a10b583a676b1b8ec068e7b3f2aa3cf61d2e952553ab343875R96
Furthermore, I never pushed the commit with the early return from the suggestion in https://github.com/dragonflydb/dragonfly/pull/4624/files#diff-f8f9387edb04c03ce7333ad3b69778d7b379fcf8c8765543f62b34d883e187c5R629