fix: Run defrag on dbs > 0 as well #1737
Merged
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
Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
dranikpg
force-pushed
the
defrag-on-all-dbd
branch
from
15fae99
to
9cdef8c
Compare
dranikpg
commented
Aug 25, 2023
src/server/engine_shard_set.cc
Outdated
Comment on lines
166
to
172
| // Once we're done with a db, jump to the next | ||
| if (defrag_state_.cursor == kCursorDoneState) { | ||
| defrag_state_.dbid++; | ||
| // Skip null dbs that still take up slots in the array | ||
| while (defrag_state_.dbid < slice.db_array_size() && !slice.IsDbValid(defrag_state_.dbid)) | ||
| defrag_state_.dbid++; | ||
| } |
There was a problem hiding this comment.
Yes, if the db has less elements than kMaxTraverses, then it will proceed with the next db only on the next phase. I don't see it as a big flaw given that kMaxTraverses is only 40 now.
romange
reviewed
Aug 25, 2023
| @@ -137,8 +141,8 @@ bool EngineShard::DoDefrag() { | |||
| const float threshold = GetFlag(FLAGS_mem_defrag_page_utilization_threshold); | |||
|
|
|||
| auto& slice = db_slice(); | |||
| DCHECK(slice.IsDbValid(kDefaultDbIndex)); | |||
| auto [prime_table, expire_table] = slice.GetTables(kDefaultDbIndex); | |||
| DCHECK(slice.IsDbValid(defrag_state_.dbid)); | |||
There was a problem hiding this comment.
do we ever reduce number of our databases? i.e. flushall?
There was a problem hiding this comment.
We don't, see DbSlice::FlushDb
But I can change it a little nonetheless to make it safer
Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
royjacobson
reviewed
Aug 27, 2023
Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
royjacobson
approved these changes
Aug 27, 2023
kostasrim
pushed a commit
that referenced
this pull request
Aug 29, 2023
* fix: Run defrag on dbs > 0 as well Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
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.
No description provided.