mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

-sfix(rdb_load): replica load expired keys

Browse source
This commit is contained in:
adi_holden 2023-03-15 12:34:13 +02:00 • committed by Roman Gershman
parent bafad66fc3
commit dd03ce0cf0
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/server/rdb_load.cc
View file

@ -2129,6 +2129,7 @@ error_code RdbLoader::LoadKeyValPair(int type, ObjSettings* settings) {
if (item == nullptr) {
item = new Item;
}
auto cleanup = absl::Cleanup([item] { delete item; });
// Read key
SET_OR_RETURN(ReadKey(), item->key);
@ -2148,22 +2149,23 @@ error_code RdbLoader::LoadKeyValPair(int type, ObjSettings* settings) {
* Similarly if the RDB is the preamble of an AOF file, we want to
* load all the keys as they are, since the log of operations later
* assume to work in an exact keyspace state. */
// TODO: check rdbflags&RDBFLAGS_AOF_PREAMBLE logic in rdb.c
bool should_expire = settings->has_expired; // TODO: to implement
if (should_expire) {
// decrRefCount(val);
} else {
ShardId sid = Shard(item->key, shard_set->size());
item->expire_ms = settings->expiretime;
auto& out_buf = shard_buf_[sid];
if (ServerState::tlocal()->is_master && settings->has_expired) {
VLOG(1) << "Expire key: " << item->key;
return kOk;
}
out_buf.emplace_back(item);
ShardId sid = Shard(item->key, shard_set->size());
item->expire_ms = settings->expiretime;
constexpr size_t kBufSize = 128;
if (out_buf.size() >= kBufSize) {
FlushShardAsync(sid);
}
auto& out_buf = shard_buf_[sid];
out_buf.emplace_back(item);
std::move(cleanup).Cancel();
constexpr size_t kBufSize = 128;
if (out_buf.size() >= kBufSize) {
FlushShardAsync(sid);
}
return kOk;