Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport: Optimize RDB load performance and fix cluster mode resizing on replica side (#1199) #1328

Open
wants to merge 1 commit into
base: 8.0
Choose a base branch
from
Open

Backport: Optimize RDB load performance and fix cluster mode resizing on replica side (#1199) #1328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ keyStatus expireIfNeeded(serverDb *db, robj *key, int flags) {
* The purpose is to skip expansion of unused dicts in cluster mode (all
* dicts not mapped to *my* slots) */
static int dbExpandSkipSlot(int slot) {
return !clusterNodeCoversSlot(getMyClusterNode(), slot);
return !clusterNodeCoversSlot(clusterNodeGetPrimary(getMyClusterNode()), slot);
}

/*
Expand Down
6 changes: 4 additions & 2 deletions src/kvstore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,11 @@ unsigned long long kvstoreScan(kvstore *kvs,
* `dictTryExpand` call and in case of `dictExpand` call it signifies no expansion was performed.
*/
int kvstoreExpand(kvstore *kvs, uint64_t newsize, int try_expand, kvstoreExpandShouldSkipDictIndex *skip_cb) {
if (newsize == 0) return 1;
for (int i = 0; i < kvs->num_dicts; i++) {
dict *d = kvstoreGetDict(kvs, i);
if (!d || (skip_cb && skip_cb(i))) continue;
if (skip_cb && skip_cb(i)) continue;
/* If the dictionary doesn't exist, create it */
dict *d = createDictIfNeeded(kvs, i);
int result = try_expand ? dictTryExpand(d, newsize) : dictExpand(d, newsize);
if (try_expand && result == DICT_ERR) return 0;
}
Expand Down
Loading