caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 08:08:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dead code around should_expand_db (#12767)

Browse Source 
when dbExpand is called from rdb.c with try_expand set to 0, it will
either panic panic on OOM, or be non-fatal (should not fail RDB loading)

At the same time, the log text has been slightly adjusted to make it
more unified.
This commit is contained in:
Binbin 2023-12-10 16:40:15 +08:00 committed by GitHub
parent 7410d985bc
commit a3ae2ed37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db.c
View File

@ -2228,11 +2228,11 @@ int dbExpand(const redisDb *db, uint64_t db_size, dbKeyType keyType, int try_exp
} }
int result = try_expand ? dictTryExpand(d, db_size) : dictExpand(d, db_size); int result = try_expand ? dictTryExpand(d, db_size) : dictExpand(d, db_size);
if (try_expand && result == DICT_ERR) { if (try_expand && result == DICT_ERR) {
serverLog(LL_WARNING, "Dict expansion failed for type :%s slot: %d", serverLog(LL_WARNING, "Dict expansion failed for db type: %s, slot: %d",
keyType == DB_MAIN ? "main" : "expires", i); keyType == DB_MAIN ? "main" : "expires", i);
return C_ERR; return C_ERR;
} else if (result == DICT_ERR) { } else if (result == DICT_ERR) {
serverLog(LL_DEBUG, "Dict expansion skipped for type :%s slot: %d", serverLog(LL_DEBUG, "Dict expansion skipped for db type: %s, slot: %d",
keyType == DB_MAIN ? "main" : "expires", i); keyType == DB_MAIN ? "main" : "expires", i);
} }
} }

10
src/rdb.c
View File

@ -3264,14 +3264,8 @@ int rdbLoadRioWithLoadingCtx(rio *rdb, int rdbflags, rdbSaveInfo *rsi, rdbLoadin
/* If there is no slot info, it means that it's either not cluster mode or we are trying to load legacy RDB file. /* If there is no slot info, it means that it's either not cluster mode or we are trying to load legacy RDB file.
* In this case we want to estimate number of keys per slot and resize accordingly. */ * In this case we want to estimate number of keys per slot and resize accordingly. */
if (should_expand_db) { if (should_expand_db) {
if (dbExpand(db, db_size, DB_MAIN, 0) == C_ERR) { dbExpand(db, db_size, DB_MAIN, 0);
serverLog(LL_WARNING, "OOM in dict expand of main dict"); dbExpand(db, expires_size, DB_EXPIRES, 0);
return C_ERR;
}
if (dbExpand(db, expires_size, DB_EXPIRES, 0) == C_ERR) {
serverLog(LL_WARNING, "OOM in dict expand of expire dict");
return C_ERR;
}
should_expand_db = 0; should_expand_db = 0;
} }